From d0e5360cf9d02251dc4483e718129dd50b6a5230 Mon Sep 17 00:00:00 2001
From: Bryant Biggs <bryantbiggs@gmail.com>
Date: Tue, 21 Jan 2025 11:42:48 -0600
Subject: [PATCH] Migrate `goformation` under `pkg/` as a local package and
 remove location re-write (#8153)

* Migrate `goformation` under `pkg/` as a local package and remove location re-write

* chore: Fix linkchecker and go version used in CI

* fix: Update lint ignore path for `goformation`
---
 .github/workflows/link-checker.yaml           |   4 +-
 .golangci.yml                                 |  29 +-
 go.mod                                        |  13 +-
 go.sum                                        |  20 -
 goformation/go.mod                            |  25 --
 goformation/go.sum                            | 109 ------
 pkg/actions/nodegroup/upgrade.go              |  10 +-
 pkg/automode/cluster_role_manager.go          |   2 +-
 pkg/cfn/builder/access_entry.go               |   4 +-
 pkg/cfn/builder/api.go                        |   6 +-
 pkg/cfn/builder/auto_mode.go                  |   6 +-
 pkg/cfn/builder/block_device_mapping.go       |   4 +-
 pkg/cfn/builder/builder_suite_test.go         |   2 +-
 pkg/cfn/builder/cloudwatch_logging.go         |   4 +-
 pkg/cfn/builder/cluster.go                    |  10 +-
 pkg/cfn/builder/export_test.go                |   2 +-
 pkg/cfn/builder/fargate.go                    |   4 +-
 pkg/cfn/builder/iam.go                        |   6 +-
 pkg/cfn/builder/iam_helper.go                 |   6 +-
 pkg/cfn/builder/karpenter.go                  |  10 +-
 pkg/cfn/builder/managed_launch_template.go    |   6 +-
 .../builder/managed_launch_template_test.go   |   4 +-
 pkg/cfn/builder/managed_nodegroup.go          |   6 +-
 .../managed_nodegroup_ami_type_test.go        |   4 +-
 pkg/cfn/builder/managed_nodegroup_test.go     |   6 +-
 pkg/cfn/builder/network_interfaces.go         |   4 +-
 pkg/cfn/builder/nodegroup.go                  |  10 +-
 pkg/cfn/builder/nodegroup_subnets_test.go     |   2 +-
 pkg/cfn/builder/nodegroup_test.go             |   2 +-
 pkg/cfn/builder/outputs.go                    |   2 +-
 pkg/cfn/builder/partition.go                  |   2 +-
 pkg/cfn/builder/statement.go                  |   2 +-
 pkg/cfn/builder/vpc.go                        |   6 +-
 pkg/cfn/builder/vpc_endpoint.go               |   4 +-
 pkg/cfn/builder/vpc_endpoint_test.go          |   4 +-
 pkg/cfn/builder/vpc_existing.go               |   2 +-
 pkg/cfn/builder/vpc_existing_test.go          |   2 +-
 pkg/cfn/builder/vpc_ipv4.go                   |   6 +-
 pkg/cfn/builder/vpc_ipv4_test.go              |   2 +-
 pkg/cfn/builder/vpc_ipv6.go                   |   6 +-
 pkg/cfn/manager/compat.go                     |   2 +-
 pkg/cfn/manager/template.go                   |   2 +-
 pkg/cfn/outputs/api.go                        |   4 +-
 pkg/cfn/template/iam_helpers.go               |   2 +-
 {goformation => pkg/goformation}/.gitignore   |   0
 {goformation => pkg/goformation}/AUTHORS.md   |   0
 {goformation => pkg/goformation}/CHANGELOG.md |   0
 .../goformation}/CODE_OF_CONDUCT.md           |   0
 .../goformation}/CONTRIBUTING.md              |   0
 {goformation => pkg/goformation}/LICENSE      |   0
 {goformation => pkg/goformation}/LOGO.md      |   0
 {goformation => pkg/goformation}/NOTICE       |   0
 {goformation => pkg/goformation}/README.md    |   0
 .../goformation}/cloudformation/README.md     |   0
 .../aws-accessanalyzer-analyzer.go            |   6 +-
 ...aws-accessanalyzer-analyzer_archiverule.go |   4 +-
 .../aws-accessanalyzer-analyzer_filter.go     |   4 +-
 .../acmpca/aws-acmpca-certificate.go          |   4 +-
 .../aws-acmpca-certificate_apipassthrough.go  |   2 +-
 .../aws-acmpca-certificate_edipartyname.go    |   4 +-
 ...aws-acmpca-certificate_extendedkeyusage.go |   4 +-
 .../aws-acmpca-certificate_extensions.go      |   2 +-
 .../aws-acmpca-certificate_generalname.go     |   4 +-
 .../acmpca/aws-acmpca-certificate_keyusage.go |   4 +-
 .../aws-acmpca-certificate_othername.go       |   4 +-
 ...ws-acmpca-certificate_policyinformation.go |   4 +-
 ...-acmpca-certificate_policyqualifierinfo.go |   4 +-
 .../aws-acmpca-certificate_qualifier.go       |   4 +-
 .../acmpca/aws-acmpca-certificate_subject.go  |   4 +-
 .../acmpca/aws-acmpca-certificate_validity.go |   4 +-
 .../acmpca/aws-acmpca-certificateauthority.go |   6 +-
 ...-certificateauthority_accessdescription.go |   2 +-
 ...cmpca-certificateauthority_accessmethod.go |   4 +-
 ...a-certificateauthority_crlconfiguration.go |   4 +-
 ...mpca-certificateauthority_csrextensions.go |   2 +-
 ...cmpca-certificateauthority_edipartyname.go |   4 +-
 ...acmpca-certificateauthority_generalname.go |   4 +-
 ...ws-acmpca-certificateauthority_keyusage.go |   4 +-
 ...-certificateauthority_ocspconfiguration.go |   4 +-
 ...s-acmpca-certificateauthority_othername.go |   4 +-
 ...ficateauthority_revocationconfiguration.go |   2 +-
 ...aws-acmpca-certificateauthority_subject.go |   4 +-
 ...s-acmpca-certificateauthorityactivation.go |   4 +-
 .../acmpca/aws-acmpca-permission.go           |   4 +-
 .../goformation}/cloudformation/all.go        | 360 +++++++++---------
 .../amazonmq/aws-amazonmq-broker.go           |   4 +-
 .../aws-amazonmq-broker_configurationid.go    |   4 +-
 .../aws-amazonmq-broker_encryptionoptions.go  |   4 +-
 .../aws-amazonmq-broker_ldapservermetadata.go |   4 +-
 .../amazonmq/aws-amazonmq-broker_loglist.go   |   4 +-
 .../aws-amazonmq-broker_maintenancewindow.go  |   4 +-
 .../amazonmq/aws-amazonmq-broker_tagsentry.go |   4 +-
 .../amazonmq/aws-amazonmq-broker_user.go      |   4 +-
 .../amazonmq/aws-amazonmq-configuration.go    |   4 +-
 .../aws-amazonmq-configuration_tagsentry.go   |   4 +-
 .../aws-amazonmq-configurationassociation.go  |   4 +-
 ...onfigurationassociation_configurationid.go |   4 +-
 .../cloudformation/amplify/aws-amplify-app.go |   6 +-
 ...ws-amplify-app_autobranchcreationconfig.go |   4 +-
 .../aws-amplify-app_basicauthconfig.go        |   4 +-
 .../amplify/aws-amplify-app_customrule.go     |   4 +-
 .../aws-amplify-app_environmentvariable.go    |   4 +-
 .../amplify/aws-amplify-branch.go             |   6 +-
 .../aws-amplify-branch_basicauthconfig.go     |   4 +-
 .../aws-amplify-branch_environmentvariable.go |   4 +-
 .../amplify/aws-amplify-domain.go             |   4 +-
 .../aws-amplify-domain_subdomainsetting.go    |   4 +-
 .../aws-amplifyuibuilder-component.go         |   4 +-
 ...mponent_componentbindingpropertiesvalue.go |   4 +-
 ...mponentbindingpropertiesvalueproperties.go |   4 +-
 ...plifyuibuilder-component_componentchild.go |   4 +-
 ...er-component_componentconditionproperty.go |   4 +-
 ...er-component_componentdataconfiguration.go |   4 +-
 ...yuibuilder-component_componentoverrides.go |   2 +-
 ...ilder-component_componentoverridesvalue.go |   2 +-
 ...uibuilder-component_componentproperties.go |   2 +-
 ...fyuibuilder-component_componentproperty.go |   4 +-
 ...nent_componentpropertybindingproperties.go |   4 +-
 ...ifyuibuilder-component_componentvariant.go |   2 +-
 ...uilder-component_componentvariantvalues.go |   2 +-
 ...amplifyuibuilder-component_formbindings.go |   2 +-
 ...ws-amplifyuibuilder-component_predicate.go |   4 +-
 ...amplifyuibuilder-component_sortproperty.go |   4 +-
 .../aws-amplifyuibuilder-theme.go             |   4 +-
 .../aws-amplifyuibuilder-theme_themevalue.go  |   4 +-
 .../aws-amplifyuibuilder-theme_themevalues.go |   4 +-
 .../apigateway/aws-apigateway-account.go      |   4 +-
 .../apigateway/aws-apigateway-apikey.go       |   6 +-
 .../aws-apigateway-apikey_stagekey.go         |   4 +-
 .../apigateway/aws-apigateway-authorizer.go   |   4 +-
 .../aws-apigateway-basepathmapping.go         |   4 +-
 .../aws-apigateway-clientcertificate.go       |   6 +-
 .../apigateway/aws-apigateway-deployment.go   |   4 +-
 ...-apigateway-deployment_accesslogsetting.go |   4 +-
 ...aws-apigateway-deployment_canarysetting.go |   4 +-
 ...way-deployment_deploymentcanarysettings.go |   4 +-
 ...aws-apigateway-deployment_methodsetting.go |   4 +-
 ...-apigateway-deployment_stagedescription.go |   6 +-
 .../aws-apigateway-documentationpart.go       |   4 +-
 ...s-apigateway-documentationpart_location.go |   4 +-
 .../aws-apigateway-documentationversion.go    |   4 +-
 .../apigateway/aws-apigateway-domainname.go   |   6 +-
 ...ateway-domainname_endpointconfiguration.go |   4 +-
 ...eway-domainname_mutualtlsauthentication.go |   4 +-
 .../aws-apigateway-gatewayresponse.go         |   4 +-
 .../apigateway/aws-apigateway-method.go       |   4 +-
 .../aws-apigateway-method_integration.go      |   4 +-
 ...s-apigateway-method_integrationresponse.go |   4 +-
 .../aws-apigateway-method_methodresponse.go   |   4 +-
 .../apigateway/aws-apigateway-model.go        |   4 +-
 .../aws-apigateway-requestvalidator.go        |   4 +-
 .../apigateway/aws-apigateway-resource.go     |   4 +-
 .../apigateway/aws-apigateway-restapi.go      |   6 +-
 ...pigateway-restapi_endpointconfiguration.go |   4 +-
 .../aws-apigateway-restapi_s3location.go      |   4 +-
 .../apigateway/aws-apigateway-stage.go        |   6 +-
 .../aws-apigateway-stage_accesslogsetting.go  |   4 +-
 .../aws-apigateway-stage_canarysetting.go     |   4 +-
 .../aws-apigateway-stage_methodsetting.go     |   4 +-
 .../apigateway/aws-apigateway-usageplan.go    |   6 +-
 .../aws-apigateway-usageplan_apistage.go      |   4 +-
 .../aws-apigateway-usageplan_quotasettings.go |   4 +-
 ...s-apigateway-usageplan_throttlesettings.go |   4 +-
 .../apigateway/aws-apigateway-usageplankey.go |   4 +-
 .../apigateway/aws-apigateway-vpclink.go      |   6 +-
 .../apigatewayv2/aws-apigatewayv2-api.go      |   4 +-
 .../aws-apigatewayv2-api_bodys3location.go    |   4 +-
 .../apigatewayv2/aws-apigatewayv2-api_cors.go |   4 +-
 ...apigatewayv2-apigatewaymanagedoverrides.go |   4 +-
 ...tewaymanagedoverrides_accesslogsettings.go |   4 +-
 ...aymanagedoverrides_integrationoverrides.go |   4 +-
 ...igatewaymanagedoverrides_routeoverrides.go |   4 +-
 ...pigatewaymanagedoverrides_routesettings.go |   4 +-
 ...igatewaymanagedoverrides_stageoverrides.go |   4 +-
 .../aws-apigatewayv2-apimapping.go            |   4 +-
 .../aws-apigatewayv2-authorizer.go            |   4 +-
 ...pigatewayv2-authorizer_jwtconfiguration.go |   4 +-
 .../aws-apigatewayv2-deployment.go            |   4 +-
 .../aws-apigatewayv2-domainname.go            |   4 +-
 ...ayv2-domainname_domainnameconfiguration.go |   4 +-
 ...ayv2-domainname_mutualtlsauthentication.go |   4 +-
 .../aws-apigatewayv2-integration.go           |   4 +-
 ...gatewayv2-integration_responseparameter.go |   4 +-
 ...wayv2-integration_responseparameterlist.go |   2 +-
 .../aws-apigatewayv2-integration_tlsconfig.go |   4 +-
 .../aws-apigatewayv2-integrationresponse.go   |   4 +-
 .../apigatewayv2/aws-apigatewayv2-model.go    |   4 +-
 .../apigatewayv2/aws-apigatewayv2-route.go    |   4 +-
 ...apigatewayv2-route_parameterconstraints.go |   4 +-
 .../aws-apigatewayv2-routeresponse.go         |   4 +-
 ...ayv2-routeresponse_parameterconstraints.go |   4 +-
 .../apigatewayv2/aws-apigatewayv2-stage.go    |   4 +-
 ...ws-apigatewayv2-stage_accesslogsettings.go |   4 +-
 .../aws-apigatewayv2-stage_routesettings.go   |   4 +-
 .../apigatewayv2/aws-apigatewayv2-vpclink.go  |   4 +-
 .../appconfig/aws-appconfig-application.go    |   4 +-
 .../aws-appconfig-application_tags.go         |   4 +-
 .../aws-appconfig-configurationprofile.go     |   4 +-
 ...aws-appconfig-configurationprofile_tags.go |   4 +-
 ...pconfig-configurationprofile_validators.go |   4 +-
 .../appconfig/aws-appconfig-deployment.go     |   4 +-
 .../aws-appconfig-deployment_tags.go          |   4 +-
 .../aws-appconfig-deploymentstrategy.go       |   4 +-
 .../aws-appconfig-deploymentstrategy_tags.go  |   4 +-
 .../appconfig/aws-appconfig-environment.go    |   4 +-
 .../aws-appconfig-environment_monitors.go     |   4 +-
 .../aws-appconfig-environment_tags.go         |   4 +-
 ...ws-appconfig-hostedconfigurationversion.go |   4 +-
 .../appflow/aws-appflow-connectorprofile.go   |   4 +-
 ...le_amplitudeconnectorprofilecredentials.go |   4 +-
 ...-connectorprofile_connectoroauthrequest.go |   4 +-
 ...connectorprofile_connectorprofileconfig.go |   2 +-
 ...ctorprofile_connectorprofilecredentials.go |   2 +-
 ...ectorprofile_connectorprofileproperties.go |   2 +-
 ...file_datadogconnectorprofilecredentials.go |   4 +-
 ...ofile_datadogconnectorprofileproperties.go |   4 +-
 ...le_dynatraceconnectorprofilecredentials.go |   4 +-
 ...ile_dynatraceconnectorprofileproperties.go |   4 +-
 ...gleanalyticsconnectorprofilecredentials.go |   4 +-
 ...e_infornexusconnectorprofilecredentials.go |   4 +-
 ...le_infornexusconnectorprofileproperties.go |   4 +-
 ...file_marketoconnectorprofilecredentials.go |   4 +-
 ...ofile_marketoconnectorprofileproperties.go |   4 +-
 ...ppflow-connectorprofile_oauthproperties.go |   4 +-
 ...ile_redshiftconnectorprofilecredentials.go |   4 +-
 ...file_redshiftconnectorprofileproperties.go |   4 +-
 ...e_salesforceconnectorprofilecredentials.go |   4 +-
 ...le_salesforceconnectorprofileproperties.go |   4 +-
 ...ile_sapodataconnectorprofilecredentials.go |   2 +-
 ...file_sapodataconnectorprofileproperties.go |   4 +-
 ...e_servicenowconnectorprofilecredentials.go |   4 +-
 ...le_servicenowconnectorprofileproperties.go |   4 +-
 ...ile_singularconnectorprofilecredentials.go |   4 +-
 ...rofile_slackconnectorprofilecredentials.go |   4 +-
 ...profile_slackconnectorprofileproperties.go |   4 +-
 ...le_snowflakeconnectorprofilecredentials.go |   4 +-
 ...ile_snowflakeconnectorprofileproperties.go |   4 +-
 ...e_trendmicroconnectorprofilecredentials.go |   4 +-
 ...rofile_veevaconnectorprofilecredentials.go |   4 +-
 ...profile_veevaconnectorprofileproperties.go |   4 +-
 ...file_zendeskconnectorprofilecredentials.go |   4 +-
 ...ofile_zendeskconnectorprofileproperties.go |   4 +-
 .../appflow/aws-appflow-flow.go               |   6 +-
 .../aws-appflow-flow_aggregationconfig.go     |   4 +-
 ...-appflow-flow_amplitudesourceproperties.go |   4 +-
 .../aws-appflow-flow_connectoroperator.go     |   4 +-
 ...ws-appflow-flow_datadogsourceproperties.go |   4 +-
 ...low-flow_destinationconnectorproperties.go |   2 +-
 .../aws-appflow-flow_destinationflowconfig.go |   4 +-
 ...-appflow-flow_dynatracesourceproperties.go |   4 +-
 .../aws-appflow-flow_errorhandlingconfig.go   |   4 +-
 ...w-flow_eventbridgedestinationproperties.go |   4 +-
 ...ow-flow_googleanalyticssourceproperties.go |   4 +-
 .../aws-appflow-flow_incrementalpullconfig.go |   4 +-
 ...appflow-flow_infornexussourceproperties.go |   4 +-
 ...low_lookoutmetricsdestinationproperties.go |   4 +-
 ...ws-appflow-flow_marketosourceproperties.go |   4 +-
 .../appflow/aws-appflow-flow_prefixconfig.go  |   4 +-
 ...flow-flow_redshiftdestinationproperties.go |   4 +-
 ...ws-appflow-flow_s3destinationproperties.go |   4 +-
 .../aws-appflow-flow_s3inputformatconfig.go   |   4 +-
 .../aws-appflow-flow_s3outputformatconfig.go  |   4 +-
 .../aws-appflow-flow_s3sourceproperties.go    |   4 +-
 ...ow-flow_salesforcedestinationproperties.go |   4 +-
 ...appflow-flow_salesforcesourceproperties.go |   4 +-
 ...s-appflow-flow_sapodatasourceproperties.go |   4 +-
 ...appflow-flow_scheduledtriggerproperties.go |   4 +-
 ...appflow-flow_servicenowsourceproperties.go |   4 +-
 ...s-appflow-flow_singularsourceproperties.go |   4 +-
 .../aws-appflow-flow_slacksourceproperties.go |   4 +-
 ...low-flow_snowflakedestinationproperties.go |   4 +-
 ...-appflow-flow_sourceconnectorproperties.go |   2 +-
 .../aws-appflow-flow_sourceflowconfig.go      |   4 +-
 .../appflow/aws-appflow-flow_task.go          |   4 +-
 .../aws-appflow-flow_taskpropertiesobject.go  |   4 +-
 ...appflow-flow_trendmicrosourceproperties.go |   4 +-
 .../appflow/aws-appflow-flow_triggerconfig.go |   4 +-
 ...flow-flow_upsolverdestinationproperties.go |   4 +-
 ...pflow-flow_upsolvers3outputformatconfig.go |   4 +-
 .../aws-appflow-flow_veevasourceproperties.go |   4 +-
 ...pflow-flow_zendeskdestinationproperties.go |   4 +-
 ...ws-appflow-flow_zendesksourceproperties.go |   4 +-
 .../aws-appintegrations-eventintegration.go   |   6 +-
 ...tegrations-eventintegration_eventfilter.go |   4 +-
 ...integration_eventintegrationassociation.go |   4 +-
 ...pintegrations-eventintegration_metadata.go |   4 +-
 ...s-applicationautoscaling-scalabletarget.go |   4 +-
 ...ing-scalabletarget_scalabletargetaction.go |   4 +-
 ...oscaling-scalabletarget_scheduledaction.go |   4 +-
 ...toscaling-scalabletarget_suspendedstate.go |   4 +-
 ...ws-applicationautoscaling-scalingpolicy.go |   4 +-
 ...ingpolicy_customizedmetricspecification.go |   4 +-
 ...toscaling-scalingpolicy_metricdimension.go |   4 +-
 ...ingpolicy_predefinedmetricspecification.go |   4 +-
 ...utoscaling-scalingpolicy_stepadjustment.go |   4 +-
 ...ngpolicy_stepscalingpolicyconfiguration.go |   4 +-
 ...argettrackingscalingpolicyconfiguration.go |   4 +-
 .../aws-applicationinsights-application.go    |   6 +-
 ...s-applicationinsights-application_alarm.go |   4 +-
 ...icationinsights-application_alarmmetric.go |   4 +-
 ...ghts-application_componentconfiguration.go |   2 +-
 ...-application_componentmonitoringsetting.go |   4 +-
 ...sights-application_configurationdetails.go |   2 +-
 ...ioninsights-application_customcomponent.go |   4 +-
 ...ights-application_jmxprometheusexporter.go |   4 +-
 ...aws-applicationinsights-application_log.go |   4 +-
 ...licationinsights-application_logpattern.go |   4 +-
 ...ationinsights-application_logpatternset.go |   4 +-
 ...cation_subcomponentconfigurationdetails.go |   2 +-
 ...plication_subcomponenttypeconfiguration.go |   4 +-
 ...cationinsights-application_windowsevent.go |   4 +-
 .../appmesh/aws-appmesh-gatewayroute.go       |   6 +-
 ...-gatewayroute_gatewayroutehostnamematch.go |   4 +-
 ...atewayroute_gatewayroutehostnamerewrite.go |   4 +-
 ...-gatewayroute_gatewayroutemetadatamatch.go |   4 +-
 ...esh-gatewayroute_gatewayrouterangematch.go |   4 +-
 ...s-appmesh-gatewayroute_gatewayroutespec.go |   4 +-
 ...appmesh-gatewayroute_gatewayroutetarget.go |   2 +-
 ...gatewayroute_gatewayroutevirtualservice.go |   4 +-
 ...s-appmesh-gatewayroute_grpcgatewayroute.go |   2 +-
 ...esh-gatewayroute_grpcgatewayrouteaction.go |   2 +-
 ...mesh-gatewayroute_grpcgatewayroutematch.go |   4 +-
 ...h-gatewayroute_grpcgatewayroutemetadata.go |   4 +-
 ...sh-gatewayroute_grpcgatewayrouterewrite.go |   2 +-
 ...s-appmesh-gatewayroute_httpgatewayroute.go |   2 +-
 ...esh-gatewayroute_httpgatewayrouteaction.go |   2 +-
 ...esh-gatewayroute_httpgatewayrouteheader.go |   4 +-
 ...atewayroute_httpgatewayrouteheadermatch.go |   4 +-
 ...mesh-gatewayroute_httpgatewayroutematch.go |   4 +-
 ...atewayroute_httpgatewayroutepathrewrite.go |   4 +-
 ...ewayroute_httpgatewayrouteprefixrewrite.go |   4 +-
 ...sh-gatewayroute_httpgatewayrouterewrite.go |   2 +-
 .../aws-appmesh-gatewayroute_httppathmatch.go |   4 +-
 ...sh-gatewayroute_httpqueryparametermatch.go |   4 +-
 ...aws-appmesh-gatewayroute_queryparameter.go |   4 +-
 .../appmesh/aws-appmesh-mesh.go               |   6 +-
 .../appmesh/aws-appmesh-mesh_egressfilter.go  |   4 +-
 .../appmesh/aws-appmesh-mesh_meshspec.go      |   2 +-
 .../appmesh/aws-appmesh-route.go              |   6 +-
 .../appmesh/aws-appmesh-route_duration.go     |   4 +-
 .../aws-appmesh-route_grpcretrypolicy.go      |   4 +-
 .../appmesh/aws-appmesh-route_grpcroute.go    |   2 +-
 .../aws-appmesh-route_grpcrouteaction.go      |   2 +-
 .../aws-appmesh-route_grpcroutematch.go       |   4 +-
 .../aws-appmesh-route_grpcroutemetadata.go    |   4 +-
 ...mesh-route_grpcroutemetadatamatchmethod.go |   4 +-
 .../appmesh/aws-appmesh-route_grpctimeout.go  |   2 +-
 .../aws-appmesh-route_headermatchmethod.go    |   4 +-
 .../aws-appmesh-route_httppathmatch.go        |   4 +-
 ...s-appmesh-route_httpqueryparametermatch.go |   4 +-
 .../aws-appmesh-route_httpretrypolicy.go      |   4 +-
 .../appmesh/aws-appmesh-route_httproute.go    |   2 +-
 .../aws-appmesh-route_httprouteaction.go      |   2 +-
 .../aws-appmesh-route_httprouteheader.go      |   4 +-
 .../aws-appmesh-route_httproutematch.go       |   4 +-
 .../appmesh/aws-appmesh-route_httptimeout.go  |   2 +-
 .../appmesh/aws-appmesh-route_matchrange.go   |   4 +-
 .../aws-appmesh-route_queryparameter.go       |   4 +-
 .../appmesh/aws-appmesh-route_routespec.go    |   4 +-
 .../appmesh/aws-appmesh-route_tcproute.go     |   2 +-
 .../aws-appmesh-route_tcprouteaction.go       |   2 +-
 .../appmesh/aws-appmesh-route_tcptimeout.go   |   2 +-
 .../aws-appmesh-route_weightedtarget.go       |   4 +-
 .../appmesh/aws-appmesh-virtualgateway.go     |   6 +-
 ...lgateway_subjectalternativenamematchers.go |   4 +-
 ...-virtualgateway_subjectalternativenames.go |   2 +-
 ...-virtualgateway_virtualgatewayaccesslog.go |   2 +-
 ...algateway_virtualgatewaybackenddefaults.go |   2 +-
 ...rtualgateway_virtualgatewayclientpolicy.go |   2 +-
 ...algateway_virtualgatewayclientpolicytls.go |   4 +-
 ...eway_virtualgatewayclienttlscertificate.go |   2 +-
 ...ualgateway_virtualgatewayconnectionpool.go |   2 +-
 ...tualgateway_virtualgatewayfileaccesslog.go |   4 +-
 ...ateway_virtualgatewaygrpcconnectionpool.go |   4 +-
 ...gateway_virtualgatewayhealthcheckpolicy.go |   4 +-
 ...teway_virtualgatewayhttp2connectionpool.go |   4 +-
 ...ateway_virtualgatewayhttpconnectionpool.go |   4 +-
 ...h-virtualgateway_virtualgatewaylistener.go |   2 +-
 ...irtualgateway_virtualgatewaylistenertls.go |   4 +-
 ...virtualgatewaylistenertlsacmcertificate.go |   4 +-
 ...ay_virtualgatewaylistenertlscertificate.go |   2 +-
 ...irtualgatewaylistenertlsfilecertificate.go |   4 +-
 ...virtualgatewaylistenertlssdscertificate.go |   4 +-
 ...tualgatewaylistenertlsvalidationcontext.go |   2 +-
 ...atewaylistenertlsvalidationcontexttrust.go |   2 +-
 ...sh-virtualgateway_virtualgatewaylogging.go |   2 +-
 ...irtualgateway_virtualgatewayportmapping.go |   4 +-
 ...pmesh-virtualgateway_virtualgatewayspec.go |   2 +-
 ...eway_virtualgatewaytlsvalidationcontext.go |   2 +-
 ...tualgatewaytlsvalidationcontextacmtrust.go |   4 +-
 ...ualgatewaytlsvalidationcontextfiletrust.go |   4 +-
 ...tualgatewaytlsvalidationcontextsdstrust.go |   4 +-
 ...virtualgatewaytlsvalidationcontexttrust.go |   2 +-
 .../appmesh/aws-appmesh-virtualnode.go        |   6 +-
 .../aws-appmesh-virtualnode_accesslog.go      |   2 +-
 ...irtualnode_awscloudmapinstanceattribute.go |   4 +-
 ...virtualnode_awscloudmapservicediscovery.go |   4 +-
 .../aws-appmesh-virtualnode_backend.go        |   2 +-
 ...aws-appmesh-virtualnode_backenddefaults.go |   2 +-
 .../aws-appmesh-virtualnode_clientpolicy.go   |   2 +-
 ...aws-appmesh-virtualnode_clientpolicytls.go |   4 +-
 ...ppmesh-virtualnode_clienttlscertificate.go |   2 +-
 ...appmesh-virtualnode_dnsservicediscovery.go |   4 +-
 .../aws-appmesh-virtualnode_duration.go       |   4 +-
 .../aws-appmesh-virtualnode_fileaccesslog.go  |   4 +-
 .../aws-appmesh-virtualnode_grpctimeout.go    |   2 +-
 .../aws-appmesh-virtualnode_healthcheck.go    |   4 +-
 .../aws-appmesh-virtualnode_httptimeout.go    |   2 +-
 .../aws-appmesh-virtualnode_listener.go       |   2 +-
 ...aws-appmesh-virtualnode_listenertimeout.go |   2 +-
 .../aws-appmesh-virtualnode_listenertls.go    |   4 +-
 ...h-virtualnode_listenertlsacmcertificate.go |   4 +-
 ...mesh-virtualnode_listenertlscertificate.go |   2 +-
 ...-virtualnode_listenertlsfilecertificate.go |   4 +-
 ...h-virtualnode_listenertlssdscertificate.go |   4 +-
 ...irtualnode_listenertlsvalidationcontext.go |   2 +-
 ...lnode_listenertlsvalidationcontexttrust.go |   2 +-
 .../aws-appmesh-virtualnode_logging.go        |   2 +-
 ...ws-appmesh-virtualnode_outlierdetection.go |   4 +-
 .../aws-appmesh-virtualnode_portmapping.go    |   4 +-
 ...ws-appmesh-virtualnode_servicediscovery.go |   2 +-
 ...tualnode_subjectalternativenamematchers.go |   4 +-
 ...esh-virtualnode_subjectalternativenames.go |   2 +-
 .../aws-appmesh-virtualnode_tcptimeout.go     |   2 +-
 ...ppmesh-virtualnode_tlsvalidationcontext.go |   2 +-
 ...irtualnode_tlsvalidationcontextacmtrust.go |   4 +-
 ...rtualnode_tlsvalidationcontextfiletrust.go |   4 +-
 ...irtualnode_tlsvalidationcontextsdstrust.go |   4 +-
 ...h-virtualnode_tlsvalidationcontexttrust.go |   2 +-
 ...h-virtualnode_virtualnodeconnectionpool.go |   2 +-
 ...rtualnode_virtualnodegrpcconnectionpool.go |   4 +-
 ...tualnode_virtualnodehttp2connectionpool.go |   4 +-
 ...rtualnode_virtualnodehttpconnectionpool.go |   4 +-
 ...aws-appmesh-virtualnode_virtualnodespec.go |   2 +-
 ...irtualnode_virtualnodetcpconnectionpool.go |   4 +-
 ...pmesh-virtualnode_virtualservicebackend.go |   4 +-
 .../appmesh/aws-appmesh-virtualrouter.go      |   6 +-
 .../aws-appmesh-virtualrouter_portmapping.go  |   4 +-
 ...esh-virtualrouter_virtualrouterlistener.go |   2 +-
 ...appmesh-virtualrouter_virtualrouterspec.go |   2 +-
 .../appmesh/aws-appmesh-virtualservice.go     |   6 +-
 ...rtualservice_virtualnodeserviceprovider.go |   4 +-
 ...ualservice_virtualrouterserviceprovider.go |   4 +-
 ...h-virtualservice_virtualserviceprovider.go |   2 +-
 ...pmesh-virtualservice_virtualservicespec.go |   2 +-
 .../apprunner/aws-apprunner-service.go        |   6 +-
 ...ner-service_authenticationconfiguration.go |   4 +-
 ...aws-apprunner-service_codeconfiguration.go |   4 +-
 ...prunner-service_codeconfigurationvalues.go |   4 +-
 .../aws-apprunner-service_coderepository.go   |   4 +-
 ...prunner-service_encryptionconfiguration.go |   4 +-
 ...runner-service_healthcheckconfiguration.go |   4 +-
 ...ws-apprunner-service_imageconfiguration.go |   4 +-
 .../aws-apprunner-service_imagerepository.go  |   4 +-
 ...apprunner-service_instanceconfiguration.go |   4 +-
 .../aws-apprunner-service_keyvaluepair.go     |   4 +-
 ...aws-apprunner-service_sourcecodeversion.go |   4 +-
 ...s-apprunner-service_sourceconfiguration.go |   4 +-
 .../appstream/aws-appstream-appblock.go       |   6 +-
 .../aws-appstream-appblock_s3location.go      |   4 +-
 .../aws-appstream-appblock_scriptdetails.go   |   4 +-
 .../appstream/aws-appstream-application.go    |   6 +-
 .../aws-appstream-application_s3location.go   |   4 +-
 ...s-appstream-applicationfleetassociation.go |   4 +-
 .../aws-appstream-directoryconfig.go          |   4 +-
 ...rectoryconfig_serviceaccountcredentials.go |   4 +-
 .../appstream/aws-appstream-fleet.go          |   6 +-
 .../aws-appstream-fleet_computecapacity.go    |   4 +-
 .../aws-appstream-fleet_domainjoininfo.go     |   4 +-
 .../aws-appstream-fleet_vpcconfig.go          |   4 +-
 .../appstream/aws-appstream-imagebuilder.go   |   6 +-
 ...s-appstream-imagebuilder_accessendpoint.go |   4 +-
 ...s-appstream-imagebuilder_domainjoininfo.go |   4 +-
 .../aws-appstream-imagebuilder_vpcconfig.go   |   4 +-
 .../appstream/aws-appstream-stack.go          |   6 +-
 .../aws-appstream-stack_accessendpoint.go     |   4 +-
 ...aws-appstream-stack_applicationsettings.go |   4 +-
 .../aws-appstream-stack_storageconnector.go   |   4 +-
 .../aws-appstream-stack_usersetting.go        |   4 +-
 .../aws-appstream-stackfleetassociation.go    |   4 +-
 .../aws-appstream-stackuserassociation.go     |   4 +-
 .../appstream/aws-appstream-user.go           |   4 +-
 .../appsync/aws-appsync-apicache.go           |   4 +-
 .../appsync/aws-appsync-apikey.go             |   4 +-
 .../appsync/aws-appsync-datasource.go         |   4 +-
 ...-appsync-datasource_authorizationconfig.go |   4 +-
 .../aws-appsync-datasource_awsiamconfig.go    |   4 +-
 .../aws-appsync-datasource_deltasyncconfig.go |   4 +-
 .../aws-appsync-datasource_dynamodbconfig.go  |   4 +-
 ...-appsync-datasource_elasticsearchconfig.go |   4 +-
 .../aws-appsync-datasource_httpconfig.go      |   4 +-
 .../aws-appsync-datasource_lambdaconfig.go    |   4 +-
 ...sync-datasource_opensearchserviceconfig.go |   4 +-
 ...ppsync-datasource_rdshttpendpointconfig.go |   4 +-
 ...ync-datasource_relationaldatabaseconfig.go |   4 +-
 .../aws-appsync-functionconfiguration.go      |   4 +-
 ...nfiguration_lambdaconflicthandlerconfig.go |   4 +-
 ...ppsync-functionconfiguration_syncconfig.go |   4 +-
 .../appsync/aws-appsync-graphqlapi.go         |   4 +-
 ...hqlapi_additionalauthenticationprovider.go |   4 +-
 ...qlapi_additionalauthenticationproviders.go |   2 +-
 ...ppsync-graphqlapi_cognitouserpoolconfig.go |   4 +-
 ...psync-graphqlapi_lambdaauthorizerconfig.go |   4 +-
 .../aws-appsync-graphqlapi_logconfig.go       |   4 +-
 ...-appsync-graphqlapi_openidconnectconfig.go |   4 +-
 .../appsync/aws-appsync-graphqlapi_tags.go    |   2 +-
 .../aws-appsync-graphqlapi_userpoolconfig.go  |   4 +-
 .../appsync/aws-appsync-graphqlschema.go      |   4 +-
 .../appsync/aws-appsync-resolver.go           |   4 +-
 .../aws-appsync-resolver_cachingconfig.go     |   4 +-
 ...nc-resolver_lambdaconflicthandlerconfig.go |   4 +-
 .../aws-appsync-resolver_pipelineconfig.go    |   4 +-
 .../aws-appsync-resolver_syncconfig.go        |   4 +-
 .../aps/aws-aps-rulegroupsnamespace.go        |   6 +-
 .../cloudformation/aps/aws-aps-workspace.go   |   6 +-
 .../cloudformation/ask/alexa-ask-skill.go     |   4 +-
 ...a-ask-skill_authenticationconfiguration.go |   4 +-
 .../ask/alexa-ask-skill_overrides.go          |   2 +-
 .../ask/alexa-ask-skill_skillpackage.go       |   4 +-
 .../athena/aws-athena-datacatalog.go          |   6 +-
 .../athena/aws-athena-datacatalog_tags.go     |   4 +-
 .../athena/aws-athena-namedquery.go           |   4 +-
 .../athena/aws-athena-preparedstatement.go    |   4 +-
 .../athena/aws-athena-workgroup.go            |   6 +-
 ...thena-workgroup_encryptionconfiguration.go |   4 +-
 .../aws-athena-workgroup_engineversion.go     |   4 +-
 ...ws-athena-workgroup_resultconfiguration.go |   4 +-
 ...na-workgroup_resultconfigurationupdates.go |   4 +-
 .../athena/aws-athena-workgroup_tags.go       |   4 +-
 ...athena-workgroup_workgroupconfiguration.go |   4 +-
 ...workgroup_workgroupconfigurationupdates.go |   4 +-
 .../aws-auditmanager-assessment.go            |   6 +-
 ...assessment_assessmentreportsdestination.go |   4 +-
 .../aws-auditmanager-assessment_awsaccount.go |   4 +-
 .../aws-auditmanager-assessment_awsservice.go |   4 +-
 .../aws-auditmanager-assessment_delegation.go |   4 +-
 .../aws-auditmanager-assessment_role.go       |   4 +-
 .../aws-auditmanager-assessment_scope.go      |   2 +-
 .../aws-autoscaling-autoscalinggroup.go       |   4 +-
 ...utoscalinggroup_acceleratorcountrequest.go |   4 +-
 ...ggroup_acceleratortotalmemorymibrequest.go |   4 +-
 ...nggroup_baselineebsbandwidthmbpsrequest.go |   4 +-
 ...g-autoscalinggroup_instancerequirements.go |   4 +-
 ...-autoscalinggroup_instancesdistribution.go |   4 +-
 ...scaling-autoscalinggroup_launchtemplate.go |   2 +-
 ...utoscalinggroup_launchtemplateoverrides.go |   4 +-
 ...calinggroup_launchtemplatespecification.go |   4 +-
 ...scalinggroup_lifecyclehookspecification.go |   4 +-
 ...utoscalinggroup_memorygibpervcpurequest.go |   4 +-
 ...aling-autoscalinggroup_memorymibrequest.go |   4 +-
 ...ling-autoscalinggroup_metricscollection.go |   4 +-
 ...g-autoscalinggroup_mixedinstancespolicy.go |   2 +-
 ...alinggroup_networkinterfacecountrequest.go |   4 +-
 ...oscalinggroup_notificationconfiguration.go |   4 +-
 ...utoscaling-autoscalinggroup_tagproperty.go |   4 +-
 ...scalinggroup_totallocalstoragegbrequest.go |   4 +-
 ...aling-autoscalinggroup_vcpucountrequest.go |   4 +-
 .../aws-autoscaling-launchconfiguration.go    |   4 +-
 ...scaling-launchconfiguration_blockdevice.go |   4 +-
 ...-launchconfiguration_blockdevicemapping.go |   4 +-
 ...ling-launchconfiguration_metadataoption.go |   4 +-
 ...ing-launchconfiguration_metadataoptions.go |   4 +-
 .../aws-autoscaling-lifecyclehook.go          |   4 +-
 .../aws-autoscaling-scalingpolicy.go          |   4 +-
 ...ingpolicy_customizedmetricspecification.go |   4 +-
 ...toscaling-scalingpolicy_metricdimension.go |   4 +-
 ...ingpolicy_predefinedmetricspecification.go |   4 +-
 ...ngpolicy_predictivescalingconfiguration.go |   4 +-
 ...cy_predictivescalingmetricspecification.go |   4 +-
 ...y_predictivescalingpredefinedloadmetric.go |   4 +-
 ...y_predictivescalingpredefinedmetricpair.go |   4 +-
 ...redictivescalingpredefinedscalingmetric.go |   4 +-
 ...utoscaling-scalingpolicy_stepadjustment.go |   4 +-
 ...alingpolicy_targettrackingconfiguration.go |   4 +-
 .../aws-autoscaling-scheduledaction.go        |   4 +-
 .../autoscaling/aws-autoscaling-warmpool.go   |   4 +-
 .../aws-autoscalingplans-scalingplan.go       |   2 +-
 ...lingplans-scalingplan_applicationsource.go |   4 +-
 ...gplan_customizedloadmetricspecification.go |   4 +-
 ...an_customizedscalingmetricspecification.go |   4 +-
 ...calingplans-scalingplan_metricdimension.go |   4 +-
 ...gplan_predefinedloadmetricspecification.go |   4 +-
 ...an_predefinedscalingmetricspecification.go |   4 +-
 ...ingplans-scalingplan_scalinginstruction.go |   4 +-
 ...-autoscalingplans-scalingplan_tagfilter.go |   4 +-
 ...scalingplan_targettrackingconfiguration.go |   4 +-
 .../backup/aws-backup-backupplan.go           |   4 +-
 ...pplan_advancedbackupsettingresourcetype.go |   4 +-
 ...ackup-backupplan_backupplanresourcetype.go |   4 +-
 ...ackup-backupplan_backupruleresourcetype.go |   4 +-
 ...ackup-backupplan_copyactionresourcetype.go |   4 +-
 ...backup-backupplan_lifecycleresourcetype.go |   4 +-
 .../backup/aws-backup-backupselection.go      |   4 +-
 ...upselection_backupselectionresourcetype.go |   4 +-
 ...p-backupselection_conditionresourcetype.go |   4 +-
 .../backup/aws-backup-backupvault.go          |   4 +-
 ...ackup-backupvault_lockconfigurationtype.go |   4 +-
 ...ckup-backupvault_notificationobjecttype.go |   4 +-
 .../backup/aws-backup-framework.go            |   6 +-
 ...-backup-framework_controlinputparameter.go |   4 +-
 .../aws-backup-framework_frameworkcontrol.go  |   4 +-
 .../backup/aws-backup-reportplan.go           |   6 +-
 .../batch/aws-batch-computeenvironment.go     |   4 +-
 ...tch-computeenvironment_computeresources.go |   4 +-
 ...mputeenvironment_ec2configurationobject.go |   4 +-
 ...environment_launchtemplatespecification.go |   4 +-
 .../batch/aws-batch-jobdefinition.go          |   4 +-
 ...batch-jobdefinition_authorizationconfig.go |   4 +-
 ...batch-jobdefinition_containerproperties.go |   4 +-
 .../batch/aws-batch-jobdefinition_device.go   |   4 +-
 ...ch-jobdefinition_efsvolumeconfiguration.go |   4 +-
 .../aws-batch-jobdefinition_environment.go    |   4 +-
 .../aws-batch-jobdefinition_evaluateonexit.go |   4 +-
 ...definition_fargateplatformconfiguration.go |   4 +-
 ...aws-batch-jobdefinition_linuxparameters.go |   4 +-
 ...ws-batch-jobdefinition_logconfiguration.go |   4 +-
 .../aws-batch-jobdefinition_mountpoints.go    |   4 +-
 ...atch-jobdefinition_networkconfiguration.go |   4 +-
 .../aws-batch-jobdefinition_nodeproperties.go |   4 +-
 ...s-batch-jobdefinition_noderangeproperty.go |   4 +-
 ...batch-jobdefinition_resourcerequirement.go |   4 +-
 .../aws-batch-jobdefinition_retrystrategy.go  |   4 +-
 .../batch/aws-batch-jobdefinition_secret.go   |   4 +-
 .../batch/aws-batch-jobdefinition_timeout.go  |   4 +-
 .../batch/aws-batch-jobdefinition_tmpfs.go    |   4 +-
 .../batch/aws-batch-jobdefinition_ulimit.go   |   4 +-
 .../batch/aws-batch-jobdefinition_volumes.go  |   4 +-
 .../aws-batch-jobdefinition_volumeshost.go    |   4 +-
 .../batch/aws-batch-jobqueue.go               |   4 +-
 ...-batch-jobqueue_computeenvironmentorder.go |   4 +-
 .../batch/aws-batch-schedulingpolicy.go       |   4 +-
 ...-batch-schedulingpolicy_fairsharepolicy.go |   4 +-
 ...-batch-schedulingpolicy_shareattributes.go |   4 +-
 .../budgets/aws-budgets-budget.go             |   2 +-
 .../budgets/aws-budgets-budget_budgetdata.go  |   4 +-
 .../budgets/aws-budgets-budget_costtypes.go   |   4 +-
 .../aws-budgets-budget_notification.go        |   4 +-
 ...gets-budget_notificationwithsubscribers.go |   2 +-
 .../budgets/aws-budgets-budget_spend.go       |   4 +-
 .../budgets/aws-budgets-budget_subscriber.go  |   4 +-
 .../budgets/aws-budgets-budget_timeperiod.go  |   4 +-
 .../budgets/aws-budgets-budgetsaction.go      |   4 +-
 ...s-budgets-budgetsaction_actionthreshold.go |   4 +-
 .../aws-budgets-budgetsaction_definition.go   |   2 +-
 ...dgets-budgetsaction_iamactiondefinition.go |   4 +-
 ...dgets-budgetsaction_scpactiondefinition.go |   4 +-
 ...dgets-budgetsaction_ssmactiondefinition.go |   4 +-
 .../aws-budgets-budgetsaction_subscriber.go   |   4 +-
 .../cassandra/aws-cassandra-keyspace.go       |   6 +-
 .../cassandra/aws-cassandra-table.go          |   6 +-
 .../aws-cassandra-table_billingmode.go        |   4 +-
 ...aws-cassandra-table_clusteringkeycolumn.go |   4 +-
 .../cassandra/aws-cassandra-table_column.go   |   4 +-
 ...cassandra-table_encryptionspecification.go |   4 +-
 ...s-cassandra-table_provisionedthroughput.go |   4 +-
 .../ce/aws-ce-anomalymonitor.go               |   4 +-
 .../ce/aws-ce-anomalysubscription.go          |   4 +-
 .../aws-ce-anomalysubscription_subscriber.go  |   4 +-
 .../cloudformation/ce/aws-ce-costcategory.go  |   4 +-
 .../aws-certificatemanager-account.go         |   2 +-
 ...nager-account_expiryeventsconfiguration.go |   4 +-
 .../aws-certificatemanager-certificate.go     |   6 +-
 ...ager-certificate_domainvalidationoption.go |   4 +-
 .../aws-chatbot-slackchannelconfiguration.go  |   4 +-
 .../cloud9/aws-cloud9-environmentec2.go       |   6 +-
 .../aws-cloud9-environmentec2_repository.go   |   4 +-
 .../aws-cloudformation-customresource.go      |   4 +-
 .../aws-cloudformation-macro.go               |   4 +-
 ...aws-cloudformation-moduledefaultversion.go |   4 +-
 .../aws-cloudformation-moduleversion.go       |   4 +-
 .../aws-cloudformation-publictypeversion.go   |   4 +-
 .../aws-cloudformation-publisher.go           |   4 +-
 ...s-cloudformation-resourcedefaultversion.go |   4 +-
 .../aws-cloudformation-resourceversion.go     |   4 +-
 ...formation-resourceversion_loggingconfig.go |   4 +-
 .../aws-cloudformation-stack.go               |   4 +-
 .../aws-cloudformation-stackset.go            |   4 +-
 ...-cloudformation-stackset_autodeployment.go |   4 +-
 ...oudformation-stackset_deploymenttargets.go |   4 +-
 ...formation-stackset_operationpreferences.go |   4 +-
 .../aws-cloudformation-stackset_parameter.go  |   4 +-
 ...-cloudformation-stackset_stackinstances.go |   4 +-
 .../aws-cloudformation-typeactivation.go      |   4 +-
 ...dformation-typeactivation_loggingconfig.go |   4 +-
 .../aws-cloudformation-waitcondition.go       |   4 +-
 .../aws-cloudformation-waitconditionhandle.go |   2 +-
 .../cloudformation/cloudformation/tag.go      |   4 +-
 .../cloudformation_suite_test.go              |   0
 .../cloudfront/aws-cloudfront-cachepolicy.go  |   2 +-
 ...loudfront-cachepolicy_cachepolicyconfig.go |   4 +-
 ...ws-cloudfront-cachepolicy_cookiesconfig.go |   4 +-
 ...ws-cloudfront-cachepolicy_headersconfig.go |   4 +-
 ...arametersincachekeyandforwardedtoorigin.go |   4 +-
 ...oudfront-cachepolicy_querystringsconfig.go |   4 +-
 ...oudfront-cloudfrontoriginaccessidentity.go |   2 +-
 ...ty_cloudfrontoriginaccessidentityconfig.go |   4 +-
 .../cloudfront/aws-cloudfront-distribution.go |   4 +-
 ...s-cloudfront-distribution_cachebehavior.go |   4 +-
 .../aws-cloudfront-distribution_cookies.go    |   4 +-
 ...dfront-distribution_customerrorresponse.go |   4 +-
 ...udfront-distribution_customoriginconfig.go |   4 +-
 ...front-distribution_defaultcachebehavior.go |   4 +-
 ...udfront-distribution_distributionconfig.go |   4 +-
 ...cloudfront-distribution_forwardedvalues.go |   4 +-
 ...dfront-distribution_functionassociation.go |   4 +-
 ...-cloudfront-distribution_georestriction.go |   4 +-
 ...-distribution_lambdafunctionassociation.go |   4 +-
 ...udfront-distribution_legacycustomorigin.go |   4 +-
 ...-cloudfront-distribution_legacys3origin.go |   4 +-
 .../aws-cloudfront-distribution_logging.go    |   4 +-
 .../aws-cloudfront-distribution_origin.go     |   4 +-
 ...udfront-distribution_origincustomheader.go |   4 +-
 ...aws-cloudfront-distribution_origingroup.go |   4 +-
 ...istribution_origingroupfailovercriteria.go |   2 +-
 ...oudfront-distribution_origingroupmember.go |   4 +-
 ...udfront-distribution_origingroupmembers.go |   4 +-
 ...ws-cloudfront-distribution_origingroups.go |   4 +-
 ...ws-cloudfront-distribution_originshield.go |   4 +-
 ...ws-cloudfront-distribution_restrictions.go |   2 +-
 ...-cloudfront-distribution_s3originconfig.go |   4 +-
 ...aws-cloudfront-distribution_statuscodes.go |   4 +-
 ...oudfront-distribution_viewercertificate.go |   4 +-
 .../cloudfront/aws-cloudfront-function.go     |   4 +-
 .../aws-cloudfront-function_functionconfig.go |   4 +-
 ...ws-cloudfront-function_functionmetadata.go |   4 +-
 .../cloudfront/aws-cloudfront-keygroup.go     |   2 +-
 .../aws-cloudfront-keygroup_keygroupconfig.go |   4 +-
 .../aws-cloudfront-originrequestpolicy.go     |   2 +-
 ...front-originrequestpolicy_cookiesconfig.go |   4 +-
 ...front-originrequestpolicy_headersconfig.go |   4 +-
 ...requestpolicy_originrequestpolicyconfig.go |   4 +-
 ...-originrequestpolicy_querystringsconfig.go |   4 +-
 .../cloudfront/aws-cloudfront-publickey.go    |   2 +-
 ...ws-cloudfront-publickey_publickeyconfig.go |   4 +-
 .../aws-cloudfront-realtimelogconfig.go       |   4 +-
 ...s-cloudfront-realtimelogconfig_endpoint.go |   4 +-
 ...t-realtimelogconfig_kinesisstreamconfig.go |   4 +-
 .../aws-cloudfront-responseheaderspolicy.go   |   2 +-
 ...headerspolicy_accesscontrolallowheaders.go |   4 +-
 ...headerspolicy_accesscontrolallowmethods.go |   4 +-
 ...headerspolicy_accesscontrolalloworigins.go |   4 +-
 ...eaderspolicy_accesscontrolexposeheaders.go |   4 +-
 ...onseheaderspolicy_contentsecuritypolicy.go |   4 +-
 ...esponseheaderspolicy_contenttypeoptions.go |   4 +-
 ...dfront-responseheaderspolicy_corsconfig.go |   4 +-
 ...ront-responseheaderspolicy_customheader.go |   4 +-
 ...sponseheaderspolicy_customheadersconfig.go |   2 +-
 ...ront-responseheaderspolicy_frameoptions.go |   4 +-
 ...nt-responseheaderspolicy_referrerpolicy.go |   4 +-
 ...aderspolicy_responseheaderspolicyconfig.go |   4 +-
 ...onseheaderspolicy_securityheadersconfig.go |   2 +-
 ...seheaderspolicy_stricttransportsecurity.go |   4 +-
 ...ont-responseheaderspolicy_xssprotection.go |   4 +-
 .../aws-cloudfront-streamingdistribution.go   |   4 +-
 ...loudfront-streamingdistribution_logging.go |   4 +-
 ...oudfront-streamingdistribution_s3origin.go |   4 +-
 ...istribution_streamingdistributionconfig.go |   4 +-
 ...nt-streamingdistribution_trustedsigners.go |   4 +-
 .../cloudtrail/aws-cloudtrail-trail.go        |   6 +-
 .../aws-cloudtrail-trail_dataresource.go      |   4 +-
 .../aws-cloudtrail-trail_eventselector.go     |   4 +-
 .../aws-cloudtrail-trail_insightselector.go   |   4 +-
 .../cloudwatch/aws-cloudwatch-alarm.go        |   4 +-
 .../aws-cloudwatch-alarm_dimension.go         |   4 +-
 .../cloudwatch/aws-cloudwatch-alarm_metric.go |   4 +-
 .../aws-cloudwatch-alarm_metricdataquery.go   |   4 +-
 .../aws-cloudwatch-alarm_metricstat.go        |   4 +-
 .../aws-cloudwatch-anomalydetector.go         |   4 +-
 ...loudwatch-anomalydetector_configuration.go |   4 +-
 ...ws-cloudwatch-anomalydetector_dimension.go |   4 +-
 .../aws-cloudwatch-anomalydetector_metric.go  |   4 +-
 ...watch-anomalydetector_metricdataqueries.go |   2 +-
 ...udwatch-anomalydetector_metricdataquery.go |   4 +-
 ...omalydetector_metricmathanomalydetector.go |   2 +-
 ...s-cloudwatch-anomalydetector_metricstat.go |   4 +-
 .../aws-cloudwatch-anomalydetector_range.go   |   4 +-
 ...alydetector_singlemetricanomalydetector.go |   4 +-
 .../aws-cloudwatch-compositealarm.go          |   4 +-
 .../cloudwatch/aws-cloudwatch-dashboard.go    |   4 +-
 .../cloudwatch/aws-cloudwatch-insightrule.go  |   4 +-
 .../aws-cloudwatch-insightrule_tags.go        |   2 +-
 .../cloudwatch/aws-cloudwatch-metricstream.go |   6 +-
 ...udwatch-metricstream_metricstreamfilter.go |   4 +-
 .../codeartifact/aws-codeartifact-domain.go   |   6 +-
 .../aws-codeartifact-repository.go            |   6 +-
 .../codebuild/aws-codebuild-project.go        |   6 +-
 .../aws-codebuild-project_artifacts.go        |   4 +-
 ...aws-codebuild-project_batchrestrictions.go |   4 +-
 ...aws-codebuild-project_buildstatusconfig.go |   4 +-
 ...-codebuild-project_cloudwatchlogsconfig.go |   4 +-
 .../aws-codebuild-project_environment.go      |   4 +-
 ...s-codebuild-project_environmentvariable.go |   4 +-
 .../aws-codebuild-project_filtergroup.go      |   2 +-
 ...s-codebuild-project_gitsubmodulesconfig.go |   4 +-
 .../aws-codebuild-project_logsconfig.go       |   2 +-
 ...debuild-project_projectbuildbatchconfig.go |   4 +-
 .../aws-codebuild-project_projectcache.go     |   4 +-
 ...build-project_projectfilesystemlocation.go |   4 +-
 ...-codebuild-project_projectsourceversion.go |   4 +-
 .../aws-codebuild-project_projecttriggers.go  |   4 +-
 ...ws-codebuild-project_registrycredential.go |   4 +-
 .../aws-codebuild-project_s3logsconfig.go     |   4 +-
 .../codebuild/aws-codebuild-project_source.go |   4 +-
 .../aws-codebuild-project_sourceauth.go       |   4 +-
 .../aws-codebuild-project_vpcconfig.go        |   4 +-
 .../aws-codebuild-project_webhookfilter.go    |   4 +-
 .../codebuild/aws-codebuild-reportgroup.go    |   6 +-
 ...odebuild-reportgroup_reportexportconfig.go |   4 +-
 ...ebuild-reportgroup_s3reportexportconfig.go |   4 +-
 .../aws-codebuild-sourcecredential.go         |   4 +-
 .../codecommit/aws-codecommit-repository.go   |   6 +-
 .../aws-codecommit-repository_code.go         |   4 +-
 ...codecommit-repository_repositorytrigger.go |   4 +-
 .../aws-codecommit-repository_s3.go           |   4 +-
 .../codedeploy/aws-codedeploy-application.go  |   6 +-
 .../aws-codedeploy-deploymentconfig.go        |   4 +-
 ...oy-deploymentconfig_minimumhealthyhosts.go |   4 +-
 ...deploy-deploymentconfig_timebasedcanary.go |   4 +-
 ...deploy-deploymentconfig_timebasedlinear.go |   4 +-
 ...y-deploymentconfig_trafficroutingconfig.go |   4 +-
 .../aws-codedeploy-deploymentgroup.go         |   4 +-
 .../aws-codedeploy-deploymentgroup_alarm.go   |   4 +-
 ...ploy-deploymentgroup_alarmconfiguration.go |   4 +-
 ...ploymentgroup_autorollbackconfiguration.go |   4 +-
 ...tgroup_bluegreendeploymentconfiguration.go |   2 +-
 ...mentgroup_blueinstanceterminationoption.go |   4 +-
 ...s-codedeploy-deploymentgroup_deployment.go |   4 +-
 ...y-deploymentgroup_deploymentreadyoption.go |   4 +-
 ...edeploy-deploymentgroup_deploymentstyle.go |   4 +-
 ...codedeploy-deploymentgroup_ec2tagfilter.go |   4 +-
 ...ws-codedeploy-deploymentgroup_ec2tagset.go |   2 +-
 ...loy-deploymentgroup_ec2tagsetlistobject.go |   2 +-
 ...s-codedeploy-deploymentgroup_ecsservice.go |   4 +-
 .../aws-codedeploy-deploymentgroup_elbinfo.go |   4 +-
 ...dedeploy-deploymentgroup_githublocation.go |   4 +-
 ...ymentgroup_greenfleetprovisioningoption.go |   4 +-
 ...deploy-deploymentgroup_loadbalancerinfo.go |   2 +-
 ...deploy-deploymentgroup_onpremisestagset.go |   2 +-
 ...loymentgroup_onpremisestagsetlistobject.go |   2 +-
 ...deploy-deploymentgroup_revisionlocation.go |   4 +-
 ...s-codedeploy-deploymentgroup_s3location.go |   4 +-
 ...ws-codedeploy-deploymentgroup_tagfilter.go |   4 +-
 ...edeploy-deploymentgroup_targetgroupinfo.go |   4 +-
 ...odedeploy-deploymentgroup_triggerconfig.go |   4 +-
 .../aws-codeguruprofiler-profilinggroup.go    |   6 +-
 ...codeguruprofiler-profilinggroup_channel.go |   4 +-
 ...-codegurureviewer-repositoryassociation.go |   6 +-
 .../aws-codepipeline-customactiontype.go      |   6 +-
 ...peline-customactiontype_artifactdetails.go |   4 +-
 ...ustomactiontype_configurationproperties.go |   4 +-
 ...-codepipeline-customactiontype_settings.go |   4 +-
 .../codepipeline/aws-codepipeline-pipeline.go |   6 +-
 ...codepipeline-pipeline_actiondeclaration.go |   4 +-
 .../aws-codepipeline-pipeline_actiontypeid.go |   4 +-
 ...aws-codepipeline-pipeline_artifactstore.go |   4 +-
 ...-codepipeline-pipeline_artifactstoremap.go |   4 +-
 ...odepipeline-pipeline_blockerdeclaration.go |   4 +-
 ...aws-codepipeline-pipeline_encryptionkey.go |   4 +-
 ...aws-codepipeline-pipeline_inputartifact.go |   4 +-
 ...ws-codepipeline-pipeline_outputartifact.go |   4 +-
 ...-codepipeline-pipeline_stagedeclaration.go |   4 +-
 ...s-codepipeline-pipeline_stagetransition.go |   4 +-
 .../codepipeline/aws-codepipeline-webhook.go  |   4 +-
 ...peline-webhook_webhookauthconfiguration.go |   4 +-
 ...-codepipeline-webhook_webhookfilterrule.go |   4 +-
 .../codestar/aws-codestar-githubrepository.go |   4 +-
 .../aws-codestar-githubrepository_code.go     |   2 +-
 .../aws-codestar-githubrepository_s3.go       |   4 +-
 .../aws-codestarconnections-connection.go     |   6 +-
 ...-codestarnotifications-notificationrule.go |   4 +-
 ...arnotifications-notificationrule_target.go |   4 +-
 .../cognito/aws-cognito-identitypool.go       |   4 +-
 ...to-identitypool_cognitoidentityprovider.go |   4 +-
 ...aws-cognito-identitypool_cognitostreams.go |   4 +-
 .../aws-cognito-identitypool_pushsync.go      |   4 +-
 .../aws-cognito-identitypoolroleattachment.go |   4 +-
 ...-identitypoolroleattachment_mappingrule.go |   4 +-
 ...-identitypoolroleattachment_rolemapping.go |   4 +-
 ...olroleattachment_rulesconfigurationtype.go |   2 +-
 .../cognito/aws-cognito-userpool.go           |   4 +-
 ...cognito-userpool_accountrecoverysetting.go |   2 +-
 ...-cognito-userpool_admincreateuserconfig.go |   4 +-
 .../aws-cognito-userpool_customemailsender.go |   4 +-
 .../aws-cognito-userpool_customsmssender.go   |   4 +-
 ...ws-cognito-userpool_deviceconfiguration.go |   4 +-
 ...aws-cognito-userpool_emailconfiguration.go |   4 +-
 ...-cognito-userpool_invitemessagetemplate.go |   4 +-
 .../aws-cognito-userpool_lambdaconfig.go      |   4 +-
 ...ito-userpool_numberattributeconstraints.go |   4 +-
 .../aws-cognito-userpool_passwordpolicy.go    |   4 +-
 .../cognito/aws-cognito-userpool_policies.go  |   2 +-
 .../aws-cognito-userpool_recoveryoption.go    |   4 +-
 .../aws-cognito-userpool_schemaattribute.go   |   4 +-
 .../aws-cognito-userpool_smsconfiguration.go  |   4 +-
 ...ito-userpool_stringattributeconstraints.go |   4 +-
 ...-cognito-userpool_usernameconfiguration.go |   4 +-
 .../aws-cognito-userpool_userpooladdons.go    |   4 +-
 ...to-userpool_verificationmessagetemplate.go |   4 +-
 .../cognito/aws-cognito-userpoolclient.go     |   4 +-
 ...o-userpoolclient_analyticsconfiguration.go |   4 +-
 ...gnito-userpoolclient_tokenvalidityunits.go |   4 +-
 .../cognito/aws-cognito-userpooldomain.go     |   4 +-
 ...o-userpooldomain_customdomainconfigtype.go |   4 +-
 .../cognito/aws-cognito-userpoolgroup.go      |   4 +-
 .../aws-cognito-userpoolidentityprovider.go   |   4 +-
 .../aws-cognito-userpoolresourceserver.go     |   4 +-
 ...lresourceserver_resourceserverscopetype.go |   4 +-
 ...ito-userpoolriskconfigurationattachment.go |   4 +-
 ...onattachment_accounttakeoveractionstype.go |   2 +-
 ...ionattachment_accounttakeoveractiontype.go |   4 +-
 ...nt_accounttakeoverriskconfigurationtype.go |   2 +-
 ...hment_compromisedcredentialsactionstype.go |   4 +-
 ...romisedcredentialsriskconfigurationtype.go |   4 +-
 ...ationattachment_notifyconfigurationtype.go |   4 +-
 ...configurationattachment_notifyemailtype.go |   4 +-
 ...tachment_riskexceptionconfigurationtype.go |   4 +-
 ...gnito-userpooluicustomizationattachment.go |   4 +-
 .../cognito/aws-cognito-userpooluser.go       |   4 +-
 .../aws-cognito-userpooluser_attributetype.go |   4 +-
 ...s-cognito-userpoolusertogroupattachment.go |   4 +-
 .../aws-config-aggregationauthorization.go    |   6 +-
 .../config/aws-config-configrule.go           |   4 +-
 .../config/aws-config-configrule_scope.go     |   4 +-
 .../config/aws-config-configrule_source.go    |   4 +-
 .../aws-config-configrule_sourcedetail.go     |   4 +-
 .../aws-config-configurationaggregator.go     |   6 +-
 ...tionaggregator_accountaggregationsource.go |   4 +-
 ...ggregator_organizationaggregationsource.go |   4 +-
 .../aws-config-configurationrecorder.go       |   4 +-
 ...ig-configurationrecorder_recordinggroup.go |   4 +-
 .../config/aws-config-conformancepack.go      |   4 +-
 ...mancepack_conformancepackinputparameter.go |   4 +-
 .../config/aws-config-deliverychannel.go      |   4 +-
 ...hannel_configsnapshotdeliveryproperties.go |   4 +-
 .../aws-config-organizationconfigrule.go      |   4 +-
 ...nfigrule_organizationcustomrulemetadata.go |   4 +-
 ...figrule_organizationmanagedrulemetadata.go |   4 +-
 .../aws-config-organizationconformancepack.go |   4 +-
 ...mancepack_conformancepackinputparameter.go |   4 +-
 .../aws-config-remediationconfiguration.go    |   4 +-
 ...ediationconfiguration_executioncontrols.go |   2 +-
 ...configuration_remediationparametervalue.go |   2 +-
 ...-remediationconfiguration_resourcevalue.go |   4 +-
 ...ig-remediationconfiguration_ssmcontrols.go |   4 +-
 ...ig-remediationconfiguration_staticvalue.go |   4 +-
 .../config/aws-config-storedquery.go          |   6 +-
 .../connect/aws-connect-contactflow.go        |   6 +-
 .../connect/aws-connect-contactflowmodule.go  |   6 +-
 .../connect/aws-connect-hoursofoperation.go   |   6 +-
 ...hoursofoperation_hoursofoperationconfig.go |   4 +-
 ...rsofoperation_hoursofoperationtimeslice.go |   4 +-
 .../connect/aws-connect-quickconnect.go       |   6 +-
 ...ckconnect_phonenumberquickconnectconfig.go |   4 +-
 ...ct-quickconnect_queuequickconnectconfig.go |   4 +-
 ...connect-quickconnect_quickconnectconfig.go |   4 +-
 ...ect-quickconnect_userquickconnectconfig.go |   4 +-
 .../connect/aws-connect-user.go               |   6 +-
 .../aws-connect-user_useridentityinfo.go      |   4 +-
 .../aws-connect-user_userphoneconfig.go       |   4 +-
 .../connect/aws-connect-userhierarchygroup.go |   4 +-
 .../cur/aws-cur-reportdefinition.go           |   4 +-
 .../cloudformation/custom_resource.go         |   2 +-
 .../aws-customerprofiles-domain.go            |   6 +-
 .../aws-customerprofiles-integration.go       |   6 +-
 ...rprofiles-integration_connectoroperator.go |   4 +-
 ...omerprofiles-integration_flowdefinition.go |   4 +-
 ...files-integration_incrementalpullconfig.go |   4 +-
 ...les-integration_marketosourceproperties.go |   4 +-
 ...profiles-integration_s3sourceproperties.go |   4 +-
 ...-integration_salesforcesourceproperties.go |   4 +-
 ...-integration_scheduledtriggerproperties.go |   4 +-
 ...-integration_servicenowsourceproperties.go |   4 +-
 ...s-integration_sourceconnectorproperties.go |   2 +-
 ...erprofiles-integration_sourceflowconfig.go |   4 +-
 .../aws-customerprofiles-integration_task.go  |   4 +-
 ...rprofiles-integration_taskpropertiesmap.go |   4 +-
 ...tomerprofiles-integration_triggerconfig.go |   4 +-
 ...rprofiles-integration_triggerproperties.go |   2 +-
 ...les-integration_zendesksourceproperties.go |   4 +-
 .../aws-customerprofiles-objecttype.go        |   6 +-
 ...ws-customerprofiles-objecttype_fieldmap.go |   4 +-
 .../aws-customerprofiles-objecttype_keymap.go |   4 +-
 ...omerprofiles-objecttype_objecttypefield.go |   4 +-
 ...stomerprofiles-objecttype_objecttypekey.go |   4 +-
 .../databrew/aws-databrew-dataset.go          |   6 +-
 .../aws-databrew-dataset_csvoptions.go        |   4 +-
 ...atabrew-dataset_databaseinputdefinition.go |   4 +-
 ...brew-dataset_datacataloginputdefinition.go |   4 +-
 .../aws-databrew-dataset_datasetparameter.go  |   4 +-
 .../aws-databrew-dataset_datetimeoptions.go   |   4 +-
 .../aws-databrew-dataset_exceloptions.go      |   4 +-
 .../aws-databrew-dataset_fileslimit.go        |   4 +-
 .../aws-databrew-dataset_filterexpression.go  |   4 +-
 .../aws-databrew-dataset_filtervalue.go       |   4 +-
 .../aws-databrew-dataset_formatoptions.go     |   2 +-
 .../databrew/aws-databrew-dataset_input.go    |   2 +-
 .../aws-databrew-dataset_jsonoptions.go       |   4 +-
 .../databrew/aws-databrew-dataset_metadata.go |   4 +-
 .../aws-databrew-dataset_pathoptions.go       |   2 +-
 .../aws-databrew-dataset_pathparameter.go     |   4 +-
 .../aws-databrew-dataset_s3location.go        |   4 +-
 .../databrew/aws-databrew-job.go              |   6 +-
 .../aws-databrew-job_allowedstatistics.go     |   4 +-
 .../aws-databrew-job_columnselector.go        |   4 +-
 ...abrew-job_columnstatisticsconfiguration.go |   2 +-
 .../aws-databrew-job_csvoutputoptions.go      |   4 +-
 .../aws-databrew-job_databaseoutput.go        |   4 +-
 ...databrew-job_databasetableoutputoptions.go |   4 +-
 .../aws-databrew-job_datacatalogoutput.go     |   4 +-
 ...atabrew-job_entitydetectorconfiguration.go |   4 +-
 .../databrew/aws-databrew-job_jobsample.go    |   4 +-
 .../databrew/aws-databrew-job_output.go       |   4 +-
 .../aws-databrew-job_outputformatoptions.go   |   2 +-
 .../aws-databrew-job_outputlocation.go        |   4 +-
 .../databrew/aws-databrew-job_parametermap.go |   2 +-
 .../aws-databrew-job_profileconfiguration.go  |   2 +-
 .../databrew/aws-databrew-job_recipe.go       |   4 +-
 .../databrew/aws-databrew-job_s3location.go   |   4 +-
 .../aws-databrew-job_s3tableoutputoptions.go  |   2 +-
 .../aws-databrew-job_statisticoverride.go     |   4 +-
 ...ws-databrew-job_statisticsconfiguration.go |   4 +-
 ...ws-databrew-job_validationconfiguration.go |   4 +-
 .../databrew/aws-databrew-project.go          |   6 +-
 .../databrew/aws-databrew-project_sample.go   |   4 +-
 .../databrew/aws-databrew-recipe.go           |   6 +-
 .../databrew/aws-databrew-recipe_action.go    |   4 +-
 ...aws-databrew-recipe_conditionexpression.go |   4 +-
 ...abrew-recipe_datacataloginputdefinition.go |   4 +-
 .../aws-databrew-recipe_parametermap.go       |   2 +-
 .../aws-databrew-recipe_recipeparameters.go   |   4 +-
 .../aws-databrew-recipe_recipestep.go         |   2 +-
 .../aws-databrew-recipe_s3location.go         |   4 +-
 .../aws-databrew-recipe_secondaryinput.go     |   2 +-
 .../databrew/aws-databrew-ruleset.go          |   6 +-
 .../aws-databrew-ruleset_columnselector.go    |   4 +-
 .../databrew/aws-databrew-ruleset_rule.go     |   4 +-
 .../aws-databrew-ruleset_substitutionvalue.go |   4 +-
 .../aws-databrew-ruleset_threshold.go         |   4 +-
 .../databrew/aws-databrew-schedule.go         |   6 +-
 .../datapipeline/aws-datapipeline-pipeline.go |   4 +-
 .../aws-datapipeline-pipeline_field.go        |   4 +-
 ...atapipeline-pipeline_parameterattribute.go |   4 +-
 ...s-datapipeline-pipeline_parameterobject.go |   4 +-
 ...ws-datapipeline-pipeline_parametervalue.go |   4 +-
 ...ws-datapipeline-pipeline_pipelineobject.go |   4 +-
 .../aws-datapipeline-pipeline_pipelinetag.go  |   4 +-
 .../datasync/aws-datasync-agent.go            |   6 +-
 .../datasync/aws-datasync-locationefs.go      |   6 +-
 .../aws-datasync-locationefs_ec2config.go     |   4 +-
 .../aws-datasync-locationfsxwindows.go        |   6 +-
 .../datasync/aws-datasync-locationhdfs.go     |   6 +-
 .../aws-datasync-locationhdfs_namenode.go     |   4 +-
 ...-datasync-locationhdfs_qopconfiguration.go |   4 +-
 .../datasync/aws-datasync-locationnfs.go      |   6 +-
 .../aws-datasync-locationnfs_mountoptions.go  |   4 +-
 .../aws-datasync-locationnfs_onpremconfig.go  |   4 +-
 .../aws-datasync-locationobjectstorage.go     |   6 +-
 .../datasync/aws-datasync-locations3.go       |   6 +-
 .../aws-datasync-locations3_s3config.go       |   4 +-
 .../datasync/aws-datasync-locationsmb.go      |   6 +-
 .../aws-datasync-locationsmb_mountoptions.go  |   4 +-
 .../datasync/aws-datasync-task.go             |   6 +-
 .../datasync/aws-datasync-task_filterrule.go  |   4 +-
 .../datasync/aws-datasync-task_options.go     |   4 +-
 .../aws-datasync-task_taskschedule.go         |   4 +-
 .../cloudformation/dax/aws-dax-cluster.go     |   4 +-
 .../dax/aws-dax-cluster_ssespecification.go   |   4 +-
 .../dax/aws-dax-parametergroup.go             |   4 +-
 .../cloudformation/dax/aws-dax-subnetgroup.go |   4 +-
 .../detective/aws-detective-graph.go          |   4 +-
 .../aws-detective-memberinvitation.go         |   4 +-
 .../aws-devopsguru-notificationchannel.go     |   2 +-
 ...cationchannel_notificationchannelconfig.go |   2 +-
 ...ru-notificationchannel_snschannelconfig.go |   4 +-
 .../aws-devopsguru-resourcecollection.go      |   2 +-
 ...llection_cloudformationcollectionfilter.go |   4 +-
 ...urcecollection_resourcecollectionfilter.go |   2 +-
 .../aws-directoryservice-microsoftad.go       |   4 +-
 ...irectoryservice-microsoftad_vpcsettings.go |   4 +-
 .../aws-directoryservice-simplead.go          |   4 +-
 ...s-directoryservice-simplead_vpcsettings.go |   4 +-
 .../dlm/aws-dlm-lifecyclepolicy.go            |   6 +-
 .../dlm/aws-dlm-lifecyclepolicy_action.go     |   4 +-
 .../dlm/aws-dlm-lifecyclepolicy_createrule.go |   4 +-
 ...m-lifecyclepolicy_crossregioncopyaction.go |   4 +-
 ...yclepolicy_crossregioncopydeprecaterule.go |   4 +-
 ...fecyclepolicy_crossregioncopyretainrule.go |   4 +-
 ...dlm-lifecyclepolicy_crossregioncopyrule.go |   4 +-
 .../aws-dlm-lifecyclepolicy_deprecaterule.go  |   4 +-
 ...lifecyclepolicy_encryptionconfiguration.go |   4 +-
 ...aws-dlm-lifecyclepolicy_eventparameters.go |   4 +-
 .../aws-dlm-lifecyclepolicy_eventsource.go    |   4 +-
 ...aws-dlm-lifecyclepolicy_fastrestorerule.go |   4 +-
 .../dlm/aws-dlm-lifecyclepolicy_parameters.go |   4 +-
 .../aws-dlm-lifecyclepolicy_policydetails.go  |   6 +-
 .../dlm/aws-dlm-lifecyclepolicy_retainrule.go |   4 +-
 .../dlm/aws-dlm-lifecyclepolicy_schedule.go   |   6 +-
 .../dlm/aws-dlm-lifecyclepolicy_sharerule.go  |   4 +-
 .../cloudformation/dms/aws-dms-certificate.go |   4 +-
 .../cloudformation/dms/aws-dms-endpoint.go    |   6 +-
 .../dms/aws-dms-endpoint_docdbsettings.go     |   4 +-
 .../dms/aws-dms-endpoint_dynamodbsettings.go  |   4 +-
 .../aws-dms-endpoint_elasticsearchsettings.go |   4 +-
 .../dms/aws-dms-endpoint_ibmdb2settings.go    |   4 +-
 .../dms/aws-dms-endpoint_kafkasettings.go     |   4 +-
 .../dms/aws-dms-endpoint_kinesissettings.go   |   4 +-
 ...dms-endpoint_microsoftsqlserversettings.go |   4 +-
 .../dms/aws-dms-endpoint_mongodbsettings.go   |   4 +-
 .../dms/aws-dms-endpoint_mysqlsettings.go     |   4 +-
 .../dms/aws-dms-endpoint_neptunesettings.go   |   4 +-
 .../dms/aws-dms-endpoint_oraclesettings.go    |   4 +-
 .../aws-dms-endpoint_postgresqlsettings.go    |   4 +-
 .../dms/aws-dms-endpoint_redissettings.go     |   4 +-
 .../dms/aws-dms-endpoint_redshiftsettings.go  |   4 +-
 .../dms/aws-dms-endpoint_s3settings.go        |   4 +-
 .../dms/aws-dms-endpoint_sybasesettings.go    |   4 +-
 .../dms/aws-dms-eventsubscription.go          |   6 +-
 .../dms/aws-dms-replicationinstance.go        |   6 +-
 .../dms/aws-dms-replicationsubnetgroup.go     |   6 +-
 .../dms/aws-dms-replicationtask.go            |   6 +-
 .../docdb/aws-docdb-dbcluster.go              |   6 +-
 .../aws-docdb-dbclusterparametergroup.go      |   6 +-
 .../docdb/aws-docdb-dbinstance.go             |   6 +-
 .../docdb/aws-docdb-dbsubnetgroup.go          |   6 +-
 .../dynamodb/aws-dynamodb-globaltable.go      |   4 +-
 ...ynamodb-globaltable_attributedefinition.go |   4 +-
 ...globaltable_capacityautoscalingsettings.go |   4 +-
 ...ltable_contributorinsightsspecification.go |   4 +-
 ...namodb-globaltable_globalsecondaryindex.go |   4 +-
 .../aws-dynamodb-globaltable_keyschema.go     |   4 +-
 ...ynamodb-globaltable_localsecondaryindex.go |   4 +-
 ...ltable_pointintimerecoveryspecification.go |   4 +-
 .../aws-dynamodb-globaltable_projection.go    |   4 +-
 ...table_readprovisionedthroughputsettings.go |   4 +-
 ...eplicaglobalsecondaryindexspecification.go |   4 +-
 ...namodb-globaltable_replicaspecification.go |   6 +-
 ...odb-globaltable_replicassespecification.go |   4 +-
 ...s-dynamodb-globaltable_ssespecification.go |   4 +-
 ...ynamodb-globaltable_streamspecification.go |   4 +-
 ...argettrackingscalingpolicyconfiguration.go |   4 +-
 ...odb-globaltable_timetolivespecification.go |   4 +-
 ...able_writeprovisionedthroughputsettings.go |   2 +-
 .../dynamodb/aws-dynamodb-table.go            |   6 +-
 .../aws-dynamodb-table_attributedefinition.go |   4 +-
 ...-table_contributorinsightsspecification.go |   4 +-
 ...aws-dynamodb-table_globalsecondaryindex.go |   4 +-
 .../dynamodb/aws-dynamodb-table_keyschema.go  |   4 +-
 ...namodb-table_kinesisstreamspecification.go |   4 +-
 .../aws-dynamodb-table_localsecondaryindex.go |   4 +-
 ...-table_pointintimerecoveryspecification.go |   4 +-
 .../dynamodb/aws-dynamodb-table_projection.go |   4 +-
 ...ws-dynamodb-table_provisionedthroughput.go |   4 +-
 .../aws-dynamodb-table_ssespecification.go    |   4 +-
 .../aws-dynamodb-table_streamspecification.go |   4 +-
 ...-dynamodb-table_timetolivespecification.go |   4 +-
 .../ec2/aws-ec2-capacityreservation.go        |   4 +-
 ...c2-capacityreservation_tagspecification.go |   6 +-
 .../ec2/aws-ec2-capacityreservationfleet.go   |   4 +-
 ...ervationfleet_instancetypespecification.go |   4 +-
 ...pacityreservationfleet_tagspecification.go |   6 +-
 .../ec2/aws-ec2-carriergateway.go             |   6 +-
 .../ec2/aws-ec2-carriergateway_tags.go        |   4 +-
 .../ec2/aws-ec2-clientvpnauthorizationrule.go |   4 +-
 .../ec2/aws-ec2-clientvpnendpoint.go          |   4 +-
 ...dpoint_certificateauthenticationrequest.go |   4 +-
 ...vpnendpoint_clientauthenticationrequest.go |   4 +-
 ...-clientvpnendpoint_clientconnectoptions.go |   4 +-
 ...-clientvpnendpoint_connectionlogoptions.go |   4 +-
 ...t_directoryserviceauthenticationrequest.go |   4 +-
 ...endpoint_federatedauthenticationrequest.go |   4 +-
 ...-ec2-clientvpnendpoint_tagspecification.go |   6 +-
 .../ec2/aws-ec2-clientvpnroute.go             |   4 +-
 ...s-ec2-clientvpntargetnetworkassociation.go |   4 +-
 .../ec2/aws-ec2-customergateway.go            |   6 +-
 .../cloudformation/ec2/aws-ec2-dhcpoptions.go |   6 +-
 .../cloudformation/ec2/aws-ec2-ec2fleet.go    |   4 +-
 ...ws-ec2-ec2fleet_acceleratorcountrequest.go |   4 +-
 ...2fleet_acceleratortotalmemorymibrequest.go |   4 +-
 ...c2fleet_baselineebsbandwidthmbpsrequest.go |   4 +-
 .../ec2/aws-ec2-ec2fleet_capacityrebalance.go |   4 +-
 ...fleet_capacityreservationoptionsrequest.go |   4 +-
 ...2fleet_fleetlaunchtemplateconfigrequest.go |   2 +-
 ...eet_fleetlaunchtemplateoverridesrequest.go |   4 +-
 ...fleetlaunchtemplatespecificationrequest.go |   4 +-
 ...c2-ec2fleet_instancerequirementsrequest.go |   4 +-
 .../aws-ec2-ec2fleet_maintenancestrategies.go |   2 +-
 ...ws-ec2-ec2fleet_memorygibpervcpurequest.go |   4 +-
 .../ec2/aws-ec2-ec2fleet_memorymibrequest.go  |   4 +-
 ...2-ec2fleet_networkinterfacecountrequest.go |   4 +-
 ...aws-ec2-ec2fleet_ondemandoptionsrequest.go |   4 +-
 .../ec2/aws-ec2-ec2fleet_placement.go         |   4 +-
 .../aws-ec2-ec2fleet_spotoptionsrequest.go    |   4 +-
 .../ec2/aws-ec2-ec2fleet_tagspecification.go  |   6 +-
 ...leet_targetcapacityspecificationrequest.go |   4 +-
 ...ec2-ec2fleet_totallocalstoragegbrequest.go |   4 +-
 .../aws-ec2-ec2fleet_vcpucountrangerequest.go |   4 +-
 .../ec2/aws-ec2-egressonlyinternetgateway.go  |   4 +-
 .../cloudformation/ec2/aws-ec2-eip.go         |   6 +-
 .../ec2/aws-ec2-eipassociation.go             |   4 +-
 ...c2-enclavecertificateiamroleassociation.go |   4 +-
 .../cloudformation/ec2/aws-ec2-flowlog.go     |   6 +-
 .../aws-ec2-gatewayroutetableassociation.go   |   4 +-
 .../cloudformation/ec2/aws-ec2-host.go        |   4 +-
 .../cloudformation/ec2/aws-ec2-instance.go    |   6 +-
 .../aws-ec2-instance_associationparameter.go  |   4 +-
 .../aws-ec2-instance_blockdevicemapping.go    |   4 +-
 .../ec2/aws-ec2-instance_cpuoptions.go        |   4 +-
 .../aws-ec2-instance_creditspecification.go   |   4 +-
 .../ec2/aws-ec2-instance_ebs.go               |   4 +-
 ...ws-ec2-instance_elasticgpuspecification.go |   4 +-
 ...c2-instance_elasticinferenceaccelerator.go |   4 +-
 .../ec2/aws-ec2-instance_enclaveoptions.go    |   4 +-
 .../aws-ec2-instance_hibernationoptions.go    |   4 +-
 .../aws-ec2-instance_instanceipv6address.go   |   4 +-
 ...c2-instance_launchtemplatespecification.go |   4 +-
 .../aws-ec2-instance_licensespecification.go  |   4 +-
 .../ec2/aws-ec2-instance_networkinterface.go  |   4 +-
 .../ec2/aws-ec2-instance_nodevice.go          |   2 +-
 ...-instance_privateipaddressspecification.go |   4 +-
 .../ec2/aws-ec2-instance_ssmassociation.go    |   4 +-
 .../ec2/aws-ec2-instance_volume.go            |   4 +-
 .../ec2/aws-ec2-internetgateway.go            |   4 +-
 .../cloudformation/ec2/aws-ec2-ipam.go        |   6 +-
 .../ec2/aws-ec2-ipam_ipamoperatingregion.go   |   4 +-
 .../ec2/aws-ec2-ipamallocation.go             |   4 +-
 .../cloudformation/ec2/aws-ec2-ipampool.go    |   6 +-
 .../ec2/aws-ec2-ipampool_provisionedcidr.go   |   4 +-
 .../cloudformation/ec2/aws-ec2-ipamscope.go   |   6 +-
 .../ec2/aws-ec2-launchtemplate.go             |   4 +-
 ...aws-ec2-launchtemplate_acceleratorcount.go |   4 +-
 ...aunchtemplate_acceleratortotalmemorymib.go |   4 +-
 ...launchtemplate_baselineebsbandwidthmbps.go |   4 +-
 ...s-ec2-launchtemplate_blockdevicemapping.go |   4 +-
 ...mplate_capacityreservationspecification.go |   4 +-
 ...aunchtemplate_capacityreservationtarget.go |   4 +-
 .../ec2/aws-ec2-launchtemplate_cpuoptions.go  |   4 +-
 ...-ec2-launchtemplate_creditspecification.go |   4 +-
 .../ec2/aws-ec2-launchtemplate_ebs.go         |   4 +-
 ...-launchtemplate_elasticgpuspecification.go |   4 +-
 .../aws-ec2-launchtemplate_enclaveoptions.go  |   4 +-
 ...s-ec2-launchtemplate_hibernationoptions.go |   4 +-
 ...s-ec2-launchtemplate_iaminstanceprofile.go |   4 +-
 ...c2-launchtemplate_instancemarketoptions.go |   4 +-
 .../ec2/aws-ec2-launchtemplate_ipv6add.go     |   4 +-
 ...s-ec2-launchtemplate_launchtemplatedata.go |   4 +-
 ...unchtemplateelasticinferenceaccelerator.go |   4 +-
 ...template_launchtemplatetagspecification.go |   6 +-
 ...ec2-launchtemplate_licensespecification.go |   4 +-
 ...aws-ec2-launchtemplate_memorygibpervcpu.go |   4 +-
 .../ec2/aws-ec2-launchtemplate_memorymib.go   |   4 +-
 .../aws-ec2-launchtemplate_metadataoptions.go |   4 +-
 .../ec2/aws-ec2-launchtemplate_monitoring.go  |   4 +-
 ...aws-ec2-launchtemplate_networkinterface.go |   4 +-
 ...c2-launchtemplate_networkinterfacecount.go |   4 +-
 .../ec2/aws-ec2-launchtemplate_placement.go   |   4 +-
 .../aws-ec2-launchtemplate_privateipadd.go    |   4 +-
 .../ec2/aws-ec2-launchtemplate_spotoptions.go |   4 +-
 ...aws-ec2-launchtemplate_tagspecification.go |   6 +-
 ...-ec2-launchtemplate_totallocalstoragegb.go |   4 +-
 .../ec2/aws-ec2-launchtemplate_vcpucount.go   |   4 +-
 .../ec2/aws-ec2-localgatewayroute.go          |   4 +-
 ...c2-localgatewayroutetablevpcassociation.go |   6 +-
 ...calgatewayroutetablevpcassociation_tags.go |   4 +-
 .../cloudformation/ec2/aws-ec2-natgateway.go  |   6 +-
 .../cloudformation/ec2/aws-ec2-networkacl.go  |   6 +-
 .../ec2/aws-ec2-networkaclentry.go            |   4 +-
 .../ec2/aws-ec2-networkaclentry_icmp.go       |   4 +-
 .../ec2/aws-ec2-networkaclentry_portrange.go  |   4 +-
 .../ec2/aws-ec2-networkinsightsanalysis.go    |   6 +-
 ...tworkinsightsanalysis_alternatepathhint.go |   4 +-
 ...networkinsightsanalysis_analysisaclrule.go |   4 +-
 ...tworkinsightsanalysis_analysiscomponent.go |   4 +-
 ...tsanalysis_analysisloadbalancerlistener.go |   4 +-
 ...ghtsanalysis_analysisloadbalancertarget.go |   4 +-
 ...rkinsightsanalysis_analysispacketheader.go |   4 +-
 ...nsightsanalysis_analysisroutetableroute.go |   4 +-
 ...ightsanalysis_analysissecuritygrouprule.go |   4 +-
 ...ec2-networkinsightsanalysis_explanation.go |   4 +-
 ...2-networkinsightsanalysis_pathcomponent.go |   4 +-
 ...s-ec2-networkinsightsanalysis_portrange.go |   4 +-
 .../ec2/aws-ec2-networkinsightspath.go        |   6 +-
 .../ec2/aws-ec2-networkinterface.go           |   6 +-
 ...c2-networkinterface_instanceipv6address.go |   4 +-
 ...interface_privateipaddressspecification.go |   4 +-
 .../ec2/aws-ec2-networkinterfaceattachment.go |   4 +-
 .../ec2/aws-ec2-networkinterfacepermission.go |   4 +-
 .../ec2/aws-ec2-placementgroup.go             |   4 +-
 .../cloudformation/ec2/aws-ec2-prefixlist.go  |   6 +-
 .../ec2/aws-ec2-prefixlist_entry.go           |   4 +-
 .../cloudformation/ec2/aws-ec2-route.go       |   4 +-
 .../cloudformation/ec2/aws-ec2-routetable.go  |   6 +-
 .../ec2/aws-ec2-securitygroup.go              |   6 +-
 .../ec2/aws-ec2-securitygroup_egress.go       |   4 +-
 .../ec2/aws-ec2-securitygroup_ingress.go      |   4 +-
 .../ec2/aws-ec2-securitygroupegress.go        |   4 +-
 .../ec2/aws-ec2-securitygroupingress.go       |   4 +-
 .../cloudformation/ec2/aws-ec2-spotfleet.go   |   2 +-
 ...s-ec2-spotfleet_acceleratorcountrequest.go |   4 +-
 ...tfleet_acceleratortotalmemorymibrequest.go |   4 +-
 ...otfleet_baselineebsbandwidthmbpsrequest.go |   4 +-
 .../aws-ec2-spotfleet_blockdevicemapping.go   |   4 +-
 .../aws-ec2-spotfleet_classicloadbalancer.go  |   4 +-
 ...c2-spotfleet_classicloadbalancersconfig.go |   2 +-
 .../ec2/aws-ec2-spotfleet_ebsblockdevice.go   |   4 +-
 ...tfleet_fleetlaunchtemplatespecification.go |   4 +-
 .../ec2/aws-ec2-spotfleet_groupidentifier.go  |   4 +-
 ...otfleet_iaminstanceprofilespecification.go |   4 +-
 .../aws-ec2-spotfleet_instanceipv6address.go  |   4 +-
 ...t_instancenetworkinterfacespecification.go |   4 +-
 ...2-spotfleet_instancerequirementsrequest.go |   4 +-
 .../aws-ec2-spotfleet_launchtemplateconfig.go |   2 +-
 ...s-ec2-spotfleet_launchtemplateoverrides.go |   4 +-
 .../aws-ec2-spotfleet_loadbalancersconfig.go  |   2 +-
 ...s-ec2-spotfleet_memorygibpervcpurequest.go |   4 +-
 .../ec2/aws-ec2-spotfleet_memorymibrequest.go |   4 +-
 ...-spotfleet_networkinterfacecountrequest.go |   4 +-
 ...spotfleet_privateipaddressspecification.go |   4 +-
 ...aws-ec2-spotfleet_spotcapacityrebalance.go |   4 +-
 ...-spotfleet_spotfleetlaunchspecification.go |   4 +-
 .../aws-ec2-spotfleet_spotfleetmonitoring.go  |   4 +-
 ...c2-spotfleet_spotfleetrequestconfigdata.go |   4 +-
 ...ec2-spotfleet_spotfleettagspecification.go |   6 +-
 ...ec2-spotfleet_spotmaintenancestrategies.go |   2 +-
 .../ec2/aws-ec2-spotfleet_spotplacement.go    |   4 +-
 .../ec2/aws-ec2-spotfleet_targetgroup.go      |   4 +-
 .../aws-ec2-spotfleet_targetgroupsconfig.go   |   2 +-
 ...c2-spotfleet_totallocalstoragegbrequest.go |   4 +-
 ...aws-ec2-spotfleet_vcpucountrangerequest.go |   4 +-
 .../cloudformation/ec2/aws-ec2-subnet.go      |   6 +-
 ...c2-subnet_privatednsnameoptionsonlaunch.go |   4 +-
 .../ec2/aws-ec2-subnetcidrblock.go            |   4 +-
 .../aws-ec2-subnetnetworkaclassociation.go    |   4 +-
 .../aws-ec2-subnetroutetableassociation.go    |   4 +-
 .../ec2/aws-ec2-trafficmirrorfilter.go        |   6 +-
 .../ec2/aws-ec2-trafficmirrorfilterrule.go    |   4 +-
 ...mirrorfilterrule_trafficmirrorportrange.go |   4 +-
 .../ec2/aws-ec2-trafficmirrorsession.go       |   6 +-
 .../ec2/aws-ec2-trafficmirrortarget.go        |   6 +-
 .../ec2/aws-ec2-transitgateway.go             |   6 +-
 .../ec2/aws-ec2-transitgatewayattachment.go   |   6 +-
 .../ec2/aws-ec2-transitgatewayconnect.go      |   6 +-
 ...wayconnect_transitgatewayconnectoptions.go |   4 +-
 .../aws-ec2-transitgatewaymulticastdomain.go  |   6 +-
 ...ransitgatewaymulticastdomainassociation.go |   4 +-
 ...-ec2-transitgatewaymulticastgroupmember.go |   4 +-
 ...-ec2-transitgatewaymulticastgroupsource.go |   4 +-
 ...aws-ec2-transitgatewaypeeringattachment.go |   6 +-
 ..._transitgatewaypeeringattachmentoptions.go |   4 +-
 .../ec2/aws-ec2-transitgatewayroute.go        |   4 +-
 .../ec2/aws-ec2-transitgatewayroutetable.go   |   6 +-
 ...ec2-transitgatewayroutetableassociation.go |   4 +-
 ...ec2-transitgatewayroutetablepropagation.go |   4 +-
 .../aws-ec2-transitgatewayvpcattachment.go    |   6 +-
 .../cloudformation/ec2/aws-ec2-volume.go      |   6 +-
 .../ec2/aws-ec2-volumeattachment.go           |   4 +-
 .../cloudformation/ec2/aws-ec2-vpc.go         |   6 +-
 .../ec2/aws-ec2-vpccidrblock.go               |   4 +-
 .../ec2/aws-ec2-vpcdhcpoptionsassociation.go  |   4 +-
 .../cloudformation/ec2/aws-ec2-vpcendpoint.go |   4 +-
 ...s-ec2-vpcendpointconnectionnotification.go |   4 +-
 .../ec2/aws-ec2-vpcendpointservice.go         |   4 +-
 .../aws-ec2-vpcendpointservicepermissions.go  |   4 +-
 .../ec2/aws-ec2-vpcgatewayattachment.go       |   4 +-
 .../ec2/aws-ec2-vpcpeeringconnection.go       |   6 +-
 .../ec2/aws-ec2-vpnconnection.go              |   6 +-
 ...onnection_vpntunneloptionsspecification.go |   4 +-
 .../ec2/aws-ec2-vpnconnectionroute.go         |   4 +-
 .../cloudformation/ec2/aws-ec2-vpngateway.go  |   6 +-
 .../ec2/aws-ec2-vpngatewayroutepropagation.go |   4 +-
 .../ecr/aws-ecr-publicrepository.go           |   6 +-
 .../ecr/aws-ecr-registrypolicy.go             |   2 +-
 .../ecr/aws-ecr-replicationconfiguration.go   |   2 +-
 ...nconfiguration_replicationconfiguration.go |   2 +-
 ...ionconfiguration_replicationdestination.go |   4 +-
 ...eplicationconfiguration_replicationrule.go |   2 +-
 ...plicationconfiguration_repositoryfilter.go |   4 +-
 .../cloudformation/ecr/aws-ecr-repository.go  |   6 +-
 ...-ecr-repository_encryptionconfiguration.go |   4 +-
 ...r-repository_imagescanningconfiguration.go |   4 +-
 .../ecr/aws-ecr-repository_lifecyclepolicy.go |   4 +-
 .../ecs/aws-ecs-capacityprovider.go           |   6 +-
 ...pacityprovider_autoscalinggroupprovider.go |   4 +-
 ...aws-ecs-capacityprovider_managedscaling.go |   4 +-
 .../cloudformation/ecs/aws-ecs-cluster.go     |   6 +-
 ...cs-cluster_capacityproviderstrategyitem.go |   4 +-
 .../aws-ecs-cluster_clusterconfiguration.go   |   2 +-
 .../ecs/aws-ecs-cluster_clustersettings.go    |   4 +-
 ...ecs-cluster_executecommandconfiguration.go |   4 +-
 ...-cluster_executecommandlogconfiguration.go |   4 +-
 ...ecs-clustercapacityproviderassociations.go |   4 +-
 ...erassociations_capacityproviderstrategy.go |   4 +-
 .../ecs/aws-ecs-primarytaskset.go             |   4 +-
 .../cloudformation/ecs/aws-ecs-service.go     |   6 +-
 .../aws-ecs-service_awsvpcconfiguration.go    |   4 +-
 ...cs-service_capacityproviderstrategyitem.go |   4 +-
 ...ws-ecs-service_deploymentcircuitbreaker.go |   4 +-
 ...aws-ecs-service_deploymentconfiguration.go |   4 +-
 .../aws-ecs-service_deploymentcontroller.go   |   4 +-
 .../ecs/aws-ecs-service_loadbalancer.go       |   4 +-
 .../aws-ecs-service_networkconfiguration.go   |   2 +-
 .../aws-ecs-service_placementconstraint.go    |   4 +-
 .../ecs/aws-ecs-service_placementstrategy.go  |   4 +-
 .../ecs/aws-ecs-service_serviceregistry.go    |   4 +-
 .../ecs/aws-ecs-taskdefinition.go             |   6 +-
 ...-ecs-taskdefinition_authorizationconfig.go |   4 +-
 ...-ecs-taskdefinition_containerdefinition.go |   4 +-
 ...-ecs-taskdefinition_containerdependency.go |   4 +-
 .../ecs/aws-ecs-taskdefinition_device.go      |   4 +-
 ...askdefinition_dockervolumeconfiguration.go |   4 +-
 ...s-taskdefinition_efsvolumeconfiguration.go |   4 +-
 .../aws-ecs-taskdefinition_environmentfile.go |   4 +-
 ...aws-ecs-taskdefinition_ephemeralstorage.go |   4 +-
 ...cs-taskdefinition_firelensconfiguration.go |   4 +-
 .../ecs/aws-ecs-taskdefinition_healthcheck.go |   4 +-
 .../ecs/aws-ecs-taskdefinition_hostentry.go   |   4 +-
 ...ecs-taskdefinition_hostvolumeproperties.go |   4 +-
 ...ecs-taskdefinition_inferenceaccelerator.go |   4 +-
 ...s-ecs-taskdefinition_kernelcapabilities.go |   4 +-
 .../aws-ecs-taskdefinition_keyvaluepair.go    |   4 +-
 .../aws-ecs-taskdefinition_linuxparameters.go |   4 +-
 ...aws-ecs-taskdefinition_logconfiguration.go |   4 +-
 .../ecs/aws-ecs-taskdefinition_mountpoint.go  |   4 +-
 .../ecs/aws-ecs-taskdefinition_portmapping.go |   4 +-
 ...s-ecs-taskdefinition_proxyconfiguration.go |   4 +-
 ...cs-taskdefinition_repositorycredentials.go |   4 +-
 ...-ecs-taskdefinition_resourcerequirement.go |   4 +-
 .../aws-ecs-taskdefinition_runtimeplatform.go |   4 +-
 .../ecs/aws-ecs-taskdefinition_secret.go      |   4 +-
 .../aws-ecs-taskdefinition_systemcontrol.go   |   4 +-
 ...ition_taskdefinitionplacementconstraint.go |   4 +-
 .../ecs/aws-ecs-taskdefinition_tmpfs.go       |   4 +-
 .../ecs/aws-ecs-taskdefinition_ulimit.go      |   4 +-
 .../ecs/aws-ecs-taskdefinition_volume.go      |   4 +-
 .../ecs/aws-ecs-taskdefinition_volumefrom.go  |   4 +-
 .../cloudformation/ecs/aws-ecs-taskset.go     |   4 +-
 .../aws-ecs-taskset_awsvpcconfiguration.go    |   4 +-
 .../ecs/aws-ecs-taskset_loadbalancer.go       |   4 +-
 .../aws-ecs-taskset_networkconfiguration.go   |   2 +-
 .../ecs/aws-ecs-taskset_scale.go              |   4 +-
 .../ecs/aws-ecs-taskset_serviceregistry.go    |   4 +-
 .../cloudformation/efs/aws-efs-accesspoint.go |   4 +-
 .../efs/aws-efs-accesspoint_accesspointtag.go |   4 +-
 .../efs/aws-efs-accesspoint_creationinfo.go   |   4 +-
 .../efs/aws-efs-accesspoint_posixuser.go      |   4 +-
 .../efs/aws-efs-accesspoint_rootdirectory.go  |   4 +-
 .../cloudformation/efs/aws-efs-filesystem.go  |   4 +-
 .../efs/aws-efs-filesystem_backuppolicy.go    |   4 +-
 ...aws-efs-filesystem_elasticfilesystemtag.go |   4 +-
 .../efs/aws-efs-filesystem_lifecyclepolicy.go |   4 +-
 .../cloudformation/efs/aws-efs-mounttarget.go |   4 +-
 .../eks/aws-eks-access-config.go              |   2 +-
 .../eks/aws-eks-access-entry.go               |   6 +-
 .../eks/aws-eks-access-entry_access_scope.go  |   2 +-
 .../eks/aws-eks-access-entry_policy.go        |   4 +-
 .../cloudformation/eks/aws-eks-addon.go       |   6 +-
 .../cloudformation/eks/aws-eks-cluster.go     |   6 +-
 .../eks/aws-eks-cluster_clusterlogging.go     |   2 +-
 .../eks/aws-eks-cluster_compute_config.go     |   4 +-
 .../aws-eks-cluster_controlplaneplacement.go  |   4 +-
 .../aws-eks-cluster_elastic_loadbalancing.go  |   4 +-
 .../eks/aws-eks-cluster_encryptionconfig.go   |   4 +-
 ...aws-eks-cluster_kubernetesnetworkconfig.go |   4 +-
 .../eks/aws-eks-cluster_logging.go            |   2 +-
 .../eks/aws-eks-cluster_loggingtypeconfig.go  |   4 +-
 .../eks/aws-eks-cluster_outpostconfig.go      |   4 +-
 .../eks/aws-eks-cluster_provider.go           |   4 +-
 .../eks/aws-eks-cluster_remotenetworks.go     |   2 +-
 .../eks/aws-eks-cluster_resourcesvpcconfig.go |   4 +-
 .../eks/aws-eks-cluster_storage_config.go     |   4 +-
 .../eks/aws-eks-cluster_zonal-shift.go        |   4 +-
 .../eks/aws-eks-fargateprofile.go             |   6 +-
 .../eks/aws-eks-fargateprofile_label.go       |   4 +-
 .../eks/aws-eks-fargateprofile_selector.go    |   4 +-
 .../eks/aws-eks-identityproviderconfig.go     |   6 +-
 ...oviderconfig_oidcidentityproviderconfig.go |   4 +-
 ...ks-identityproviderconfig_requiredclaim.go |   4 +-
 .../cloudformation/eks/aws-eks-nodegroup.go   |   4 +-
 ...s-nodegroup_launchtemplatespecification.go |   4 +-
 .../eks/aws-eks-nodegroup_noderepairconfig.go |   4 +-
 .../eks/aws-eks-nodegroup_remoteaccess.go     |   4 +-
 .../eks/aws-eks-nodegroup_scalingconfig.go    |   4 +-
 .../eks/aws-eks-nodegroup_taint.go            |   4 +-
 .../eks/aws-eks-nodegroup_taints.go           |   2 +-
 .../eks/aws-eks-nodegroup_updateconfig.go     |   4 +-
 .../aws-elasticache-cachecluster.go           |   6 +-
 ...luster_cloudwatchlogsdestinationdetails.go |   4 +-
 ...ticache-cachecluster_destinationdetails.go |   2 +-
 ...uster_kinesisfirehosedestinationdetails.go |   4 +-
 ...cluster_logdeliveryconfigurationrequest.go |   4 +-
 .../aws-elasticache-globalreplicationgroup.go |   4 +-
 ...ationgroup_globalreplicationgroupmember.go |   4 +-
 ...lreplicationgroup_regionalconfiguration.go |   4 +-
 ...eplicationgroup_reshardingconfiguration.go |   4 +-
 .../aws-elasticache-parametergroup.go         |   6 +-
 .../aws-elasticache-replicationgroup.go       |   6 +-
 ...ngroup_cloudwatchlogsdestinationdetails.go |   4 +-
 ...che-replicationgroup_destinationdetails.go |   2 +-
 ...group_kinesisfirehosedestinationdetails.go |   4 +-
 ...ongroup_logdeliveryconfigurationrequest.go |   4 +-
 ...replicationgroup_nodegroupconfiguration.go |   4 +-
 .../aws-elasticache-securitygroup.go          |   6 +-
 .../aws-elasticache-securitygroupingress.go   |   4 +-
 .../aws-elasticache-subnetgroup.go            |   6 +-
 .../elasticache/aws-elasticache-user.go       |   4 +-
 .../elasticache/aws-elasticache-usergroup.go  |   4 +-
 .../aws-elasticbeanstalk-application.go       |   4 +-
 ...tion_applicationresourcelifecycleconfig.go |   4 +-
 ...ation_applicationversionlifecycleconfig.go |   2 +-
 ...elasticbeanstalk-application_maxagerule.go |   4 +-
 ...asticbeanstalk-application_maxcountrule.go |   4 +-
 ...aws-elasticbeanstalk-applicationversion.go |   4 +-
 ...anstalk-applicationversion_sourcebundle.go |   4 +-
 ...-elasticbeanstalk-configurationtemplate.go |   4 +-
 ...tiontemplate_configurationoptionsetting.go |   4 +-
 ...nfigurationtemplate_sourceconfiguration.go |   4 +-
 .../aws-elasticbeanstalk-environment.go       |   6 +-
 ...sticbeanstalk-environment_optionsetting.go |   4 +-
 .../aws-elasticbeanstalk-environment_tier.go  |   4 +-
 .../aws-elasticloadbalancing-loadbalancer.go  |   6 +-
 ...ancing-loadbalancer_accessloggingpolicy.go |   4 +-
 ...-loadbalancer_appcookiestickinesspolicy.go |   4 +-
 ...g-loadbalancer_connectiondrainingpolicy.go |   4 +-
 ...lancing-loadbalancer_connectionsettings.go |   4 +-
 ...cloadbalancing-loadbalancer_healthcheck.go |   4 +-
 ...g-loadbalancer_lbcookiestickinesspolicy.go |   4 +-
 ...ticloadbalancing-loadbalancer_listeners.go |   4 +-
 ...sticloadbalancing-loadbalancer_policies.go |   4 +-
 .../aws-elasticloadbalancingv2-listener.go    |   4 +-
 ...-elasticloadbalancingv2-listener_action.go |   4 +-
 ...ngv2-listener_authenticatecognitoconfig.go |   4 +-
 ...ncingv2-listener_authenticateoidcconfig.go |   4 +-
 ...ticloadbalancingv2-listener_certificate.go |   4 +-
 ...alancingv2-listener_fixedresponseconfig.go |   4 +-
 ...cloadbalancingv2-listener_forwardconfig.go |   2 +-
 ...loadbalancingv2-listener_redirectconfig.go |   4 +-
 ...v2-listener_targetgroupstickinessconfig.go |   4 +-
 ...adbalancingv2-listener_targetgrouptuple.go |   4 +-
 ...sticloadbalancingv2-listenercertificate.go |   4 +-
 ...ncingv2-listenercertificate_certificate.go |   4 +-
 ...aws-elasticloadbalancingv2-listenerrule.go |   4 +-
 ...sticloadbalancingv2-listenerrule_action.go |   4 +-
 ...-listenerrule_authenticatecognitoconfig.go |   4 +-
 ...gv2-listenerrule_authenticateoidcconfig.go |   4 +-
 ...cingv2-listenerrule_fixedresponseconfig.go |   4 +-
 ...dbalancingv2-listenerrule_forwardconfig.go |   2 +-
 ...lancingv2-listenerrule_hostheaderconfig.go |   4 +-
 ...lancingv2-listenerrule_httpheaderconfig.go |   4 +-
 ...v2-listenerrule_httprequestmethodconfig.go |   4 +-
 ...ancingv2-listenerrule_pathpatternconfig.go |   4 +-
 ...ancingv2-listenerrule_querystringconfig.go |   2 +-
 ...cingv2-listenerrule_querystringkeyvalue.go |   4 +-
 ...balancingv2-listenerrule_redirectconfig.go |   4 +-
 ...dbalancingv2-listenerrule_rulecondition.go |   4 +-
 ...balancingv2-listenerrule_sourceipconfig.go |   4 +-
 ...istenerrule_targetgroupstickinessconfig.go |   4 +-
 ...lancingv2-listenerrule_targetgrouptuple.go |   4 +-
 ...aws-elasticloadbalancingv2-loadbalancer.go |   6 +-
 ...ngv2-loadbalancer_loadbalancerattribute.go |   4 +-
 ...dbalancingv2-loadbalancer_subnetmapping.go |   4 +-
 .../aws-elasticloadbalancingv2-targetgroup.go |   6 +-
 ...sticloadbalancingv2-targetgroup_matcher.go |   4 +-
 ...lancingv2-targetgroup_targetdescription.go |   4 +-
 ...cingv2-targetgroup_targetgroupattribute.go |   4 +-
 .../elasticsearch/aws-elasticsearch-domain.go |   6 +-
 ...rch-domain_advancedsecurityoptionsinput.go |   4 +-
 ...aws-elasticsearch-domain_cognitooptions.go |   4 +-
 ...elasticsearch-domain_coldstorageoptions.go |   4 +-
 ...sticsearch-domain_domainendpointoptions.go |   4 +-
 .../aws-elasticsearch-domain_ebsoptions.go    |   4 +-
 ...earch-domain_elasticsearchclusterconfig.go |   4 +-
 ...icsearch-domain_encryptionatrestoptions.go |   4 +-
 ...lasticsearch-domain_logpublishingoption.go |   4 +-
 ...-elasticsearch-domain_masteruseroptions.go |   4 +-
 ...arch-domain_nodetonodeencryptionoptions.go |   4 +-
 ...ws-elasticsearch-domain_snapshotoptions.go |   4 +-
 .../aws-elasticsearch-domain_vpcoptions.go    |   4 +-
 ...lasticsearch-domain_zoneawarenessconfig.go |   4 +-
 .../cloudformation/emr/aws-emr-cluster.go     |   6 +-
 .../emr/aws-emr-cluster_application.go        |   4 +-
 .../emr/aws-emr-cluster_autoscalingpolicy.go  |   2 +-
 .../aws-emr-cluster_bootstrapactionconfig.go  |   4 +-
 ...s-emr-cluster_cloudwatchalarmdefinition.go |   4 +-
 .../emr/aws-emr-cluster_computelimits.go      |   4 +-
 .../emr/aws-emr-cluster_configuration.go      |   4 +-
 .../aws-emr-cluster_ebsblockdeviceconfig.go   |   4 +-
 .../emr/aws-emr-cluster_ebsconfiguration.go   |   4 +-
 .../aws-emr-cluster_hadoopjarstepconfig.go    |   4 +-
 .../aws-emr-cluster_instancefleetconfig.go    |   4 +-
 ...instancefleetprovisioningspecifications.go |   2 +-
 .../aws-emr-cluster_instancegroupconfig.go    |   4 +-
 .../emr/aws-emr-cluster_instancetypeconfig.go |   4 +-
 .../aws-emr-cluster_jobflowinstancesconfig.go |   4 +-
 .../emr/aws-emr-cluster_kerberosattributes.go |   4 +-
 .../emr/aws-emr-cluster_keyvalue.go           |   4 +-
 .../aws-emr-cluster_managedscalingpolicy.go   |   2 +-
 .../emr/aws-emr-cluster_metricdimension.go    |   4 +-
 ...uster_ondemandprovisioningspecification.go |   4 +-
 .../emr/aws-emr-cluster_placementtype.go      |   4 +-
 .../emr/aws-emr-cluster_scalingaction.go      |   4 +-
 .../emr/aws-emr-cluster_scalingconstraints.go |   4 +-
 .../emr/aws-emr-cluster_scalingrule.go        |   4 +-
 .../emr/aws-emr-cluster_scalingtrigger.go     |   2 +-
 ...emr-cluster_scriptbootstrapactionconfig.go |   4 +-
 ...luster_simplescalingpolicyconfiguration.go |   4 +-
 ...r-cluster_spotprovisioningspecification.go |   4 +-
 .../emr/aws-emr-cluster_stepconfig.go         |   4 +-
 .../aws-emr-cluster_volumespecification.go    |   4 +-
 .../emr/aws-emr-instancefleetconfig.go        |   4 +-
 ...s-emr-instancefleetconfig_configuration.go |   4 +-
 ...nstancefleetconfig_ebsblockdeviceconfig.go |   4 +-
 ...mr-instancefleetconfig_ebsconfiguration.go |   4 +-
 ...instancefleetprovisioningspecifications.go |   2 +-
 ...-instancefleetconfig_instancetypeconfig.go |   4 +-
 ...onfig_ondemandprovisioningspecification.go |   4 +-
 ...eetconfig_spotprovisioningspecification.go |   4 +-
 ...instancefleetconfig_volumespecification.go |   4 +-
 .../emr/aws-emr-instancegroupconfig.go        |   4 +-
 ...r-instancegroupconfig_autoscalingpolicy.go |   2 +-
 ...cegroupconfig_cloudwatchalarmdefinition.go |   4 +-
 ...s-emr-instancegroupconfig_configuration.go |   4 +-
 ...nstancegroupconfig_ebsblockdeviceconfig.go |   4 +-
 ...mr-instancegroupconfig_ebsconfiguration.go |   4 +-
 ...emr-instancegroupconfig_metricdimension.go |   4 +-
 ...s-emr-instancegroupconfig_scalingaction.go |   4 +-
 ...-instancegroupconfig_scalingconstraints.go |   4 +-
 ...aws-emr-instancegroupconfig_scalingrule.go |   4 +-
 ...-emr-instancegroupconfig_scalingtrigger.go |   2 +-
 ...config_simplescalingpolicyconfiguration.go |   4 +-
 ...instancegroupconfig_volumespecification.go |   4 +-
 .../emr/aws-emr-securityconfiguration.go      |   4 +-
 .../cloudformation/emr/aws-emr-step.go        |   4 +-
 .../emr/aws-emr-step_hadoopjarstepconfig.go   |   4 +-
 .../emr/aws-emr-step_keyvalue.go              |   4 +-
 .../cloudformation/emr/aws-emr-studio.go      |   6 +-
 .../emr/aws-emr-studiosessionmapping.go       |   4 +-
 .../aws-emrcontainers-virtualcluster.go       |   6 +-
 ...containers-virtualcluster_containerinfo.go |   2 +-
 ...ainers-virtualcluster_containerprovider.go |   4 +-
 ...ws-emrcontainers-virtualcluster_eksinfo.go |   4 +-
 .../events/aws-events-apidestination.go       |   4 +-
 .../events/aws-events-archive.go              |   4 +-
 .../events/aws-events-connection.go           |   4 +-
 .../events/aws-events-eventbus.go             |   4 +-
 .../events/aws-events-eventbuspolicy.go       |   4 +-
 .../aws-events-eventbuspolicy_condition.go    |   4 +-
 .../cloudformation/events/aws-events-rule.go  |   4 +-
 .../aws-events-rule_awsvpcconfiguration.go    |   4 +-
 .../aws-events-rule_batcharrayproperties.go   |   4 +-
 .../events/aws-events-rule_batchparameters.go |   4 +-
 .../aws-events-rule_batchretrystrategy.go     |   4 +-
 ...vents-rule_capacityproviderstrategyitem.go |   4 +-
 .../aws-events-rule_deadletterconfig.go       |   4 +-
 .../events/aws-events-rule_ecsparameters.go   |   6 +-
 .../events/aws-events-rule_httpparameters.go  |   4 +-
 .../aws-events-rule_inputtransformer.go       |   4 +-
 .../aws-events-rule_kinesisparameters.go      |   4 +-
 .../aws-events-rule_networkconfiguration.go   |   2 +-
 .../aws-events-rule_placementconstraint.go    |   4 +-
 .../aws-events-rule_placementstrategy.go      |   4 +-
 .../aws-events-rule_redshiftdataparameters.go |   4 +-
 .../events/aws-events-rule_retrypolicy.go     |   4 +-
 .../aws-events-rule_runcommandparameters.go   |   2 +-
 .../aws-events-rule_runcommandtarget.go       |   4 +-
 .../events/aws-events-rule_sqsparameters.go   |   4 +-
 .../events/aws-events-rule_tag.go             |   4 +-
 .../events/aws-events-rule_target.go          |   4 +-
 .../aws-eventschemas-discoverer.go            |   4 +-
 .../aws-eventschemas-discoverer_tagsentry.go  |   4 +-
 .../eventschemas/aws-eventschemas-registry.go |   4 +-
 .../aws-eventschemas-registry_tagsentry.go    |   4 +-
 .../aws-eventschemas-registrypolicy.go        |   4 +-
 .../eventschemas/aws-eventschemas-schema.go   |   4 +-
 .../aws-eventschemas-schema_tagsentry.go      |   4 +-
 .../evidently/aws-evidently-experiment.go     |   6 +-
 ...s-evidently-experiment_metricgoalobject.go |   4 +-
 ...idently-experiment_onlineabconfigobject.go |   4 +-
 ...ws-evidently-experiment_treatmentobject.go |   4 +-
 ...-evidently-experiment_treatmenttoweight.go |   4 +-
 .../evidently/aws-evidently-feature.go        |   6 +-
 .../aws-evidently-feature_entityoverride.go   |   4 +-
 .../aws-evidently-feature_variationobject.go  |   4 +-
 .../evidently/aws-evidently-launch.go         |   6 +-
 .../aws-evidently-launch_grouptoweight.go     |   4 +-
 .../aws-evidently-launch_launchgroupobject.go |   4 +-
 ...evidently-launch_metricdefinitionobject.go |   4 +-
 .../aws-evidently-launch_stepconfig.go        |   4 +-
 .../evidently/aws-evidently-project.go        |   6 +-
 ...ws-evidently-project_datadeliveryobject.go |   4 +-
 .../aws-evidently-project_s3destination.go    |   4 +-
 .../finspace/aws-finspace-environment.go      |   4 +-
 ...nspace-environment_federationparameters.go |   4 +-
 ...inspace-environment_superuserparameters.go |   4 +-
 .../fis/aws-fis-experimenttemplate.go         |   4 +-
 ...rimenttemplate_experimenttemplateaction.go |   4 +-
 ...emplate_experimenttemplatestopcondition.go |   4 +-
 ...rimenttemplate_experimenttemplatetarget.go |   4 +-
 ...template_experimenttemplatetargetfilter.go |   4 +-
 .../fms/aws-fms-notificationchannel.go        |   4 +-
 .../cloudformation/fms/aws-fms-policy.go      |   4 +-
 .../fms/aws-fms-policy_iemap.go               |   4 +-
 .../fms/aws-fms-policy_policytag.go           |   4 +-
 .../fms/aws-fms-policy_resourcetag.go         |   4 +-
 .../aws-frauddetector-detector.go             |   6 +-
 .../aws-frauddetector-detector_entitytype.go  |   6 +-
 .../aws-frauddetector-detector_eventtype.go   |   6 +-
 ...ws-frauddetector-detector_eventvariable.go |   6 +-
 .../aws-frauddetector-detector_label.go       |   6 +-
 .../aws-frauddetector-detector_model.go       |   4 +-
 .../aws-frauddetector-detector_outcome.go     |   6 +-
 .../aws-frauddetector-detector_rule.go        |   6 +-
 .../aws-frauddetector-entitytype.go           |   6 +-
 .../aws-frauddetector-eventtype.go            |   6 +-
 .../aws-frauddetector-eventtype_entitytype.go |   6 +-
 ...s-frauddetector-eventtype_eventvariable.go |   6 +-
 .../aws-frauddetector-eventtype_label.go      |   6 +-
 .../frauddetector/aws-frauddetector-label.go  |   6 +-
 .../aws-frauddetector-outcome.go              |   6 +-
 .../aws-frauddetector-variable.go             |   6 +-
 .../cloudformation/fsx/aws-fsx-filesystem.go  |   6 +-
 ...ws-fsx-filesystem_auditlogconfiguration.go |   4 +-
 ...aws-fsx-filesystem_clientconfigurations.go |   4 +-
 ...ws-fsx-filesystem_diskiopsconfiguration.go |   4 +-
 .../aws-fsx-filesystem_lustreconfiguration.go |   4 +-
 .../fsx/aws-fsx-filesystem_nfsexports.go      |   2 +-
 .../aws-fsx-filesystem_ontapconfiguration.go  |   4 +-
 ...aws-fsx-filesystem_openzfsconfiguration.go |   4 +-
 ...-fsx-filesystem_rootvolumeconfiguration.go |   4 +-
 ...selfmanagedactivedirectoryconfiguration.go |   4 +-
 .../aws-fsx-filesystem_userandgroupquotas.go  |   4 +-
 ...aws-fsx-filesystem_windowsconfiguration.go |   4 +-
 .../gamelift/aws-gamelift-alias.go            |   4 +-
 .../aws-gamelift-alias_routingstrategy.go     |   4 +-
 .../gamelift/aws-gamelift-build.go            |   4 +-
 .../gamelift/aws-gamelift-build_s3location.go |   4 +-
 .../gamelift/aws-gamelift-fleet.go            |   4 +-
 ...gamelift-fleet_certificateconfiguration.go |   4 +-
 .../aws-gamelift-fleet_ippermission.go        |   4 +-
 .../aws-gamelift-fleet_locationcapacity.go    |   4 +-
 ...ws-gamelift-fleet_locationconfiguration.go |   4 +-
 ...elift-fleet_resourcecreationlimitpolicy.go |   4 +-
 ...aws-gamelift-fleet_runtimeconfiguration.go |   4 +-
 .../aws-gamelift-fleet_serverprocess.go       |   4 +-
 .../gamelift/aws-gamelift-gameservergroup.go  |   6 +-
 ...elift-gameservergroup_autoscalingpolicy.go |   4 +-
 ...lift-gameservergroup_instancedefinition.go |   4 +-
 ...ift-gameservergroup_instancedefinitions.go |   2 +-
 ...gamelift-gameservergroup_launchtemplate.go |   4 +-
 .../aws-gamelift-gameservergroup_tags.go      |   4 +-
 ...servergroup_targettrackingconfiguration.go |   4 +-
 ...aws-gamelift-gameservergroup_vpcsubnets.go |   4 +-
 .../gamelift/aws-gamelift-gamesessionqueue.go |   4 +-
 ...s-gamelift-gamesessionqueue_destination.go |   4 +-
 ...ft-gamesessionqueue_filterconfiguration.go |   4 +-
 ...ft-gamesessionqueue_playerlatencypolicy.go |   4 +-
 ...-gamesessionqueue_priorityconfiguration.go |   4 +-
 .../aws-gamelift-matchmakingconfiguration.go  |   4 +-
 ...t-matchmakingconfiguration_gameproperty.go |   4 +-
 .../aws-gamelift-matchmakingruleset.go        |   4 +-
 .../gamelift/aws-gamelift-script.go           |   4 +-
 .../aws-gamelift-script_s3location.go         |   4 +-
 .../aws-globalaccelerator-accelerator.go      |   6 +-
 .../aws-globalaccelerator-endpointgroup.go    |   4 +-
 ...tor-endpointgroup_endpointconfiguration.go |   4 +-
 ...laccelerator-endpointgroup_portoverride.go |   4 +-
 .../aws-globalaccelerator-listener.go         |   4 +-
 ...ws-globalaccelerator-listener_portrange.go |   4 +-
 .../glue/aws-glue-classifier.go               |   2 +-
 .../glue/aws-glue-classifier_csvclassifier.go |   4 +-
 .../aws-glue-classifier_grokclassifier.go     |   4 +-
 .../aws-glue-classifier_jsonclassifier.go     |   4 +-
 .../glue/aws-glue-classifier_xmlclassifier.go |   4 +-
 .../glue/aws-glue-connection.go               |   4 +-
 .../aws-glue-connection_connectioninput.go    |   4 +-
 ...nnection_physicalconnectionrequirements.go |   4 +-
 .../cloudformation/glue/aws-glue-crawler.go   |   4 +-
 .../glue/aws-glue-crawler_catalogtarget.go    |   4 +-
 .../glue/aws-glue-crawler_dynamodbtarget.go   |   4 +-
 .../glue/aws-glue-crawler_jdbctarget.go       |   4 +-
 .../glue/aws-glue-crawler_recrawlpolicy.go    |   4 +-
 .../glue/aws-glue-crawler_s3target.go         |   4 +-
 .../glue/aws-glue-crawler_schedule.go         |   4 +-
 .../aws-glue-crawler_schemachangepolicy.go    |   4 +-
 .../glue/aws-glue-crawler_targets.go          |   2 +-
 .../cloudformation/glue/aws-glue-database.go  |   4 +-
 .../aws-glue-database_databaseidentifier.go   |   4 +-
 .../glue/aws-glue-database_databaseinput.go   |   4 +-
 .../aws-glue-database_datalakeprincipal.go    |   4 +-
 .../aws-glue-database_principalprivileges.go  |   4 +-
 .../aws-glue-datacatalogencryptionsettings.go |   4 +-
 ...onsettings_connectionpasswordencryption.go |   4 +-
 ...nsettings_datacatalogencryptionsettings.go |   2 +-
 ...alogencryptionsettings_encryptionatrest.go |   4 +-
 .../glue/aws-glue-devendpoint.go              |   4 +-
 .../cloudformation/glue/aws-glue-job.go       |   4 +-
 .../glue/aws-glue-job_connectionslist.go      |   4 +-
 .../glue/aws-glue-job_executionproperty.go    |   4 +-
 .../glue/aws-glue-job_jobcommand.go           |   4 +-
 .../glue/aws-glue-job_notificationproperty.go |   4 +-
 .../glue/aws-glue-mltransform.go              |   4 +-
 ...-glue-mltransform_findmatchesparameters.go |   4 +-
 .../glue/aws-glue-mltransform_gluetables.go   |   4 +-
 .../aws-glue-mltransform_inputrecordtables.go |   2 +-
 ...s-glue-mltransform_mluserdataencryption.go |   4 +-
 ...ws-glue-mltransform_transformencryption.go |   4 +-
 ...ws-glue-mltransform_transformparameters.go |   4 +-
 .../cloudformation/glue/aws-glue-partition.go |   4 +-
 .../glue/aws-glue-partition_column.go         |   4 +-
 .../glue/aws-glue-partition_order.go          |   4 +-
 .../glue/aws-glue-partition_partitioninput.go |   4 +-
 .../glue/aws-glue-partition_schemaid.go       |   4 +-
 .../aws-glue-partition_schemareference.go     |   4 +-
 .../glue/aws-glue-partition_serdeinfo.go      |   4 +-
 .../glue/aws-glue-partition_skewedinfo.go     |   4 +-
 .../aws-glue-partition_storagedescriptor.go   |   4 +-
 .../cloudformation/glue/aws-glue-registry.go  |   6 +-
 .../cloudformation/glue/aws-glue-schema.go    |   6 +-
 .../glue/aws-glue-schema_registry.go          |   4 +-
 .../glue/aws-glue-schema_schemaversion.go     |   4 +-
 .../glue/aws-glue-schemaversion.go            |   4 +-
 .../glue/aws-glue-schemaversion_schema.go     |   4 +-
 .../glue/aws-glue-schemaversionmetadata.go    |   4 +-
 .../glue/aws-glue-securityconfiguration.go    |   4 +-
 ...urityconfiguration_cloudwatchencryption.go |   4 +-
 ...tyconfiguration_encryptionconfiguration.go |   2 +-
 ...ityconfiguration_jobbookmarksencryption.go |   4 +-
 ...glue-securityconfiguration_s3encryption.go |   4 +-
 ...lue-securityconfiguration_s3encryptions.go |   2 +-
 .../cloudformation/glue/aws-glue-table.go     |   4 +-
 .../glue/aws-glue-table_column.go             |   4 +-
 .../glue/aws-glue-table_order.go              |   4 +-
 .../glue/aws-glue-table_schemaid.go           |   4 +-
 .../glue/aws-glue-table_schemareference.go    |   4 +-
 .../glue/aws-glue-table_serdeinfo.go          |   4 +-
 .../glue/aws-glue-table_skewedinfo.go         |   4 +-
 .../glue/aws-glue-table_storagedescriptor.go  |   4 +-
 .../glue/aws-glue-table_tableidentifier.go    |   4 +-
 .../glue/aws-glue-table_tableinput.go         |   4 +-
 .../cloudformation/glue/aws-glue-trigger.go   |   4 +-
 .../glue/aws-glue-trigger_action.go           |   4 +-
 .../glue/aws-glue-trigger_condition.go        |   4 +-
 .../aws-glue-trigger_notificationproperty.go  |   4 +-
 .../glue/aws-glue-trigger_predicate.go        |   4 +-
 .../cloudformation/glue/aws-glue-workflow.go  |   4 +-
 .../aws-greengrass-connectordefinition.go     |   4 +-
 ...reengrass-connectordefinition_connector.go |   4 +-
 ...ordefinition_connectordefinitionversion.go |   2 +-
 ...s-greengrass-connectordefinitionversion.go |   4 +-
 ...ss-connectordefinitionversion_connector.go |   4 +-
 .../aws-greengrass-coredefinition.go          |   4 +-
 .../aws-greengrass-coredefinition_core.go     |   4 +-
 ...ss-coredefinition_coredefinitionversion.go |   2 +-
 .../aws-greengrass-coredefinitionversion.go   |   4 +-
 ...s-greengrass-coredefinitionversion_core.go |   4 +-
 .../aws-greengrass-devicedefinition.go        |   4 +-
 .../aws-greengrass-devicedefinition_device.go |   4 +-
 ...evicedefinition_devicedefinitionversion.go |   2 +-
 .../aws-greengrass-devicedefinitionversion.go |   4 +-
 ...eengrass-devicedefinitionversion_device.go |   4 +-
 .../aws-greengrass-functiondefinition.go      |   4 +-
 ...ngrass-functiondefinition_defaultconfig.go |   2 +-
 ...eengrass-functiondefinition_environment.go |   4 +-
 ...greengrass-functiondefinition_execution.go |   4 +-
 ...-greengrass-functiondefinition_function.go |   4 +-
 ...unctiondefinition_functionconfiguration.go |   4 +-
 ...iondefinition_functiondefinitionversion.go |   2 +-
 ...functiondefinition_resourceaccesspolicy.go |   4 +-
 ...aws-greengrass-functiondefinition_runas.go |   4 +-
 ...ws-greengrass-functiondefinitionversion.go |   4 +-
 ...functiondefinitionversion_defaultconfig.go |   2 +-
 ...s-functiondefinitionversion_environment.go |   4 +-
 ...ass-functiondefinitionversion_execution.go |   4 +-
 ...rass-functiondefinitionversion_function.go |   4 +-
 ...definitionversion_functionconfiguration.go |   4 +-
 ...ndefinitionversion_resourceaccesspolicy.go |   4 +-
 ...engrass-functiondefinitionversion_runas.go |   4 +-
 .../greengrass/aws-greengrass-group.go        |   4 +-
 .../aws-greengrass-group_groupversion.go      |   4 +-
 .../greengrass/aws-greengrass-groupversion.go |   4 +-
 .../aws-greengrass-loggerdefinition.go        |   4 +-
 .../aws-greengrass-loggerdefinition_logger.go |   4 +-
 ...oggerdefinition_loggerdefinitionversion.go |   2 +-
 .../aws-greengrass-loggerdefinitionversion.go |   4 +-
 ...eengrass-loggerdefinitionversion_logger.go |   4 +-
 .../aws-greengrass-resourcedefinition.go      |   4 +-
 ...ss-resourcedefinition_groupownersetting.go |   4 +-
 ...ourcedefinition_localdeviceresourcedata.go |   4 +-
 ...ourcedefinition_localvolumeresourcedata.go |   4 +-
 ...esourcedefinition_resourcedatacontainer.go |   2 +-
 ...rcedefinition_resourcedefinitionversion.go |   2 +-
 ...definition_resourcedownloadownersetting.go |   4 +-
 ...ass-resourcedefinition_resourceinstance.go |   4 +-
 ...tion_s3machinelearningmodelresourcedata.go |   4 +-
 ...gemakermachinelearningmodelresourcedata.go |   4 +-
 ...nition_secretsmanagersecretresourcedata.go |   4 +-
 ...ws-greengrass-resourcedefinitionversion.go |   4 +-
 ...urcedefinitionversion_groupownersetting.go |   4 +-
 ...finitionversion_localdeviceresourcedata.go |   4 +-
 ...finitionversion_localvolumeresourcedata.go |   4 +-
 ...definitionversion_resourcedatacontainer.go |   2 +-
 ...ionversion_resourcedownloadownersetting.go |   4 +-
 ...ourcedefinitionversion_resourceinstance.go |   4 +-
 ...sion_s3machinelearningmodelresourcedata.go |   4 +-
 ...gemakermachinelearningmodelresourcedata.go |   4 +-
 ...ersion_secretsmanagersecretresourcedata.go |   4 +-
 .../aws-greengrass-subscriptiondefinition.go  |   4 +-
 ...ass-subscriptiondefinition_subscription.go |   4 +-
 ...efinition_subscriptiondefinitionversion.go |   2 +-
 ...reengrass-subscriptiondefinitionversion.go |   4 +-
 ...scriptiondefinitionversion_subscription.go |   4 +-
 .../aws-greengrassv2-componentversion.go      |   4 +-
 ...tversion_componentdependencyrequirement.go |   4 +-
 ...ssv2-componentversion_componentplatform.go |   4 +-
 ...-componentversion_lambdacontainerparams.go |   4 +-
 ...ssv2-componentversion_lambdadevicemount.go |   4 +-
 ...ssv2-componentversion_lambdaeventsource.go |   4 +-
 ...ponentversion_lambdaexecutionparameters.go |   4 +-
 ...onentversion_lambdafunctionrecipesource.go |   4 +-
 ...mponentversion_lambdalinuxprocessparams.go |   4 +-
 ...ssv2-componentversion_lambdavolumemount.go |   4 +-
 .../groundstation/aws-groundstation-config.go |   6 +-
 ...undstation-config_antennadownlinkconfig.go |   2 +-
 ...config_antennadownlinkdemoddecodeconfig.go |   2 +-
 ...roundstation-config_antennauplinkconfig.go |   4 +-
 .../aws-groundstation-config_configdata.go    |   2 +-
 ...ndstation-config_dataflowendpointconfig.go |   4 +-
 .../aws-groundstation-config_decodeconfig.go  |   4 +-
 ...groundstation-config_demodulationconfig.go |   4 +-
 .../aws-groundstation-config_eirp.go          |   4 +-
 .../aws-groundstation-config_frequency.go     |   4 +-
 ...groundstation-config_frequencybandwidth.go |   4 +-
 ...-groundstation-config_s3recordingconfig.go |   4 +-
 ...aws-groundstation-config_spectrumconfig.go |   4 +-
 ...aws-groundstation-config_trackingconfig.go |   4 +-
 ...s-groundstation-config_uplinkechoconfig.go |   4 +-
 ...oundstation-config_uplinkspectrumconfig.go |   4 +-
 ...aws-groundstation-dataflowendpointgroup.go |   4 +-
 ...-dataflowendpointgroup_dataflowendpoint.go |   4 +-
 ...n-dataflowendpointgroup_endpointdetails.go |   2 +-
 ...n-dataflowendpointgroup_securitydetails.go |   4 +-
 ...ion-dataflowendpointgroup_socketaddress.go |   4 +-
 .../aws-groundstation-missionprofile.go       |   6 +-
 ...oundstation-missionprofile_dataflowedge.go |   4 +-
 .../guardduty/aws-guardduty-detector.go       |   4 +-
 ...ty-detector_cfndatasourceconfigurations.go |   2 +-
 ...ardduty-detector_cfns3logsconfiguration.go |   4 +-
 .../guardduty/aws-guardduty-filter.go         |   4 +-
 .../aws-guardduty-filter_condition.go         |   4 +-
 .../aws-guardduty-filter_findingcriteria.go   |   2 +-
 .../guardduty/aws-guardduty-ipset.go          |   4 +-
 .../guardduty/aws-guardduty-master.go         |   4 +-
 .../guardduty/aws-guardduty-member.go         |   4 +-
 .../guardduty/aws-guardduty-threatintelset.go |   4 +-
 .../aws-healthlake-fhirdatastore.go           |   6 +-
 ...hlake-fhirdatastore_kmsencryptionconfig.go |   4 +-
 ...lthlake-fhirdatastore_preloaddataconfig.go |   4 +-
 ...althlake-fhirdatastore_sseconfiguration.go |   2 +-
 .../cloudformation/iam/aws-iam-accesskey.go   |   4 +-
 .../cloudformation/iam/aws-iam-group.go       |   4 +-
 .../iam/aws-iam-group_policy.go               |   4 +-
 .../iam/aws-iam-instanceprofile.go            |   4 +-
 .../iam/aws-iam-managedpolicy.go              |   4 +-
 .../iam/aws-iam-oidcprovider.go               |   6 +-
 .../cloudformation/iam/aws-iam-policy.go      |   4 +-
 .../cloudformation/iam/aws-iam-role.go        |   6 +-
 .../cloudformation/iam/aws-iam-role_policy.go |   4 +-
 .../iam/aws-iam-samlprovider.go               |   6 +-
 .../iam/aws-iam-servercertificate.go          |   6 +-
 .../iam/aws-iam-servicelinkedrole.go          |   4 +-
 .../cloudformation/iam/aws-iam-user.go        |   6 +-
 .../iam/aws-iam-user_loginprofile.go          |   4 +-
 .../cloudformation/iam/aws-iam-user_policy.go |   4 +-
 .../iam/aws-iam-usertogroupaddition.go        |   4 +-
 .../iam/aws-iam-virtualmfadevice.go           |   6 +-
 .../aws-imagebuilder-component.go             |   4 +-
 .../aws-imagebuilder-containerrecipe.go       |   4 +-
 ...-containerrecipe_componentconfiguration.go |   4 +-
 ...ipe_ebsinstanceblockdevicespecification.go |   4 +-
 ...tainerrecipe_instanceblockdevicemapping.go |   4 +-
 ...r-containerrecipe_instanceconfiguration.go |   4 +-
 ...ntainerrecipe_targetcontainerrepository.go |   4 +-
 ...-imagebuilder-distributionconfiguration.go |   4 +-
 ...-distributionconfiguration_distribution.go |   4 +-
 ...nfiguration_launchtemplateconfiguration.go |   4 +-
 .../imagebuilder/aws-imagebuilder-image.go    |   4 +-
 ...gebuilder-image_imagetestsconfiguration.go |   4 +-
 .../aws-imagebuilder-imagepipeline.go         |   4 +-
 ...r-imagepipeline_imagetestsconfiguration.go |   4 +-
 ...aws-imagebuilder-imagepipeline_schedule.go |   4 +-
 .../aws-imagebuilder-imagerecipe.go           |   4 +-
 ...erecipe_additionalinstanceconfiguration.go |   4 +-
 ...lder-imagerecipe_componentconfiguration.go |   4 +-
 ...ebuilder-imagerecipe_componentparameter.go |   4 +-
 ...ipe_ebsinstanceblockdevicespecification.go |   4 +-
 ...-imagerecipe_instanceblockdevicemapping.go |   4 +-
 ...builder-imagerecipe_systemsmanageragent.go |   4 +-
 ...magebuilder-infrastructureconfiguration.go |   4 +-
 ...reconfiguration_instancemetadataoptions.go |   4 +-
 ...der-infrastructureconfiguration_logging.go |   2 +-
 ...lder-infrastructureconfiguration_s3logs.go |   4 +-
 .../aws-inspector-assessmenttarget.go         |   4 +-
 .../aws-inspector-assessmenttemplate.go       |   6 +-
 .../inspector/aws-inspector-resourcegroup.go  |   4 +-
 .../goformation}/cloudformation/intrinsics.go |   2 +-
 .../cloudformation/intrinsics_test.go         |   2 +-
 .../iot/aws-iot-accountauditconfiguration.go  |   4 +-
 ...itconfiguration_auditcheckconfiguration.go |   4 +-
 ...tconfiguration_auditcheckconfigurations.go |   2 +-
 ...itconfiguration_auditnotificationtarget.go |   4 +-
 ...n_auditnotificationtargetconfigurations.go |   2 +-
 .../cloudformation/iot/aws-iot-authorizer.go  |   6 +-
 .../iot/aws-iot-authorizer_tags.go            |   2 +-
 ...s-iot-authorizer_tokensigningpublickeys.go |   2 +-
 .../cloudformation/iot/aws-iot-certificate.go |   4 +-
 .../iot/aws-iot-custommetric.go               |   6 +-
 .../cloudformation/iot/aws-iot-dimension.go   |   6 +-
 .../iot/aws-iot-domainconfiguration.go        |   6 +-
 ...ot-domainconfiguration_authorizerconfig.go |   4 +-
 ...nconfiguration_servercertificatesummary.go |   4 +-
 .../iot/aws-iot-domainconfiguration_tags.go   |   2 +-
 .../cloudformation/iot/aws-iot-fleetmetric.go |   6 +-
 .../aws-iot-fleetmetric_aggregationtype.go    |   4 +-
 .../cloudformation/iot/aws-iot-jobtemplate.go |   6 +-
 .../cloudformation/iot/aws-iot-logging.go     |   4 +-
 .../iot/aws-iot-mitigationaction.go           |   6 +-
 .../aws-iot-mitigationaction_actionparams.go  |   2 +-
 ...ationaction_addthingstothinggroupparams.go |   4 +-
 ...mitigationaction_enableiotloggingparams.go |   4 +-
 ...igationaction_publishfindingtosnsparams.go |   4 +-
 ...ction_replacedefaultpolicyversionparams.go |   4 +-
 ...igationaction_updatecacertificateparams.go |   4 +-
 ...ionaction_updatedevicecertificateparams.go |   4 +-
 .../cloudformation/iot/aws-iot-policy.go      |   4 +-
 .../iot/aws-iot-policyprincipalattachment.go  |   4 +-
 .../iot/aws-iot-provisioningtemplate.go       |   6 +-
 ...t-provisioningtemplate_provisioninghook.go |   4 +-
 .../iot/aws-iot-provisioningtemplate_tags.go  |   2 +-
 .../iot/aws-iot-resourcespecificlogging.go    |   4 +-
 .../iot/aws-iot-scheduledaudit.go             |   6 +-
 .../iot/aws-iot-securityprofile.go            |   6 +-
 .../aws-iot-securityprofile_alerttarget.go    |   4 +-
 .../iot/aws-iot-securityprofile_behavior.go   |   4 +-
 ...ws-iot-securityprofile_behaviorcriteria.go |   4 +-
 ...yprofile_machinelearningdetectionconfig.go |   4 +-
 ...aws-iot-securityprofile_metricdimension.go |   4 +-
 .../aws-iot-securityprofile_metrictoretain.go |   4 +-
 .../aws-iot-securityprofile_metricvalue.go    |   4 +-
 ...ot-securityprofile_statisticalthreshold.go |   4 +-
 .../cloudformation/iot/aws-iot-thing.go       |   4 +-
 .../iot/aws-iot-thing_attributepayload.go     |   4 +-
 .../iot/aws-iot-thingprincipalattachment.go   |   4 +-
 .../cloudformation/iot/aws-iot-topicrule.go   |   6 +-
 .../iot/aws-iot-topicrule_action.go           |   2 +-
 ...ws-iot-topicrule_assetpropertytimestamp.go |   4 +-
 .../aws-iot-topicrule_assetpropertyvalue.go   |   4 +-
 .../aws-iot-topicrule_assetpropertyvariant.go |   4 +-
 ...aws-iot-topicrule_cloudwatchalarmaction.go |   4 +-
 .../aws-iot-topicrule_cloudwatchlogsaction.go |   4 +-
 ...ws-iot-topicrule_cloudwatchmetricaction.go |   4 +-
 .../iot/aws-iot-topicrule_dynamodbaction.go   |   4 +-
 .../iot/aws-iot-topicrule_dynamodbv2action.go |   4 +-
 .../aws-iot-topicrule_elasticsearchaction.go  |   4 +-
 .../iot/aws-iot-topicrule_firehoseaction.go   |   4 +-
 .../iot/aws-iot-topicrule_httpaction.go       |   4 +-
 .../iot/aws-iot-topicrule_httpactionheader.go |   4 +-
 .../aws-iot-topicrule_httpauthorization.go    |   2 +-
 .../aws-iot-topicrule_iotanalyticsaction.go   |   4 +-
 .../iot/aws-iot-topicrule_ioteventsaction.go  |   4 +-
 .../aws-iot-topicrule_iotsitewiseaction.go    |   4 +-
 .../iot/aws-iot-topicrule_kafkaaction.go      |   4 +-
 .../iot/aws-iot-topicrule_kinesisaction.go    |   4 +-
 .../iot/aws-iot-topicrule_lambdaaction.go     |   4 +-
 .../iot/aws-iot-topicrule_opensearchaction.go |   4 +-
 ...ot-topicrule_putassetpropertyvalueentry.go |   4 +-
 .../iot/aws-iot-topicrule_putiteminput.go     |   4 +-
 .../iot/aws-iot-topicrule_republishaction.go  |   4 +-
 .../iot/aws-iot-topicrule_s3action.go         |   4 +-
 .../aws-iot-topicrule_sigv4authorization.go   |   4 +-
 .../iot/aws-iot-topicrule_snsaction.go        |   4 +-
 .../iot/aws-iot-topicrule_sqsaction.go        |   4 +-
 .../aws-iot-topicrule_stepfunctionsaction.go  |   4 +-
 .../iot/aws-iot-topicrule_timestreamaction.go |   4 +-
 .../aws-iot-topicrule_timestreamdimension.go  |   4 +-
 .../aws-iot-topicrule_timestreamtimestamp.go  |   4 +-
 .../iot/aws-iot-topicrule_topicrulepayload.go |   4 +-
 .../iot/aws-iot-topicruledestination.go       |   4 +-
 ...ledestination_httpurldestinationsummary.go |   4 +-
 ...uledestination_vpcdestinationproperties.go |   4 +-
 .../iot1click/aws-iot1click-device.go         |   4 +-
 .../iot1click/aws-iot1click-placement.go      |   4 +-
 .../iot1click/aws-iot1click-project.go        |   4 +-
 .../aws-iot1click-project_devicetemplate.go   |   4 +-
 ...aws-iot1click-project_placementtemplate.go |   2 +-
 .../iotanalytics/aws-iotanalytics-channel.go  |   6 +-
 ...aws-iotanalytics-channel_channelstorage.go |   2 +-
 ...-iotanalytics-channel_customermanageds3.go |   4 +-
 ...ws-iotanalytics-channel_retentionperiod.go |   4 +-
 ...s-iotanalytics-channel_servicemanageds3.go |   2 +-
 .../iotanalytics/aws-iotanalytics-dataset.go  |   6 +-
 .../aws-iotanalytics-dataset_action.go        |   4 +-
 ...ws-iotanalytics-dataset_containeraction.go |   4 +-
 ...tics-dataset_datasetcontentdeliveryrule.go |   4 +-
 ...t_datasetcontentdeliveryruledestination.go |   2 +-
 ...tics-dataset_datasetcontentversionvalue.go |   4 +-
 .../aws-iotanalytics-dataset_deltatime.go     |   4 +-
 ...set_deltatimesessionwindowconfiguration.go |   4 +-
 .../aws-iotanalytics-dataset_filter.go        |   2 +-
 ...-iotanalytics-dataset_glueconfiguration.go |   4 +-
 ...taset_ioteventsdestinationconfiguration.go |   4 +-
 .../aws-iotanalytics-dataset_latedatarule.go  |   4 +-
 ...ytics-dataset_latedataruleconfiguration.go |   2 +-
 ...iotanalytics-dataset_outputfileurivalue.go |   4 +-
 .../aws-iotanalytics-dataset_queryaction.go   |   4 +-
 ...analytics-dataset_resourceconfiguration.go |   4 +-
 ...ws-iotanalytics-dataset_retentionperiod.go |   4 +-
 ...tics-dataset_s3destinationconfiguration.go |   4 +-
 .../aws-iotanalytics-dataset_schedule.go      |   4 +-
 .../aws-iotanalytics-dataset_trigger.go       |   2 +-
 ...-iotanalytics-dataset_triggeringdataset.go |   4 +-
 .../aws-iotanalytics-dataset_variable.go      |   4 +-
 ...alytics-dataset_versioningconfiguration.go |   4 +-
 .../aws-iotanalytics-datastore.go             |   6 +-
 .../aws-iotanalytics-datastore_column.go      |   4 +-
 ...otanalytics-datastore_customermanageds3.go |   4 +-
 ...tics-datastore_customermanageds3storage.go |   4 +-
 ...tanalytics-datastore_datastorepartition.go |   2 +-
 ...analytics-datastore_datastorepartitions.go |   2 +-
 ...iotanalytics-datastore_datastorestorage.go |   2 +-
 ...ytics-datastore_fileformatconfiguration.go |   2 +-
 ...-datastore_iotsitewisemultilayerstorage.go |   2 +-
 ...otanalytics-datastore_jsonconfiguration.go |   2 +-
 ...nalytics-datastore_parquetconfiguration.go |   2 +-
 .../aws-iotanalytics-datastore_partition.go   |   4 +-
 ...-iotanalytics-datastore_retentionperiod.go |   4 +-
 ...iotanalytics-datastore_schemadefinition.go |   2 +-
 ...iotanalytics-datastore_servicemanageds3.go |   2 +-
 ...tanalytics-datastore_timestamppartition.go |   4 +-
 .../iotanalytics/aws-iotanalytics-pipeline.go |   6 +-
 .../aws-iotanalytics-pipeline_activity.go     |   2 +-
 ...aws-iotanalytics-pipeline_addattributes.go |   4 +-
 .../aws-iotanalytics-pipeline_channel.go      |   4 +-
 .../aws-iotanalytics-pipeline_datastore.go    |   4 +-
 ...analytics-pipeline_deviceregistryenrich.go |   4 +-
 ...otanalytics-pipeline_deviceshadowenrich.go |   4 +-
 .../aws-iotanalytics-pipeline_filter.go       |   4 +-
 .../aws-iotanalytics-pipeline_lambda.go       |   4 +-
 .../aws-iotanalytics-pipeline_math.go         |   4 +-
 ...-iotanalytics-pipeline_removeattributes.go |   4 +-
 ...-iotanalytics-pipeline_selectattributes.go |   4 +-
 ...ws-iotcoredeviceadvisor-suitedefinition.go |   4 +-
 .../iotevents/aws-iotevents-detectormodel.go  |   6 +-
 .../aws-iotevents-detectormodel_action.go     |   2 +-
 ...ts-detectormodel_assetpropertytimestamp.go |   4 +-
 ...events-detectormodel_assetpropertyvalue.go |   4 +-
 ...ents-detectormodel_assetpropertyvariant.go |   4 +-
 .../aws-iotevents-detectormodel_cleartimer.go |   4 +-
 ...s-detectormodel_detectormodeldefinition.go |   4 +-
 .../aws-iotevents-detectormodel_dynamodb.go   |   4 +-
 .../aws-iotevents-detectormodel_dynamodbv2.go |   4 +-
 .../aws-iotevents-detectormodel_event.go      |   4 +-
 .../aws-iotevents-detectormodel_firehose.go   |   4 +-
 .../aws-iotevents-detectormodel_iotevents.go  |   4 +-
 ...aws-iotevents-detectormodel_iotsitewise.go |   4 +-
 ...iotevents-detectormodel_iottopicpublish.go |   4 +-
 .../aws-iotevents-detectormodel_lambda.go     |   4 +-
 .../aws-iotevents-detectormodel_onenter.go    |   2 +-
 .../aws-iotevents-detectormodel_onexit.go     |   2 +-
 .../aws-iotevents-detectormodel_oninput.go    |   2 +-
 .../aws-iotevents-detectormodel_payload.go    |   4 +-
 .../aws-iotevents-detectormodel_resettimer.go |   4 +-
 .../aws-iotevents-detectormodel_settimer.go   |   4 +-
 ...aws-iotevents-detectormodel_setvariable.go |   4 +-
 .../aws-iotevents-detectormodel_sns.go        |   4 +-
 .../aws-iotevents-detectormodel_sqs.go        |   4 +-
 .../aws-iotevents-detectormodel_state.go      |   4 +-
 ...iotevents-detectormodel_transitionevent.go |   4 +-
 .../iotevents/aws-iotevents-input.go          |   6 +-
 .../aws-iotevents-input_attribute.go          |   4 +-
 .../aws-iotevents-input_inputdefinition.go    |   2 +-
 .../aws-iotfleethub-application.go            |   6 +-
 .../aws-iotsitewise-accesspolicy.go           |   4 +-
 ...ewise-accesspolicy_accesspolicyidentity.go |   2 +-
 ...ewise-accesspolicy_accesspolicyresource.go |   2 +-
 .../aws-iotsitewise-accesspolicy_iamrole.go   |   4 +-
 .../aws-iotsitewise-accesspolicy_iamuser.go   |   4 +-
 .../aws-iotsitewise-accesspolicy_portal.go    |   4 +-
 .../aws-iotsitewise-accesspolicy_project.go   |   4 +-
 .../aws-iotsitewise-accesspolicy_user.go      |   4 +-
 .../iotsitewise/aws-iotsitewise-asset.go      |   6 +-
 .../aws-iotsitewise-asset_assethierarchy.go   |   4 +-
 .../aws-iotsitewise-asset_assetproperty.go    |   4 +-
 .../iotsitewise/aws-iotsitewise-assetmodel.go |   6 +-
 ...ise-assetmodel_assetmodelcompositemodel.go |   4 +-
 ...sitewise-assetmodel_assetmodelhierarchy.go |   4 +-
 ...tsitewise-assetmodel_assetmodelproperty.go |   4 +-
 .../aws-iotsitewise-assetmodel_attribute.go   |   4 +-
 ...tsitewise-assetmodel_expressionvariable.go |   4 +-
 .../aws-iotsitewise-assetmodel_metric.go      |   4 +-
 ...aws-iotsitewise-assetmodel_metricwindow.go |   2 +-
 ...aws-iotsitewise-assetmodel_propertytype.go |   4 +-
 .../aws-iotsitewise-assetmodel_transform.go   |   4 +-
 ...s-iotsitewise-assetmodel_tumblingwindow.go |   4 +-
 ...ws-iotsitewise-assetmodel_variablevalue.go |   4 +-
 .../iotsitewise/aws-iotsitewise-dashboard.go  |   6 +-
 .../iotsitewise/aws-iotsitewise-gateway.go    |   6 +-
 ...tewise-gateway_gatewaycapabilitysummary.go |   4 +-
 ...aws-iotsitewise-gateway_gatewayplatform.go |   2 +-
 .../aws-iotsitewise-gateway_greengrass.go     |   4 +-
 .../iotsitewise/aws-iotsitewise-portal.go     |   6 +-
 .../iotsitewise/aws-iotsitewise-project.go    |   6 +-
 .../aws-iotthingsgraph-flowtemplate.go        |   4 +-
 ...gsgraph-flowtemplate_definitiondocument.go |   4 +-
 .../aws-iotwireless-destination.go            |   6 +-
 .../aws-iotwireless-deviceprofile.go          |   6 +-
 ...less-deviceprofile_lorawandeviceprofile.go |   4 +-
 .../iotwireless/aws-iotwireless-fuotatask.go  |   6 +-
 .../aws-iotwireless-fuotatask_lorawan.go      |   4 +-
 .../aws-iotwireless-multicastgroup.go         |   6 +-
 .../aws-iotwireless-multicastgroup_lorawan.go |   4 +-
 .../aws-iotwireless-partneraccount.go         |   6 +-
 ...less-partneraccount_sidewalkaccountinfo.go |   4 +-
 ...ss-partneraccount_sidewalkupdateaccount.go |   4 +-
 .../aws-iotwireless-serviceprofile.go         |   6 +-
 ...ss-serviceprofile_lorawanserviceprofile.go |   4 +-
 .../aws-iotwireless-taskdefinition.go         |   6 +-
 ...ss-taskdefinition_lorawangatewayversion.go |   4 +-
 ...finition_lorawanupdategatewaytaskcreate.go |   4 +-
 ...efinition_lorawanupdategatewaytaskentry.go |   2 +-
 ...inition_updatewirelessgatewaytaskcreate.go |   4 +-
 .../aws-iotwireless-wirelessdevice.go         |   6 +-
 .../aws-iotwireless-wirelessdevice_abpv10x.go |   4 +-
 .../aws-iotwireless-wirelessdevice_abpv11.go  |   4 +-
 ...otwireless-wirelessdevice_lorawandevice.go |   4 +-
 ...aws-iotwireless-wirelessdevice_otaav10x.go |   4 +-
 .../aws-iotwireless-wirelessdevice_otaav11.go |   4 +-
 ...eless-wirelessdevice_sessionkeysabpv10x.go |   4 +-
 ...reless-wirelessdevice_sessionkeysabpv11.go |   4 +-
 .../aws-iotwireless-wirelessgateway.go        |   6 +-
 ...wireless-wirelessgateway_lorawangateway.go |   4 +-
 .../cloudformation/ivs/aws-ivs-channel.go     |   6 +-
 .../ivs/aws-ivs-playbackkeypair.go            |   6 +-
 .../ivs/aws-ivs-recordingconfiguration.go     |   6 +-
 ...gconfiguration_destinationconfiguration.go |   2 +-
 ...onfiguration_s3destinationconfiguration.go |   4 +-
 .../cloudformation/ivs/aws-ivs-streamkey.go   |   6 +-
 .../kendra/aws-kendra-datasource.go           |   6 +-
 ...tasource_accesscontrollistconfiguration.go |   4 +-
 .../aws-kendra-datasource_aclconfiguration.go |   4 +-
 ...endra-datasource_changedetectingcolumns.go |   4 +-
 ...s-kendra-datasource_columnconfiguration.go |   4 +-
 ...ource_confluenceattachmentconfiguration.go |   4 +-
 ...confluenceattachmenttoindexfieldmapping.go |   4 +-
 ...-datasource_confluenceblogconfiguration.go |   2 +-
 ...ource_confluenceblogtoindexfieldmapping.go |   4 +-
 ...ndra-datasource_confluenceconfiguration.go |   4 +-
 ...-datasource_confluencepageconfiguration.go |   2 +-
 ...ource_confluencepagetoindexfieldmapping.go |   4 +-
 ...datasource_confluencespaceconfiguration.go |   4 +-
 ...urce_confluencespacetoindexfieldmapping.go |   4 +-
 ...ndra-datasource_connectionconfiguration.go |   4 +-
 ...kendra-datasource_databaseconfiguration.go |   4 +-
 ...ndra-datasource_datasourceconfiguration.go |   2 +-
 ...e_datasourceinclusionsexclusionsstrings.go |   4 +-
 ...atasource_datasourcetoindexfieldmapping.go |   4 +-
 ...ource_datasourcetoindexfieldmappinglist.go |   2 +-
 ...a-datasource_datasourcevpcconfiguration.go |   4 +-
 ...tasource_documentsmetadataconfiguration.go |   4 +-
 ...dra-datasource_googledriveconfiguration.go |   4 +-
 ...kendra-datasource_onedriveconfiguration.go |   4 +-
 .../aws-kendra-datasource_onedriveuserlist.go |   4 +-
 .../aws-kendra-datasource_onedriveusers.go    |   4 +-
 ...ws-kendra-datasource_proxyconfiguration.go |   4 +-
 ...ra-datasource_s3datasourceconfiguration.go |   4 +-
 .../kendra/aws-kendra-datasource_s3path.go    |   4 +-
 ...urce_salesforcechatterfeedconfiguration.go |   4 +-
 ...salesforcechatterfeedincludefiltertypes.go |   4 +-
 ...ndra-datasource_salesforceconfiguration.go |   4 +-
 ...customknowledgearticletypeconfiguration.go |   4 +-
 ...omknowledgearticletypeconfigurationlist.go |   2 +-
 ...salesforceknowledgearticleconfiguration.go |   4 +-
 ...rce_salesforceknowledgearticlestatelist.go |   4 +-
 ...andardknowledgearticletypeconfiguration.go |   4 +-
 ...cestandardobjectattachmentconfiguration.go |   4 +-
 ...e_salesforcestandardobjectconfiguration.go |   4 +-
 ...lesforcestandardobjectconfigurationlist.go |   2 +-
 ...ndra-datasource_servicenowconfiguration.go |   4 +-
 ...servicenowknowledgearticleconfiguration.go |   4 +-
 ...e_servicenowservicecatalogconfiguration.go |   4 +-
 ...ndra-datasource_sharepointconfiguration.go |   4 +-
 .../aws-kendra-datasource_sqlconfiguration.go |   4 +-
 .../kendra/aws-kendra-datasource_taglist.go   |   4 +-
 ...e_webcrawlerauthenticationconfiguration.go |   2 +-
 ...atasource_webcrawlerbasicauthentication.go |   4 +-
 ...ndra-datasource_webcrawlerconfiguration.go |   4 +-
 ...tasource_webcrawlerseedurlconfiguration.go |   4 +-
 ...asource_webcrawlersitemapsconfiguration.go |   4 +-
 .../aws-kendra-datasource_webcrawlerurls.go   |   2 +-
 ...kendra-datasource_workdocsconfiguration.go |   4 +-
 .../cloudformation/kendra/aws-kendra-faq.go   |   6 +-
 .../kendra/aws-kendra-faq_s3path.go           |   4 +-
 .../kendra/aws-kendra-faq_taglist.go          |   4 +-
 .../cloudformation/kendra/aws-kendra-index.go |   6 +-
 ...kendra-index_capacityunitsconfiguration.go |   4 +-
 ...dra-index_documentmetadataconfiguration.go |   4 +-
 ...index_documentmetadataconfigurationlist.go |   2 +-
 ...kendra-index_jsontokentypeconfiguration.go |   4 +-
 ...-kendra-index_jwttokentypeconfiguration.go |   4 +-
 .../kendra/aws-kendra-index_relevance.go      |   4 +-
 .../kendra/aws-kendra-index_search.go         |   4 +-
 ...index_serversideencryptionconfiguration.go |   4 +-
 .../kendra/aws-kendra-index_taglist.go        |   4 +-
 ...aws-kendra-index_usertokenconfiguration.go |   2 +-
 .../aws-kendra-index_valueimportanceitem.go   |   4 +-
 .../aws-kendra-index_valueimportanceitems.go  |   2 +-
 .../kinesis/aws-kinesis-stream.go             |   6 +-
 .../aws-kinesis-stream_streamencryption.go    |   4 +-
 .../kinesis/aws-kinesis-streamconsumer.go     |   4 +-
 .../aws-kinesisanalytics-application.go       |   4 +-
 ...lytics-application_csvmappingparameters.go |   4 +-
 .../aws-kinesisanalytics-application_input.go |   4 +-
 ...lytics-application_inputlambdaprocessor.go |   4 +-
 ...sanalytics-application_inputparallelism.go |   4 +-
 ...pplication_inputprocessingconfiguration.go |   2 +-
 ...inesisanalytics-application_inputschema.go |   4 +-
 ...ytics-application_jsonmappingparameters.go |   4 +-
 ...lytics-application_kinesisfirehoseinput.go |   4 +-
 ...alytics-application_kinesisstreamsinput.go |   4 +-
 ...analytics-application_mappingparameters.go |   2 +-
 ...nesisanalytics-application_recordcolumn.go |   4 +-
 ...nesisanalytics-application_recordformat.go |   4 +-
 .../aws-kinesisanalytics-applicationoutput.go |   4 +-
 ...ics-applicationoutput_destinationschema.go |   4 +-
 ...applicationoutput_kinesisfirehoseoutput.go |   4 +-
 ...-applicationoutput_kinesisstreamsoutput.go |   4 +-
 ...nalytics-applicationoutput_lambdaoutput.go |   4 +-
 ...nesisanalytics-applicationoutput_output.go |   4 +-
 ...nalytics-applicationreferencedatasource.go |   4 +-
 ...eferencedatasource_csvmappingparameters.go |   4 +-
 ...ferencedatasource_jsonmappingparameters.go |   4 +-
 ...onreferencedatasource_mappingparameters.go |   2 +-
 ...icationreferencedatasource_recordcolumn.go |   4 +-
 ...icationreferencedatasource_recordformat.go |   4 +-
 ...referencedatasource_referencedatasource.go |   4 +-
 ...tionreferencedatasource_referenceschema.go |   4 +-
 ...ferencedatasource_s3referencedatasource.go |   4 +-
 .../aws-kinesisanalyticsv2-application.go     |   6 +-
 ...pplication_applicationcodeconfiguration.go |   4 +-
 ...v2-application_applicationconfiguration.go |   2 +-
 ...cation_applicationsnapshotconfiguration.go |   4 +-
 ...ticsv2-application_catalogconfiguration.go |   2 +-
 ...sv2-application_checkpointconfiguration.go |   4 +-
 ...esisanalyticsv2-application_codecontent.go |   4 +-
 ...ticsv2-application_csvmappingparameters.go |   4 +-
 ...application_customartifactconfiguration.go |   4 +-
 ...pplication_customartifactsconfiguration.go |   2 +-
 ...cation_deployasapplicationconfiguration.go |   2 +-
 ...icsv2-application_environmentproperties.go |   2 +-
 ...plication_flinkapplicationconfiguration.go |   2 +-
 ...pplication_gluedatacatalogconfiguration.go |   4 +-
 ...ws-kinesisanalyticsv2-application_input.go |   4 +-
 ...ticsv2-application_inputlambdaprocessor.go |   4 +-
 ...nalyticsv2-application_inputparallelism.go |   4 +-
 ...pplication_inputprocessingconfiguration.go |   2 +-
 ...esisanalyticsv2-application_inputschema.go |   4 +-
 ...icsv2-application_jsonmappingparameters.go |   4 +-
 ...ticsv2-application_kinesisfirehoseinput.go |   4 +-
 ...yticsv2-application_kinesisstreamsinput.go |   4 +-
 ...alyticsv2-application_mappingparameters.go |   2 +-
 ...sanalyticsv2-application_mavenreference.go |   4 +-
 ...sv2-application_monitoringconfiguration.go |   4 +-
 ...v2-application_parallelismconfiguration.go |   4 +-
 ...isanalyticsv2-application_propertygroup.go |   4 +-
 ...sisanalyticsv2-application_recordcolumn.go |   4 +-
 ...sisanalyticsv2-application_recordformat.go |   4 +-
 ...icsv2-application_s3contentbaselocation.go |   4 +-
 ...alyticsv2-application_s3contentlocation.go |   4 +-
 ...application_sqlapplicationconfiguration.go |   2 +-
 ...cation_zeppelinapplicationconfiguration.go |   2 +-
 ...ication_zeppelinmonitoringconfiguration.go |   4 +-
 ...csv2-applicationcloudwatchloggingoption.go |   4 +-
 ...chloggingoption_cloudwatchloggingoption.go |   4 +-
 ...ws-kinesisanalyticsv2-applicationoutput.go |   4 +-
 ...sv2-applicationoutput_destinationschema.go |   4 +-
 ...applicationoutput_kinesisfirehoseoutput.go |   4 +-
 ...-applicationoutput_kinesisstreamsoutput.go |   4 +-
 ...lyticsv2-applicationoutput_lambdaoutput.go |   4 +-
 ...sisanalyticsv2-applicationoutput_output.go |   4 +-
 ...lyticsv2-applicationreferencedatasource.go |   4 +-
 ...eferencedatasource_csvmappingparameters.go |   4 +-
 ...ferencedatasource_jsonmappingparameters.go |   4 +-
 ...onreferencedatasource_mappingparameters.go |   2 +-
 ...icationreferencedatasource_recordcolumn.go |   4 +-
 ...icationreferencedatasource_recordformat.go |   4 +-
 ...referencedatasource_referencedatasource.go |   4 +-
 ...tionreferencedatasource_referenceschema.go |   4 +-
 ...ferencedatasource_s3referencedatasource.go |   4 +-
 .../aws-kinesisfirehose-deliverystream.go     |   6 +-
 ...m_amazonopensearchservicebufferinghints.go |   4 +-
 ...ensearchservicedestinationconfiguration.go |   4 +-
 ...eam_amazonopensearchserviceretryoptions.go |   4 +-
 ...sfirehose-deliverystream_bufferinghints.go |   4 +-
 ...deliverystream_cloudwatchloggingoptions.go |   4 +-
 ...esisfirehose-deliverystream_copycommand.go |   4 +-
 ...tream_dataformatconversionconfiguration.go |   4 +-
 ...iverystreamencryptionconfigurationinput.go |   4 +-
 ...sisfirehose-deliverystream_deserializer.go |   2 +-
 ...stream_dynamicpartitioningconfiguration.go |   4 +-
 ...iverystream_elasticsearchbufferinghints.go |   4 +-
 ...m_elasticsearchdestinationconfiguration.go |   4 +-
 ...eliverystream_elasticsearchretryoptions.go |   4 +-
 ...-deliverystream_encryptionconfiguration.go |   4 +-
 ...ream_extendeds3destinationconfiguration.go |   4 +-
 ...isfirehose-deliverystream_hivejsonserde.go |   4 +-
 ...iverystream_httpendpointcommonattribute.go |   4 +-
 ...eliverystream_httpendpointconfiguration.go |   4 +-
 ...am_httpendpointdestinationconfiguration.go |   4 +-
 ...stream_httpendpointrequestconfiguration.go |   4 +-
 ...deliverystream_inputformatconfiguration.go |   2 +-
 ...stream_kinesisstreamsourceconfiguration.go |   4 +-
 ...hose-deliverystream_kmsencryptionconfig.go |   4 +-
 ...sfirehose-deliverystream_openxjsonserde.go |   4 +-
 ...kinesisfirehose-deliverystream_orcserde.go |   4 +-
 ...eliverystream_outputformatconfiguration.go |   2 +-
 ...sisfirehose-deliverystream_parquetserde.go |   4 +-
 ...-deliverystream_processingconfiguration.go |   4 +-
 ...inesisfirehose-deliverystream_processor.go |   4 +-
 ...ehose-deliverystream_processorparameter.go |   4 +-
 ...stream_redshiftdestinationconfiguration.go |   4 +-
 ...ose-deliverystream_redshiftretryoptions.go |   4 +-
 ...sisfirehose-deliverystream_retryoptions.go |   4 +-
 ...liverystream_s3destinationconfiguration.go |   4 +-
 ...hose-deliverystream_schemaconfiguration.go |   4 +-
 ...nesisfirehose-deliverystream_serializer.go |   2 +-
 ...rystream_splunkdestinationconfiguration.go |   4 +-
 ...ehose-deliverystream_splunkretryoptions.go |   4 +-
 ...irehose-deliverystream_vpcconfiguration.go |   4 +-
 .../cloudformation/kms/aws-kms-alias.go       |   4 +-
 .../cloudformation/kms/aws-kms-key.go         |   6 +-
 .../cloudformation/kms/aws-kms-replicakey.go  |   6 +-
 .../aws-lakeformation-datalakesettings.go     |   4 +-
 ...s-lakeformation-datalakesettings_admins.go |   2 +-
 ...tion-datalakesettings_datalakeprincipal.go |   4 +-
 .../aws-lakeformation-permissions.go          |   4 +-
 ...akeformation-permissions_columnwildcard.go |   4 +-
 ...eformation-permissions_databaseresource.go |   4 +-
 ...formation-permissions_datalakeprincipal.go |   4 +-
 ...mation-permissions_datalocationresource.go |   4 +-
 .../aws-lakeformation-permissions_resource.go |   2 +-
 ...lakeformation-permissions_tableresource.go |   4 +-
 ...lakeformation-permissions_tablewildcard.go |   2 +-
 ...on-permissions_tablewithcolumnsresource.go |   4 +-
 .../aws-lakeformation-resource.go             |   4 +-
 .../cloudformation/lambda/aws-lambda-alias.go |   4 +-
 ...-lambda-alias_aliasroutingconfiguration.go |   2 +-
 ...ias_provisionedconcurrencyconfiguration.go |   4 +-
 .../lambda/aws-lambda-alias_versionweight.go  |   4 +-
 .../lambda/aws-lambda-codesigningconfig.go    |   4 +-
 ...bda-codesigningconfig_allowedpublishers.go |   4 +-
 ...a-codesigningconfig_codesigningpolicies.go |   4 +-
 .../lambda/aws-lambda-eventinvokeconfig.go    |   4 +-
 ...bda-eventinvokeconfig_destinationconfig.go |   2 +-
 .../aws-lambda-eventinvokeconfig_onfailure.go |   4 +-
 .../aws-lambda-eventinvokeconfig_onsuccess.go |   4 +-
 .../lambda/aws-lambda-eventsourcemapping.go   |   4 +-
 ...da-eventsourcemapping_destinationconfig.go |   2 +-
 ...aws-lambda-eventsourcemapping_endpoints.go |   4 +-
 ...aws-lambda-eventsourcemapping_onfailure.go |   4 +-
 ...entsourcemapping_selfmanagedeventsource.go |   2 +-
 ...sourcemapping_sourceaccessconfiguration.go |   4 +-
 .../lambda/aws-lambda-function.go             |   6 +-
 .../lambda/aws-lambda-function_code.go        |   4 +-
 .../aws-lambda-function_deadletterconfig.go   |   4 +-
 .../lambda/aws-lambda-function_environment.go |   4 +-
 .../aws-lambda-function_filesystemconfig.go   |   4 +-
 .../lambda/aws-lambda-function_imageconfig.go |   4 +-
 .../aws-lambda-function_tracingconfig.go      |   4 +-
 .../lambda/aws-lambda-function_vpcconfig.go   |   4 +-
 .../lambda/aws-lambda-layerversion.go         |   4 +-
 .../lambda/aws-lambda-layerversion_content.go |   4 +-
 .../aws-lambda-layerversionpermission.go      |   4 +-
 .../lambda/aws-lambda-permission.go           |   4 +-
 .../lambda/aws-lambda-version.go              |   4 +-
 ...ion_provisionedconcurrencyconfiguration.go |   4 +-
 .../aws-licensemanager-grant.go               |   4 +-
 .../aws-licensemanager-license.go             |   4 +-
 ...ensemanager-license_borrowconfiguration.go |   4 +-
 ...anager-license_consumptionconfiguration.go |   4 +-
 .../aws-licensemanager-license_entitlement.go |   4 +-
 .../aws-licensemanager-license_issuerdata.go  |   4 +-
 .../aws-licensemanager-license_metadata.go    |   4 +-
 ...anager-license_provisionalconfiguration.go |   4 +-
 ...censemanager-license_validitydateformat.go |   4 +-
 .../lightsail/aws-lightsail-database.go       |   6 +-
 ...il-database_relationaldatabaseparameter.go |   4 +-
 .../lightsail/aws-lightsail-disk.go           |   6 +-
 .../lightsail/aws-lightsail-disk_addon.go     |   4 +-
 .../aws-lightsail-disk_autosnapshotaddon.go   |   4 +-
 .../lightsail/aws-lightsail-instance.go       |   6 +-
 .../lightsail/aws-lightsail-instance_addon.go |   4 +-
 ...ws-lightsail-instance_autosnapshotaddon.go |   4 +-
 .../lightsail/aws-lightsail-instance_disk.go  |   4 +-
 .../aws-lightsail-instance_hardware.go        |   4 +-
 .../aws-lightsail-instance_location.go        |   4 +-
 .../aws-lightsail-instance_monthlytransfer.go |   4 +-
 .../aws-lightsail-instance_networking.go      |   2 +-
 .../lightsail/aws-lightsail-instance_port.go  |   4 +-
 .../lightsail/aws-lightsail-instance_state.go |   4 +-
 .../lightsail/aws-lightsail-staticip.go       |   4 +-
 .../aws-location-geofencecollection.go        |   4 +-
 .../location/aws-location-map.go              |   4 +-
 .../aws-location-map_mapconfiguration.go      |   4 +-
 .../location/aws-location-placeindex.go       |   4 +-
 ...tion-placeindex_datasourceconfiguration.go |   4 +-
 .../location/aws-location-routecalculator.go  |   4 +-
 .../location/aws-location-tracker.go          |   4 +-
 .../location/aws-location-trackerconsumer.go  |   4 +-
 .../logs/aws-logs-destination.go              |   4 +-
 .../cloudformation/logs/aws-logs-loggroup.go  |   6 +-
 .../cloudformation/logs/aws-logs-logstream.go |   4 +-
 .../logs/aws-logs-metricfilter.go             |   4 +-
 ...-logs-metricfilter_metrictransformation.go |   4 +-
 .../logs/aws-logs-querydefinition.go          |   4 +-
 .../logs/aws-logs-resourcepolicy.go           |   4 +-
 .../logs/aws-logs-subscriptionfilter.go       |   4 +-
 ...aws-lookoutequipment-inferencescheduler.go |   6 +-
 .../aws-lookoutmetrics-alert.go               |   4 +-
 .../aws-lookoutmetrics-alert_action.go        |   2 +-
 ...ookoutmetrics-alert_lambdaconfiguration.go |   4 +-
 ...s-lookoutmetrics-alert_snsconfiguration.go |   4 +-
 .../aws-lookoutmetrics-anomalydetector.go     |   4 +-
 ...s-anomalydetector_anomalydetectorconfig.go |   4 +-
 ...utmetrics-anomalydetector_appflowconfig.go |   4 +-
 ...etrics-anomalydetector_cloudwatchconfig.go |   4 +-
 ...ics-anomalydetector_csvformatdescriptor.go |   4 +-
 ...cs-anomalydetector_fileformatdescriptor.go |   2 +-
 ...cs-anomalydetector_jsonformatdescriptor.go |   4 +-
 ...s-lookoutmetrics-anomalydetector_metric.go |   4 +-
 ...ookoutmetrics-anomalydetector_metricset.go |   4 +-
 ...outmetrics-anomalydetector_metricsource.go |   2 +-
 ...metrics-anomalydetector_rdssourceconfig.go |   4 +-
 ...cs-anomalydetector_redshiftsourceconfig.go |   4 +-
 ...tmetrics-anomalydetector_s3sourceconfig.go |   4 +-
 ...metrics-anomalydetector_timestampcolumn.go |   4 +-
 ...etrics-anomalydetector_vpcconfiguration.go |   4 +-
 .../aws-lookoutvision-project.go              |   4 +-
 .../macie/aws-macie-customdataidentifier.go   |   4 +-
 .../macie/aws-macie-findingsfilter.go         |   4 +-
 .../aws-macie-findingsfilter_criterion.go     |   2 +-
 ...ws-macie-findingsfilter_findingcriteria.go |   2 +-
 ...e-findingsfilter_findingsfilterlistitem.go |   4 +-
 .../cloudformation/macie/aws-macie-session.go |   4 +-
 .../aws-managedblockchain-member.go           |   4 +-
 ...ockchain-member_approvalthresholdpolicy.go |   4 +-
 ...edblockchain-member_memberconfiguration.go |   4 +-
 ...kchain-member_memberfabricconfiguration.go |   4 +-
 ...ain-member_memberframeworkconfiguration.go |   2 +-
 ...dblockchain-member_networkconfiguration.go |   4 +-
 ...chain-member_networkfabricconfiguration.go |   4 +-
 ...in-member_networkframeworkconfiguration.go |   2 +-
 ...s-managedblockchain-member_votingpolicy.go |   2 +-
 .../aws-managedblockchain-node.go             |   4 +-
 ...anagedblockchain-node_nodeconfiguration.go |   4 +-
 .../mediaconnect/aws-mediaconnect-flow.go     |   4 +-
 .../aws-mediaconnect-flow_encryption.go       |   4 +-
 .../aws-mediaconnect-flow_failoverconfig.go   |   4 +-
 .../aws-mediaconnect-flow_source.go           |   4 +-
 .../aws-mediaconnect-flowentitlement.go       |   4 +-
 ...mediaconnect-flowentitlement_encryption.go |   4 +-
 .../aws-mediaconnect-flowoutput.go            |   4 +-
 .../aws-mediaconnect-flowoutput_encryption.go |   4 +-
 ...nnect-flowoutput_vpcinterfaceattachment.go |   4 +-
 .../aws-mediaconnect-flowsource.go            |   4 +-
 .../aws-mediaconnect-flowsource_encryption.go |   4 +-
 .../aws-mediaconnect-flowvpcinterface.go      |   4 +-
 .../aws-mediaconvert-jobtemplate.go           |   4 +-
 ...onvert-jobtemplate_accelerationsettings.go |   4 +-
 ...mediaconvert-jobtemplate_hopdestination.go |   4 +-
 .../mediaconvert/aws-mediaconvert-preset.go   |   4 +-
 .../mediaconvert/aws-mediaconvert-queue.go    |   4 +-
 .../medialive/aws-medialive-channel.go        |   4 +-
 .../aws-medialive-channel_aacsettings.go      |   4 +-
 .../aws-medialive-channel_ac3settings.go      |   4 +-
 ...dialive-channel_ancillarysourcesettings.go |   4 +-
 ...ws-medialive-channel_archivecdnsettings.go |   2 +-
 ...ialive-channel_archivecontainersettings.go |   2 +-
 ...-medialive-channel_archivegroupsettings.go |   4 +-
 ...medialive-channel_archiveoutputsettings.go |   4 +-
 ...aws-medialive-channel_archives3settings.go |   4 +-
 ...dialive-channel_aribdestinationsettings.go |   2 +-
 ...ws-medialive-channel_aribsourcesettings.go |   2 +-
 ...s-medialive-channel_audiochannelmapping.go |   4 +-
 ...ws-medialive-channel_audiocodecsettings.go |   2 +-
 .../aws-medialive-channel_audiodescription.go |   4 +-
 ...live-channel_audiohlsrenditionselection.go |   4 +-
 ...edialive-channel_audiolanguageselection.go |   4 +-
 ...live-channel_audionormalizationsettings.go |   4 +-
 ...-medialive-channel_audioonlyhlssettings.go |   4 +-
 ...aws-medialive-channel_audiopidselection.go |   4 +-
 .../aws-medialive-channel_audioselector.go    |   4 +-
 ...medialive-channel_audioselectorsettings.go |   2 +-
 ...ve-channel_audiosilencefailoversettings.go |   4 +-
 .../aws-medialive-channel_audiotrack.go       |   4 +-
 ...s-medialive-channel_audiotrackselection.go |   2 +-
 ...edialive-channel_audiowatermarksettings.go |   2 +-
 ...-channel_automaticinputfailoversettings.go |   4 +-
 .../aws-medialive-channel_availblanking.go    |   4 +-
 ...ws-medialive-channel_availconfiguration.go |   2 +-
 .../aws-medialive-channel_availsettings.go    |   2 +-
 .../aws-medialive-channel_blackoutslate.go    |   4 +-
 ...alive-channel_burnindestinationsettings.go |   4 +-
 ...ws-medialive-channel_captiondescription.go |   4 +-
 ...live-channel_captiondestinationsettings.go |   2 +-
 ...edialive-channel_captionlanguagemapping.go |   4 +-
 .../aws-medialive-channel_captionrectangle.go |   4 +-
 .../aws-medialive-channel_captionselector.go  |   4 +-
 ...dialive-channel_captionselectorsettings.go |   2 +-
 ...medialive-channel_cdiinputspecification.go |   4 +-
 ...e-channel_colorspacepassthroughsettings.go |   2 +-
 .../aws-medialive-channel_dvbnitsettings.go   |   4 +-
 .../aws-medialive-channel_dvbsdtsettings.go   |   4 +-
 ...alive-channel_dvbsubdestinationsettings.go |   4 +-
 ...-medialive-channel_dvbsubsourcesettings.go |   4 +-
 .../aws-medialive-channel_dvbtdtsettings.go   |   4 +-
 .../aws-medialive-channel_eac3settings.go     |   4 +-
 ...alive-channel_ebuttddestinationsettings.go |   4 +-
 ...ive-channel_embeddeddestinationsettings.go |   2 +-
 ...l_embeddedplusscte20destinationsettings.go |   2 +-
 ...edialive-channel_embeddedsourcesettings.go |   4 +-
 .../aws-medialive-channel_encodersettings.go  |   2 +-
 ...aws-medialive-channel_failovercondition.go |   2 +-
 ...alive-channel_failoverconditionsettings.go |   2 +-
 ...ws-medialive-channel_featureactivations.go |   4 +-
 ...aws-medialive-channel_fecoutputsettings.go |   4 +-
 .../aws-medialive-channel_fmp4hlssettings.go  |   4 +-
 ...dialive-channel_framecapturecdnsettings.go |   2 +-
 ...alive-channel_framecapturegroupsettings.go |   2 +-
 ...dialive-channel_framecapturehlssettings.go |   2 +-
 ...live-channel_framecaptureoutputsettings.go |   4 +-
 ...edialive-channel_framecaptures3settings.go |   4 +-
 ...-medialive-channel_framecapturesettings.go |   4 +-
 ...s-medialive-channel_globalconfiguration.go |   4 +-
 ...edialive-channel_h264colorspacesettings.go |   2 +-
 ...ws-medialive-channel_h264filtersettings.go |   2 +-
 .../aws-medialive-channel_h264settings.go     |   4 +-
 ...edialive-channel_h265colorspacesettings.go |   2 +-
 ...ws-medialive-channel_h265filtersettings.go |   2 +-
 .../aws-medialive-channel_h265settings.go     |   4 +-
 .../aws-medialive-channel_hdr10settings.go    |   4 +-
 ...aws-medialive-channel_hlsakamaisettings.go |   4 +-
 ...s-medialive-channel_hlsbasicputsettings.go |   4 +-
 .../aws-medialive-channel_hlscdnsettings.go   |   2 +-
 .../aws-medialive-channel_hlsgroupsettings.go |   4 +-
 .../aws-medialive-channel_hlsinputsettings.go |   4 +-
 ...medialive-channel_hlsmediastoresettings.go |   4 +-
 ...aws-medialive-channel_hlsoutputsettings.go |   4 +-
 .../aws-medialive-channel_hlss3settings.go    |   4 +-
 .../aws-medialive-channel_hlssettings.go      |   2 +-
 ...aws-medialive-channel_hlswebdavsettings.go |   4 +-
 ...live-channel_htmlmotiongraphicssettings.go |   2 +-
 .../aws-medialive-channel_inputattachment.go  |   4 +-
 ...aws-medialive-channel_inputchannellevel.go |   4 +-
 .../aws-medialive-channel_inputlocation.go    |   4 +-
 ...aws-medialive-channel_inputlossbehavior.go |   4 +-
 ...alive-channel_inputlossfailoversettings.go |   4 +-
 .../aws-medialive-channel_inputsettings.go    |   4 +-
 ...ws-medialive-channel_inputspecification.go |   4 +-
 ...s-medialive-channel_keyprovidersettings.go |   2 +-
 .../aws-medialive-channel_m2tssettings.go     |   4 +-
 .../aws-medialive-channel_m3u8settings.go     |   4 +-
 ...alive-channel_mediapackagegroupsettings.go |   2 +-
 ...l_mediapackageoutputdestinationsettings.go |   4 +-
 ...live-channel_mediapackageoutputsettings.go |   2 +-
 ...ive-channel_motiongraphicsconfiguration.go |   4 +-
 ...edialive-channel_motiongraphicssettings.go |   2 +-
 .../aws-medialive-channel_mp2settings.go      |   4 +-
 ...s-medialive-channel_mpeg2filtersettings.go |   2 +-
 .../aws-medialive-channel_mpeg2settings.go    |   4 +-
 ...medialive-channel_mssmoothgroupsettings.go |   4 +-
 ...edialive-channel_mssmoothoutputsettings.go |   4 +-
 ...edialive-channel_multiplexgroupsettings.go |   2 +-
 ...dialive-channel_multiplexoutputsettings.go |   2 +-
 ...tiplexprogramchanneldestinationsettings.go |   4 +-
 ...-medialive-channel_networkinputsettings.go |   4 +-
 .../aws-medialive-channel_nielsencbet.go      |   4 +-
 ...-medialive-channel_nielsenconfiguration.go |   4 +-
 .../aws-medialive-channel_nielsennaesiinw.go  |   4 +-
 ...alive-channel_nielsenwatermarkssettings.go |   4 +-
 .../medialive/aws-medialive-channel_output.go |   4 +-
 ...aws-medialive-channel_outputdestination.go |   4 +-
 ...alive-channel_outputdestinationsettings.go |   4 +-
 .../aws-medialive-channel_outputgroup.go      |   4 +-
 ...s-medialive-channel_outputgroupsettings.go |   2 +-
 ...aws-medialive-channel_outputlocationref.go |   4 +-
 .../aws-medialive-channel_outputsettings.go   |   2 +-
 ...s-medialive-channel_passthroughsettings.go |   2 +-
 .../aws-medialive-channel_rawsettings.go      |   2 +-
 .../aws-medialive-channel_rec601settings.go   |   2 +-
 .../aws-medialive-channel_rec709settings.go   |   2 +-
 .../aws-medialive-channel_remixsettings.go    |   4 +-
 ...nnel_rtmpcaptioninfodestinationsettings.go |   2 +-
 ...aws-medialive-channel_rtmpgroupsettings.go |   4 +-
 ...ws-medialive-channel_rtmpoutputsettings.go |   4 +-
 ...l_scte20plusembeddeddestinationsettings.go |   2 +-
 ...-medialive-channel_scte20sourcesettings.go |   4 +-
 ...alive-channel_scte27destinationsettings.go |   2 +-
 ...-medialive-channel_scte27sourcesettings.go |   4 +-
 ...ws-medialive-channel_scte35spliceinsert.go |   4 +-
 ...-medialive-channel_scte35timesignalapos.go |   4 +-
 ...live-channel_smptettdestinationsettings.go |   2 +-
 ...s-medialive-channel_standardhlssettings.go |   4 +-
 ...aws-medialive-channel_statickeysettings.go |   4 +-
 ...ive-channel_teletextdestinationsettings.go |   2 +-
 ...edialive-channel_teletextsourcesettings.go |   4 +-
 ...edialive-channel_temporalfiltersettings.go |   4 +-
 .../aws-medialive-channel_timecodeconfig.go   |   4 +-
 ...dialive-channel_ttmldestinationsettings.go |   4 +-
 ...-medialive-channel_udpcontainersettings.go |   2 +-
 .../aws-medialive-channel_udpgroupsettings.go |   4 +-
 ...aws-medialive-channel_udpoutputsettings.go |   4 +-
 ...live-channel_videoblackfailoversettings.go |   4 +-
 ...ws-medialive-channel_videocodecsettings.go |   2 +-
 .../aws-medialive-channel_videodescription.go |   4 +-
 .../aws-medialive-channel_videoselector.go    |   4 +-
 ...channel_videoselectorcolorspacesettings.go |   2 +-
 .../aws-medialive-channel_videoselectorpid.go |   4 +-
 ...edialive-channel_videoselectorprogramid.go |   4 +-
 ...medialive-channel_videoselectorsettings.go |   2 +-
 ...aws-medialive-channel_vpcoutputsettings.go |   4 +-
 .../aws-medialive-channel_wavsettings.go      |   4 +-
 ...alive-channel_webvttdestinationsettings.go |   4 +-
 .../medialive/aws-medialive-input.go          |   4 +-
 ...medialive-input_inputdestinationrequest.go |   4 +-
 .../aws-medialive-input_inputdevicerequest.go |   4 +-
 ...aws-medialive-input_inputdevicesettings.go |   4 +-
 .../aws-medialive-input_inputsourcerequest.go |   4 +-
 .../aws-medialive-input_inputvpcrequest.go    |   4 +-
 ...medialive-input_mediaconnectflowrequest.go |   4 +-
 .../aws-medialive-inputsecuritygroup.go       |   2 +-
 ...putsecuritygroup_inputwhitelistrulecidr.go |   4 +-
 .../mediapackage/aws-mediapackage-asset.go    |   6 +-
 .../aws-mediapackage-asset_egressendpoint.go  |   4 +-
 .../mediapackage/aws-mediapackage-channel.go  |   6 +-
 .../aws-mediapackage-channel_hlsingest.go     |   2 +-
 ...aws-mediapackage-channel_ingestendpoint.go |   4 +-
 ...s-mediapackage-channel_logconfiguration.go |   4 +-
 .../aws-mediapackage-originendpoint.go        |   6 +-
 ...-mediapackage-originendpoint_adtriggers.go |   2 +-
 ...diapackage-originendpoint_authorization.go |   4 +-
 ...iapackage-originendpoint_cmafencryption.go |   4 +-
 ...mediapackage-originendpoint_cmafpackage.go |   4 +-
 ...iapackage-originendpoint_dashencryption.go |   4 +-
 ...mediapackage-originendpoint_dashpackage.go |   4 +-
 ...diapackage-originendpoint_hlsencryption.go |   4 +-
 ...mediapackage-originendpoint_hlsmanifest.go |   4 +-
 ...-mediapackage-originendpoint_hlspackage.go |   4 +-
 ...diapackage-originendpoint_mssencryption.go |   2 +-
 ...-mediapackage-originendpoint_msspackage.go |   4 +-
 ...package-originendpoint_spekekeyprovider.go |   4 +-
 ...apackage-originendpoint_streamselection.go |   4 +-
 ...aws-mediapackage-packagingconfiguration.go |   6 +-
 ...e-packagingconfiguration_cmafencryption.go |   2 +-
 ...kage-packagingconfiguration_cmafpackage.go |   4 +-
 ...e-packagingconfiguration_dashencryption.go |   2 +-
 ...age-packagingconfiguration_dashmanifest.go |   4 +-
 ...kage-packagingconfiguration_dashpackage.go |   4 +-
 ...ge-packagingconfiguration_hlsencryption.go |   4 +-
 ...kage-packagingconfiguration_hlsmanifest.go |   4 +-
 ...ckage-packagingconfiguration_hlspackage.go |   4 +-
 ...ge-packagingconfiguration_mssencryption.go |   2 +-
 ...kage-packagingconfiguration_mssmanifest.go |   4 +-
 ...ckage-packagingconfiguration_msspackage.go |   4 +-
 ...packagingconfiguration_spekekeyprovider.go |   4 +-
 ...-packagingconfiguration_streamselection.go |   4 +-
 .../aws-mediapackage-packaginggroup.go        |   6 +-
 ...diapackage-packaginggroup_authorization.go |   4 +-
 ...package-packaginggroup_logconfiguration.go |   4 +-
 .../mediastore/aws-mediastore-container.go    |   6 +-
 .../aws-mediastore-container_corsrule.go      |   4 +-
 .../aws-mediastore-container_metricpolicy.go  |   4 +-
 ...s-mediastore-container_metricpolicyrule.go |   4 +-
 .../memorydb/aws-memorydb-acl.go              |   6 +-
 .../memorydb/aws-memorydb-cluster.go          |   6 +-
 .../memorydb/aws-memorydb-cluster_endpoint.go |   4 +-
 .../memorydb/aws-memorydb-parametergroup.go   |   6 +-
 .../memorydb/aws-memorydb-subnetgroup.go      |   6 +-
 .../memorydb/aws-memorydb-user.go             |   6 +-
 .../cloudformation/msk/aws-msk-cluster.go     |   4 +-
 .../msk/aws-msk-cluster_brokerlogs.go         |   2 +-
 .../aws-msk-cluster_brokernodegroupinfo.go    |   4 +-
 .../aws-msk-cluster_clientauthentication.go   |   2 +-
 .../msk/aws-msk-cluster_cloudwatchlogs.go     |   4 +-
 .../msk/aws-msk-cluster_configurationinfo.go  |   4 +-
 .../msk/aws-msk-cluster_connectivityinfo.go   |   2 +-
 .../msk/aws-msk-cluster_ebsstorageinfo.go     |   4 +-
 .../msk/aws-msk-cluster_encryptionatrest.go   |   4 +-
 .../msk/aws-msk-cluster_encryptioninfo.go     |   2 +-
 .../aws-msk-cluster_encryptionintransit.go    |   4 +-
 .../msk/aws-msk-cluster_firehose.go           |   4 +-
 .../cloudformation/msk/aws-msk-cluster_iam.go |   4 +-
 .../msk/aws-msk-cluster_jmxexporter.go        |   4 +-
 .../msk/aws-msk-cluster_logginginfo.go        |   2 +-
 .../msk/aws-msk-cluster_nodeexporter.go       |   4 +-
 .../msk/aws-msk-cluster_openmonitoring.go     |   2 +-
 .../msk/aws-msk-cluster_prometheus.go         |   2 +-
 .../msk/aws-msk-cluster_publicaccess.go       |   4 +-
 .../cloudformation/msk/aws-msk-cluster_s3.go  |   4 +-
 .../msk/aws-msk-cluster_sasl.go               |   2 +-
 .../msk/aws-msk-cluster_scram.go              |   4 +-
 .../msk/aws-msk-cluster_storageinfo.go        |   2 +-
 .../cloudformation/msk/aws-msk-cluster_tls.go |   4 +-
 .../msk/aws-msk-cluster_unauthenticated.go    |   4 +-
 .../mwaa/aws-mwaa-environment.go              |   4 +-
 ...s-mwaa-environment_loggingconfiguration.go |   2 +-
 ...-environment_moduleloggingconfiguration.go |   4 +-
 ...s-mwaa-environment_networkconfiguration.go |   4 +-
 .../neptune/aws-neptune-dbcluster.go          |   6 +-
 .../aws-neptune-dbcluster_dbclusterrole.go    |   4 +-
 .../aws-neptune-dbclusterparametergroup.go    |   6 +-
 .../neptune/aws-neptune-dbinstance.go         |   6 +-
 .../neptune/aws-neptune-dbparametergroup.go   |   6 +-
 .../neptune/aws-neptune-dbsubnetgroup.go      |   6 +-
 .../aws-networkfirewall-firewall.go           |   6 +-
 ...-networkfirewall-firewall_subnetmapping.go |   4 +-
 .../aws-networkfirewall-firewallpolicy.go     |   6 +-
 ...irewall-firewallpolicy_actiondefinition.go |   2 +-
 ...orkfirewall-firewallpolicy_customaction.go |   4 +-
 ...etworkfirewall-firewallpolicy_dimension.go |   4 +-
 ...kfirewall-firewallpolicy_firewallpolicy.go |   4 +-
 ...wall-firewallpolicy_publishmetricaction.go |   2 +-
 ...ll-firewallpolicy_statefulengineoptions.go |   4 +-
 ...rewallpolicy_statefulrulegroupreference.go |   4 +-
 ...ewallpolicy_statelessrulegroupreference.go |   4 +-
 ...ws-networkfirewall-loggingconfiguration.go |   4 +-
 ...ggingconfiguration_logdestinationconfig.go |   4 +-
 ...ggingconfiguration_loggingconfiguration.go |   2 +-
 .../aws-networkfirewall-rulegroup.go          |   6 +-
 ...workfirewall-rulegroup_actiondefinition.go |   2 +-
 .../aws-networkfirewall-rulegroup_address.go  |   4 +-
 ...-networkfirewall-rulegroup_customaction.go |   4 +-
 ...aws-networkfirewall-rulegroup_dimension.go |   4 +-
 .../aws-networkfirewall-rulegroup_header.go   |   4 +-
 .../aws-networkfirewall-rulegroup_ipset.go    |   4 +-
 ...tworkfirewall-rulegroup_matchattributes.go |   4 +-
 ...aws-networkfirewall-rulegroup_portrange.go |   4 +-
 .../aws-networkfirewall-rulegroup_portset.go  |   4 +-
 ...kfirewall-rulegroup_publishmetricaction.go |   2 +-
 ...etworkfirewall-rulegroup_ruledefinition.go |   4 +-
 ...aws-networkfirewall-rulegroup_rulegroup.go |   2 +-
 ...ws-networkfirewall-rulegroup_ruleoption.go |   4 +-
 ...s-networkfirewall-rulegroup_rulessource.go |   4 +-
 ...tworkfirewall-rulegroup_rulessourcelist.go |   4 +-
 ...networkfirewall-rulegroup_rulevariables.go |   2 +-
 ...-networkfirewall-rulegroup_statefulrule.go |   4 +-
 ...kfirewall-rulegroup_statefulruleoptions.go |   4 +-
 ...networkfirewall-rulegroup_statelessrule.go |   4 +-
 ...ulegroup_statelessrulesandcustomactions.go |   2 +-
 ...-networkfirewall-rulegroup_tcpflagfield.go |   4 +-
 ...tworkmanager-customergatewayassociation.go |   4 +-
 .../aws-networkmanager-device.go              |   6 +-
 .../aws-networkmanager-device_location.go     |   4 +-
 .../aws-networkmanager-globalnetwork.go       |   6 +-
 .../networkmanager/aws-networkmanager-link.go |   6 +-
 .../aws-networkmanager-link_bandwidth.go      |   4 +-
 .../aws-networkmanager-linkassociation.go     |   4 +-
 .../networkmanager/aws-networkmanager-site.go |   6 +-
 .../aws-networkmanager-site_location.go       |   4 +-
 ...tworkmanager-transitgatewayregistration.go |   4 +-
 .../aws-nimblestudio-launchprofile.go         |   4 +-
 ...tudio-launchprofile_streamconfiguration.go |   4 +-
 .../aws-nimblestudio-streamingimage.go        |   4 +-
 .../nimblestudio/aws-nimblestudio-studio.go   |   4 +-
 ...io-studio_studioencryptionconfiguration.go |   4 +-
 .../aws-nimblestudio-studiocomponent.go       |   4 +-
 ...ponent_activedirectorycomputerattribute.go |   4 +-
 ...ocomponent_activedirectoryconfiguration.go |   4 +-
 ...tudiocomponent_computefarmconfiguration.go |   4 +-
 ...iocomponent_licenseserviceconfiguration.go |   4 +-
 ...studiocomponent_scriptparameterkeyvalue.go |   4 +-
 ...component_sharedfilesystemconfiguration.go |   4 +-
 ...ocomponent_studiocomponentconfiguration.go |   2 +-
 ...ent_studiocomponentinitializationscript.go |   4 +-
 .../aws-opensearchservice-domain.go           |   6 +-
 ...ice-domain_advancedsecurityoptionsinput.go |   4 +-
 ...-opensearchservice-domain_clusterconfig.go |   4 +-
 ...opensearchservice-domain_cognitooptions.go |   4 +-
 ...rchservice-domain_domainendpointoptions.go |   4 +-
 ...aws-opensearchservice-domain_ebsoptions.go |   4 +-
 ...hservice-domain_encryptionatrestoptions.go |   4 +-
 ...earchservice-domain_logpublishingoption.go |   4 +-
 ...nsearchservice-domain_masteruseroptions.go |   4 +-
 ...vice-domain_nodetonodeencryptionoptions.go |   4 +-
 ...pensearchservice-domain_snapshotoptions.go |   4 +-
 ...aws-opensearchservice-domain_vpcoptions.go |   4 +-
 ...earchservice-domain_zoneawarenessconfig.go |   4 +-
 .../opsworks/aws-opsworks-app.go              |   4 +-
 .../opsworks/aws-opsworks-app_datasource.go   |   4 +-
 .../aws-opsworks-app_environmentvariable.go   |   4 +-
 .../opsworks/aws-opsworks-app_source.go       |   4 +-
 .../aws-opsworks-app_sslconfiguration.go      |   4 +-
 ...-opsworks-elasticloadbalancerattachment.go |   4 +-
 .../opsworks/aws-opsworks-instance.go         |   4 +-
 ...ws-opsworks-instance_blockdevicemapping.go |   4 +-
 .../aws-opsworks-instance_ebsblockdevice.go   |   4 +-
 ...-opsworks-instance_timebasedautoscaling.go |   4 +-
 .../opsworks/aws-opsworks-layer.go            |   6 +-
 ...ws-opsworks-layer_autoscalingthresholds.go |   4 +-
 ...works-layer_lifecycleeventconfiguration.go |   2 +-
 ...aws-opsworks-layer_loadbasedautoscaling.go |   4 +-
 .../opsworks/aws-opsworks-layer_recipes.go    |   4 +-
 ...sworks-layer_shutdowneventconfiguration.go |   4 +-
 .../aws-opsworks-layer_volumeconfiguration.go |   4 +-
 .../opsworks/aws-opsworks-stack.go            |   6 +-
 .../aws-opsworks-stack_chefconfiguration.go   |   4 +-
 .../opsworks/aws-opsworks-stack_elasticip.go  |   4 +-
 .../aws-opsworks-stack_rdsdbinstance.go       |   4 +-
 .../opsworks/aws-opsworks-stack_source.go     |   4 +-
 ...psworks-stack_stackconfigurationmanager.go |   4 +-
 .../opsworks/aws-opsworks-userprofile.go      |   4 +-
 .../opsworks/aws-opsworks-volume.go           |   4 +-
 .../opsworkscm/aws-opsworkscm-server.go       |   6 +-
 .../aws-opsworkscm-server_engineattribute.go  |   4 +-
 .../aws-panorama-applicationinstance.go       |   6 +-
 ...cationinstance_manifestoverridespayload.go |   4 +-
 ...ama-applicationinstance_manifestpayload.go |   4 +-
 .../panorama/aws-panorama-package.go          |   6 +-
 .../panorama/aws-panorama-packageversion.go   |   4 +-
 .../pinpoint/aws-pinpoint-admchannel.go       |   4 +-
 .../pinpoint/aws-pinpoint-apnschannel.go      |   4 +-
 .../aws-pinpoint-apnssandboxchannel.go        |   4 +-
 .../pinpoint/aws-pinpoint-apnsvoipchannel.go  |   4 +-
 .../aws-pinpoint-apnsvoipsandboxchannel.go    |   4 +-
 .../pinpoint/aws-pinpoint-app.go              |   4 +-
 .../aws-pinpoint-applicationsettings.go       |   4 +-
 ...npoint-applicationsettings_campaignhook.go |   4 +-
 ...aws-pinpoint-applicationsettings_limits.go |   4 +-
 ...-pinpoint-applicationsettings_quiettime.go |   4 +-
 .../pinpoint/aws-pinpoint-baiduchannel.go     |   4 +-
 .../pinpoint/aws-pinpoint-campaign.go         |   4 +-
 ...ws-pinpoint-campaign_attributedimension.go |   4 +-
 ...-pinpoint-campaign_campaignemailmessage.go |   4 +-
 ...s-pinpoint-campaign_campaigneventfilter.go |   4 +-
 .../aws-pinpoint-campaign_campaignhook.go     |   4 +-
 ...-pinpoint-campaign_campaigninappmessage.go |   4 +-
 ...ws-pinpoint-campaign_campaignsmsmessage.go |   4 +-
 ...int-campaign_defaultbuttonconfiguration.go |   4 +-
 .../aws-pinpoint-campaign_eventdimensions.go  |   2 +-
 ...inpoint-campaign_inappmessagebodyconfig.go |   4 +-
 ...ws-pinpoint-campaign_inappmessagebutton.go |   2 +-
 ...s-pinpoint-campaign_inappmessagecontent.go |   4 +-
 ...point-campaign_inappmessageheaderconfig.go |   4 +-
 .../pinpoint/aws-pinpoint-campaign_limits.go  |   4 +-
 .../pinpoint/aws-pinpoint-campaign_message.go |   4 +-
 ...-pinpoint-campaign_messageconfiguration.go |   2 +-
 .../aws-pinpoint-campaign_metricdimension.go  |   4 +-
 ...nt-campaign_overridebuttonconfiguration.go |   4 +-
 .../aws-pinpoint-campaign_quiettime.go        |   4 +-
 .../aws-pinpoint-campaign_schedule.go         |   4 +-
 .../aws-pinpoint-campaign_setdimension.go     |   4 +-
 ...inpoint-campaign_writetreatmentresource.go |   4 +-
 .../pinpoint/aws-pinpoint-emailchannel.go     |   4 +-
 .../pinpoint/aws-pinpoint-emailtemplate.go    |   4 +-
 .../pinpoint/aws-pinpoint-eventstream.go      |   4 +-
 .../pinpoint/aws-pinpoint-gcmchannel.go       |   4 +-
 .../pinpoint/aws-pinpoint-inapptemplate.go    |   4 +-
 .../aws-pinpoint-inapptemplate_bodyconfig.go  |   4 +-
 ...aws-pinpoint-inapptemplate_buttonconfig.go |   2 +-
 ...napptemplate_defaultbuttonconfiguration.go |   4 +-
 ...aws-pinpoint-inapptemplate_headerconfig.go |   4 +-
 ...point-inapptemplate_inappmessagecontent.go |   4 +-
 ...apptemplate_overridebuttonconfiguration.go |   4 +-
 .../pinpoint/aws-pinpoint-pushtemplate.go     |   4 +-
 ...emplate_androidpushnotificationtemplate.go |   4 +-
 ...shtemplate_apnspushnotificationtemplate.go |   4 +-
 ...emplate_defaultpushnotificationtemplate.go |   4 +-
 .../pinpoint/aws-pinpoint-segment.go          |   4 +-
 ...aws-pinpoint-segment_attributedimension.go |   4 +-
 .../pinpoint/aws-pinpoint-segment_behavior.go |   2 +-
 .../aws-pinpoint-segment_coordinates.go       |   4 +-
 .../aws-pinpoint-segment_demographic.go       |   2 +-
 .../pinpoint/aws-pinpoint-segment_gpspoint.go |   4 +-
 .../pinpoint/aws-pinpoint-segment_groups.go   |   4 +-
 .../pinpoint/aws-pinpoint-segment_location.go |   2 +-
 .../pinpoint/aws-pinpoint-segment_recency.go  |   4 +-
 .../aws-pinpoint-segment_segmentdimensions.go |   2 +-
 .../aws-pinpoint-segment_segmentgroups.go     |   4 +-
 .../aws-pinpoint-segment_setdimension.go      |   4 +-
 .../aws-pinpoint-segment_sourcesegments.go    |   4 +-
 .../pinpoint/aws-pinpoint-smschannel.go       |   4 +-
 .../pinpoint/aws-pinpoint-smstemplate.go      |   4 +-
 .../pinpoint/aws-pinpoint-voicechannel.go     |   4 +-
 .../aws-pinpointemail-configurationset.go     |   4 +-
 ...temail-configurationset_deliveryoptions.go |   4 +-
 ...mail-configurationset_reputationoptions.go |   4 +-
 ...ntemail-configurationset_sendingoptions.go |   4 +-
 ...aws-pinpointemail-configurationset_tags.go |   4 +-
 ...temail-configurationset_trackingoptions.go |   4 +-
 ...temail-configurationseteventdestination.go |   4 +-
 ...teventdestination_cloudwatchdestination.go |   2 +-
 ...eventdestination_dimensionconfiguration.go |   4 +-
 ...ionseteventdestination_eventdestination.go |   4 +-
 ...tdestination_kinesisfirehosedestination.go |   4 +-
 ...seteventdestination_pinpointdestination.go |   4 +-
 ...ationseteventdestination_snsdestination.go |   4 +-
 .../aws-pinpointemail-dedicatedippool.go      |   4 +-
 .../aws-pinpointemail-dedicatedippool_tags.go |   4 +-
 .../aws-pinpointemail-identity.go             |   4 +-
 ...npointemail-identity_mailfromattributes.go |   4 +-
 .../aws-pinpointemail-identity_tags.go        |   4 +-
 .../cloudformation/policies/policies.go       |   2 +-
 .../cloudformation/policies_test.go           |   8 +-
 .../cloudformation/qldb/aws-qldb-ledger.go    |   6 +-
 .../cloudformation/qldb/aws-qldb-stream.go    |   6 +-
 .../aws-qldb-stream_kinesisconfiguration.go   |   4 +-
 .../quicksight/aws-quicksight-analysis.go     |   6 +-
 .../aws-quicksight-analysis_analysiserror.go  |   4 +-
 ...uicksight-analysis_analysissourceentity.go |   2 +-
 ...cksight-analysis_analysissourcetemplate.go |   4 +-
 ...ws-quicksight-analysis_datasetreference.go |   4 +-
 ...s-quicksight-analysis_datetimeparameter.go |   4 +-
 ...ws-quicksight-analysis_decimalparameter.go |   4 +-
 ...ws-quicksight-analysis_integerparameter.go |   4 +-
 .../aws-quicksight-analysis_parameters.go     |   2 +-
 ...-quicksight-analysis_resourcepermission.go |   4 +-
 .../aws-quicksight-analysis_sheet.go          |   4 +-
 ...aws-quicksight-analysis_stringparameter.go |   4 +-
 .../quicksight/aws-quicksight-dashboard.go    |   6 +-
 ...icksight-dashboard_adhocfilteringoption.go |   4 +-
 ...sight-dashboard_dashboardpublishoptions.go |   2 +-
 ...cksight-dashboard_dashboardsourceentity.go |   2 +-
 ...sight-dashboard_dashboardsourcetemplate.go |   4 +-
 ...s-quicksight-dashboard_datasetreference.go |   4 +-
 ...-quicksight-dashboard_datetimeparameter.go |   4 +-
 ...s-quicksight-dashboard_decimalparameter.go |   4 +-
 ...-quicksight-dashboard_exporttocsvoption.go |   4 +-
 ...s-quicksight-dashboard_integerparameter.go |   4 +-
 .../aws-quicksight-dashboard_parameters.go    |   2 +-
 ...quicksight-dashboard_resourcepermission.go |   4 +-
 ...uicksight-dashboard_sheetcontrolsoption.go |   4 +-
 ...ws-quicksight-dashboard_stringparameter.go |   4 +-
 .../quicksight/aws-quicksight-dataset.go      |   6 +-
 ...aws-quicksight-dataset_calculatedcolumn.go |   4 +-
 ...cksight-dataset_castcolumntypeoperation.go |   4 +-
 ...ws-quicksight-dataset_columndescription.go |   4 +-
 .../aws-quicksight-dataset_columngroup.go     |   2 +-
 ...sight-dataset_columnlevelpermissionrule.go |   4 +-
 .../aws-quicksight-dataset_columntag.go       |   4 +-
 ...icksight-dataset_createcolumnsoperation.go |   2 +-
 .../aws-quicksight-dataset_customsql.go       |   4 +-
 .../aws-quicksight-dataset_fieldfolder.go     |   4 +-
 .../aws-quicksight-dataset_filteroperation.go |   4 +-
 ...uicksight-dataset_geospatialcolumngroup.go |   4 +-
 ...-quicksight-dataset_ingestionwaitpolicy.go |   4 +-
 .../aws-quicksight-dataset_inputcolumn.go     |   4 +-
 .../aws-quicksight-dataset_joininstruction.go |   4 +-
 ...ws-quicksight-dataset_joinkeyproperties.go |   4 +-
 .../aws-quicksight-dataset_logicaltable.go    |   4 +-
 ...s-quicksight-dataset_logicaltablesource.go |   4 +-
 .../aws-quicksight-dataset_outputcolumn.go    |   4 +-
 .../aws-quicksight-dataset_physicaltable.go   |   2 +-
 ...aws-quicksight-dataset_projectoperation.go |   4 +-
 .../aws-quicksight-dataset_relationaltable.go |   4 +-
 ...uicksight-dataset_renamecolumnoperation.go |   4 +-
 ...s-quicksight-dataset_resourcepermission.go |   4 +-
 ...sight-dataset_rowlevelpermissiondataset.go |   4 +-
 .../aws-quicksight-dataset_s3source.go        |   4 +-
 ...s-quicksight-dataset_tagcolumnoperation.go |   4 +-
 ...s-quicksight-dataset_transformoperation.go |   2 +-
 .../aws-quicksight-dataset_uploadsettings.go  |   4 +-
 .../quicksight/aws-quicksight-datasource.go   |   6 +-
 ...atasource_amazonelasticsearchparameters.go |   4 +-
 ...t-datasource_amazonopensearchparameters.go |   4 +-
 ...-quicksight-datasource_athenaparameters.go |   4 +-
 ...-quicksight-datasource_auroraparameters.go |   4 +-
 ...t-datasource_aurorapostgresqlparameters.go |   4 +-
 ...ws-quicksight-datasource_credentialpair.go |   4 +-
 ...ksight-datasource_datasourcecredentials.go |   4 +-
 ...icksight-datasource_datasourceerrorinfo.go |   4 +-
 ...cksight-datasource_datasourceparameters.go |   2 +-
 ...cksight-datasource_manifestfilelocation.go |   4 +-
 ...quicksight-datasource_mariadbparameters.go |   4 +-
 ...s-quicksight-datasource_mysqlparameters.go |   4 +-
 ...-quicksight-datasource_oracleparameters.go |   4 +-
 ...cksight-datasource_postgresqlparameters.go |   4 +-
 ...-quicksight-datasource_prestoparameters.go |   4 +-
 ...aws-quicksight-datasource_rdsparameters.go |   4 +-
 ...uicksight-datasource_redshiftparameters.go |   4 +-
 ...uicksight-datasource_resourcepermission.go |   4 +-
 .../aws-quicksight-datasource_s3parameters.go |   2 +-
 ...icksight-datasource_snowflakeparameters.go |   4 +-
 ...s-quicksight-datasource_sparkparameters.go |   4 +-
 ...icksight-datasource_sqlserverparameters.go |   4 +-
 ...aws-quicksight-datasource_sslproperties.go |   4 +-
 ...uicksight-datasource_teradataparameters.go |   4 +-
 ...ight-datasource_vpcconnectionproperties.go |   4 +-
 .../quicksight/aws-quicksight-template.go     |   6 +-
 ...ws-quicksight-template_datasetreference.go |   4 +-
 ...-quicksight-template_resourcepermission.go |   4 +-
 ...cksight-template_templatesourceanalysis.go |   4 +-
 ...uicksight-template_templatesourceentity.go |   2 +-
 ...cksight-template_templatesourcetemplate.go |   4 +-
 .../quicksight/aws-quicksight-theme.go        |   6 +-
 .../aws-quicksight-theme_borderstyle.go       |   4 +-
 .../aws-quicksight-theme_datacolorpalette.go  |   4 +-
 .../quicksight/aws-quicksight-theme_font.go   |   4 +-
 .../aws-quicksight-theme_gutterstyle.go       |   4 +-
 .../aws-quicksight-theme_marginstyle.go       |   4 +-
 ...aws-quicksight-theme_resourcepermission.go |   4 +-
 .../aws-quicksight-theme_sheetstyle.go        |   2 +-
 ...aws-quicksight-theme_themeconfiguration.go |   2 +-
 .../aws-quicksight-theme_tilelayoutstyle.go   |   2 +-
 .../aws-quicksight-theme_tilestyle.go         |   2 +-
 .../aws-quicksight-theme_typography.go        |   2 +-
 .../aws-quicksight-theme_uicolorpalette.go    |   4 +-
 .../ram/aws-ram-resourceshare.go              |   6 +-
 .../cloudformation/rds/aws-rds-dbcluster.go   |   6 +-
 .../rds/aws-rds-dbcluster_dbclusterrole.go    |   4 +-
 .../aws-rds-dbcluster_scalingconfiguration.go |   4 +-
 .../rds/aws-rds-dbclusterparametergroup.go    |   6 +-
 .../cloudformation/rds/aws-rds-dbinstance.go  |   6 +-
 .../rds/aws-rds-dbinstance_dbinstancerole.go  |   4 +-
 .../aws-rds-dbinstance_processorfeature.go    |   4 +-
 .../rds/aws-rds-dbparametergroup.go           |   6 +-
 .../cloudformation/rds/aws-rds-dbproxy.go     |   4 +-
 .../rds/aws-rds-dbproxy_authformat.go         |   4 +-
 .../rds/aws-rds-dbproxy_tagformat.go          |   4 +-
 .../rds/aws-rds-dbproxyendpoint.go            |   4 +-
 .../rds/aws-rds-dbproxyendpoint_tagformat.go  |   4 +-
 .../rds/aws-rds-dbproxytargetgroup.go         |   4 +-
 ...p_connectionpoolconfigurationinfoformat.go |   4 +-
 .../rds/aws-rds-dbsecuritygroup.go            |   6 +-
 .../rds/aws-rds-dbsecuritygroup_ingress.go    |   4 +-
 .../rds/aws-rds-dbsecuritygroupingress.go     |   4 +-
 .../rds/aws-rds-dbsubnetgroup.go              |   6 +-
 .../rds/aws-rds-eventsubscription.go          |   4 +-
 .../rds/aws-rds-globalcluster.go              |   4 +-
 .../cloudformation/rds/aws-rds-optiongroup.go |   6 +-
 ...aws-rds-optiongroup_optionconfiguration.go |   4 +-
 .../rds/aws-rds-optiongroup_optionsetting.go  |   4 +-
 .../redshift/aws-redshift-cluster.go          |   6 +-
 .../redshift/aws-redshift-cluster_endpoint.go |   4 +-
 .../aws-redshift-cluster_loggingproperties.go |   4 +-
 .../aws-redshift-clusterparametergroup.go     |   6 +-
 ...edshift-clusterparametergroup_parameter.go |   4 +-
 .../aws-redshift-clustersecuritygroup.go      |   6 +-
 ...ws-redshift-clustersecuritygroupingress.go |   4 +-
 .../aws-redshift-clustersubnetgroup.go        |   6 +-
 .../redshift/aws-redshift-endpointaccess.go   |   4 +-
 ...edshift-endpointaccess_vpcsecuritygroup.go |   4 +-
 .../aws-redshift-endpointauthorization.go     |   4 +-
 .../aws-redshift-eventsubscription.go         |   6 +-
 .../redshift/aws-redshift-scheduledaction.go  |   4 +-
 ...ift-scheduledaction_pauseclustermessage.go |   4 +-
 ...ft-scheduledaction_resizeclustermessage.go |   4 +-
 ...ft-scheduledaction_resumeclustermessage.go |   4 +-
 ...ift-scheduledaction_scheduledactiontype.go |   2 +-
 .../aws-refactorspaces-application.go         |   6 +-
 ...spaces-application_apigatewayproxyinput.go |   4 +-
 .../aws-refactorspaces-environment.go         |   6 +-
 .../aws-refactorspaces-route.go               |   6 +-
 ...-refactorspaces-route_uripathrouteinput.go |   4 +-
 .../aws-refactorspaces-service.go             |   6 +-
 ...actorspaces-service_lambdaendpointinput.go |   4 +-
 ...refactorspaces-service_urlendpointinput.go |   4 +-
 .../rekognition/aws-rekognition-project.go    |   4 +-
 .../resiliencehub/aws-resiliencehub-app.go    |   4 +-
 ...ws-resiliencehub-app_physicalresourceid.go |   4 +-
 .../aws-resiliencehub-app_resourcemapping.go  |   4 +-
 .../aws-resiliencehub-resiliencypolicy.go     |   4 +-
 ...iencehub-resiliencypolicy_failurepolicy.go |   4 +-
 .../aws-resourcegroups-group.go               |   6 +-
 ...-resourcegroups-group_configurationitem.go |   4 +-
 ...urcegroups-group_configurationparameter.go |   4 +-
 .../aws-resourcegroups-group_query.go         |   4 +-
 .../aws-resourcegroups-group_resourcequery.go |   4 +-
 .../aws-resourcegroups-group_tagfilter.go     |   4 +-
 .../robomaker/aws-robomaker-fleet.go          |   4 +-
 .../robomaker/aws-robomaker-robot.go          |   4 +-
 .../aws-robomaker-robotapplication.go         |   4 +-
 ...ker-robotapplication_robotsoftwaresuite.go |   4 +-
 ...robomaker-robotapplication_sourceconfig.go |   4 +-
 .../aws-robomaker-robotapplicationversion.go  |   4 +-
 .../aws-robomaker-simulationapplication.go    |   4 +-
 ...r-simulationapplication_renderingengine.go |   4 +-
 ...imulationapplication_robotsoftwaresuite.go |   4 +-
 ...tionapplication_simulationsoftwaresuite.go |   4 +-
 ...aker-simulationapplication_sourceconfig.go |   4 +-
 ...-robomaker-simulationapplicationversion.go |   4 +-
 .../rolesanywhere/aws-rolesanywhere-crl.go    |   4 +-
 .../aws-rolesanywhere-profile.go              |   6 +-
 .../aws-rolesanywhere-trustanchor.go          |   6 +-
 ...nywhere-trustanchor_notificationsetting.go |   2 +-
 .../aws-rolesanywhere-trustanchor_source.go   |   2 +-
 ...ws-rolesanywhere-trustanchor_sourcedata.go |   2 +-
 .../route53/aws-route53-dnssec.go             |   4 +-
 .../route53/aws-route53-healthcheck.go        |   2 +-
 ...aws-route53-healthcheck_alarmidentifier.go |   4 +-
 ...s-route53-healthcheck_healthcheckconfig.go |   4 +-
 .../aws-route53-healthcheck_healthchecktag.go |   4 +-
 .../route53/aws-route53-hostedzone.go         |   4 +-
 ...aws-route53-hostedzone_hostedzoneconfig.go |   4 +-
 .../aws-route53-hostedzone_hostedzonetag.go   |   4 +-
 ...s-route53-hostedzone_queryloggingconfig.go |   4 +-
 .../route53/aws-route53-hostedzone_vpc.go     |   4 +-
 .../route53/aws-route53-keysigningkey.go      |   4 +-
 .../route53/aws-route53-recordset.go          |   4 +-
 .../aws-route53-recordset_aliastarget.go      |   4 +-
 .../aws-route53-recordset_geolocation.go      |   4 +-
 .../route53/aws-route53-recordsetgroup.go     |   4 +-
 .../aws-route53-recordsetgroup_aliastarget.go |   4 +-
 .../aws-route53-recordsetgroup_geolocation.go |   4 +-
 .../aws-route53-recordsetgroup_recordset.go   |   4 +-
 .../aws-route53recoverycontrol-cluster.go     |   6 +-
 ...recoverycontrol-cluster_clusterendpoint.go |   4 +-
 ...aws-route53recoverycontrol-controlpanel.go |   6 +-
 ...s-route53recoverycontrol-routingcontrol.go |   4 +-
 .../aws-route53recoverycontrol-safetyrule.go  |   6 +-
 ...ecoverycontrol-safetyrule_assertionrule.go |   4 +-
 ...53recoverycontrol-safetyrule_gatingrule.go |   4 +-
 ...53recoverycontrol-safetyrule_ruleconfig.go |   4 +-
 .../aws-route53recoveryreadiness-cell.go      |   6 +-
 ...route53recoveryreadiness-readinesscheck.go |   6 +-
 ...-route53recoveryreadiness-recoverygroup.go |   6 +-
 ...ws-route53recoveryreadiness-resourceset.go |   6 +-
 ...readiness-resourceset_dnstargetresource.go |   4 +-
 ...coveryreadiness-resourceset_nlbresource.go |   4 +-
 ...readiness-resourceset_r53resourcerecord.go |   4 +-
 ...3recoveryreadiness-resourceset_resource.go |   4 +-
 ...eryreadiness-resourceset_targetresource.go |   2 +-
 .../aws-route53resolver-firewalldomainlist.go |   6 +-
 .../aws-route53resolver-firewallrulegroup.go  |   6 +-
 ...resolver-firewallrulegroup_firewallrule.go |   4 +-
 ...53resolver-firewallrulegroupassociation.go |   6 +-
 .../aws-route53resolver-resolverconfig.go     |   4 +-
 ...ws-route53resolver-resolverdnssecconfig.go |   4 +-
 .../aws-route53resolver-resolverendpoint.go   |   6 +-
 ...olver-resolverendpoint_ipaddressrequest.go |   4 +-
 ...te53resolver-resolverqueryloggingconfig.go |   4 +-
 ...r-resolverqueryloggingconfigassociation.go |   4 +-
 .../aws-route53resolver-resolverrule.go       |   6 +-
 ...te53resolver-resolverrule_targetaddress.go |   4 +-
 ...route53resolver-resolverruleassociation.go |   4 +-
 .../cloudformation/rum/aws-rum-appmonitor.go  |   6 +-
 ...-rum-appmonitor_appmonitorconfiguration.go |   4 +-
 .../cloudformation/s3/aws-s3-accesspoint.go   |   4 +-
 ...esspoint_publicaccessblockconfiguration.go |   4 +-
 .../s3/aws-s3-accesspoint_vpcconfiguration.go |   4 +-
 .../cloudformation/s3/aws-s3-bucket.go        |   6 +-
 ...3-bucket_abortincompletemultipartupload.go |   4 +-
 .../aws-s3-bucket_accelerateconfiguration.go  |   4 +-
 .../aws-s3-bucket_accesscontroltranslation.go |   4 +-
 .../aws-s3-bucket_analyticsconfiguration.go   |   4 +-
 .../s3/aws-s3-bucket_bucketencryption.go      |   2 +-
 .../s3/aws-s3-bucket_corsconfiguration.go     |   2 +-
 .../s3/aws-s3-bucket_corsrule.go              |   4 +-
 .../s3/aws-s3-bucket_dataexport.go            |   4 +-
 .../s3/aws-s3-bucket_defaultretention.go      |   4 +-
 .../aws-s3-bucket_deletemarkerreplication.go  |   4 +-
 .../s3/aws-s3-bucket_destination.go           |   4 +-
 .../aws-s3-bucket_encryptionconfiguration.go  |   4 +-
 .../aws-s3-bucket_eventbridgeconfiguration.go |   4 +-
 .../s3/aws-s3-bucket_filterrule.go            |   4 +-
 ...-bucket_intelligenttieringconfiguration.go |   4 +-
 .../aws-s3-bucket_inventoryconfiguration.go   |   4 +-
 .../s3/aws-s3-bucket_lambdaconfiguration.go   |   4 +-
 .../aws-s3-bucket_lifecycleconfiguration.go   |   2 +-
 .../s3/aws-s3-bucket_loggingconfiguration.go  |   4 +-
 .../s3/aws-s3-bucket_metrics.go               |   4 +-
 .../s3/aws-s3-bucket_metricsconfiguration.go  |   4 +-
 ...s-s3-bucket_noncurrentversionexpiration.go |   4 +-
 ...s-s3-bucket_noncurrentversiontransition.go |   4 +-
 ...aws-s3-bucket_notificationconfiguration.go |   2 +-
 .../s3/aws-s3-bucket_notificationfilter.go    |   2 +-
 .../aws-s3-bucket_objectlockconfiguration.go  |   4 +-
 .../s3/aws-s3-bucket_objectlockrule.go        |   2 +-
 .../s3/aws-s3-bucket_ownershipcontrols.go     |   2 +-
 .../s3/aws-s3-bucket_ownershipcontrolsrule.go |   4 +-
 ...3-bucket_publicaccessblockconfiguration.go |   4 +-
 .../s3/aws-s3-bucket_queueconfiguration.go    |   4 +-
 .../s3/aws-s3-bucket_redirectallrequeststo.go |   4 +-
 .../s3/aws-s3-bucket_redirectrule.go          |   4 +-
 .../s3/aws-s3-bucket_replicamodifications.go  |   4 +-
 .../aws-s3-bucket_replicationconfiguration.go |   4 +-
 .../aws-s3-bucket_replicationdestination.go   |   4 +-
 .../s3/aws-s3-bucket_replicationrule.go       |   4 +-
 ...ws-s3-bucket_replicationruleandoperator.go |   4 +-
 .../s3/aws-s3-bucket_replicationrulefilter.go |   4 +-
 .../s3/aws-s3-bucket_replicationtime.go       |   4 +-
 .../s3/aws-s3-bucket_replicationtimevalue.go  |   4 +-
 .../s3/aws-s3-bucket_routingrule.go           |   2 +-
 .../s3/aws-s3-bucket_routingrulecondition.go  |   4 +-
 .../cloudformation/s3/aws-s3-bucket_rule.go   |   4 +-
 .../s3/aws-s3-bucket_s3keyfilter.go           |   2 +-
 ...s3-bucket_serversideencryptionbydefault.go |   4 +-
 .../aws-s3-bucket_serversideencryptionrule.go |   4 +-
 .../aws-s3-bucket_sourceselectioncriteria.go  |   2 +-
 .../aws-s3-bucket_ssekmsencryptedobjects.go   |   4 +-
 .../s3/aws-s3-bucket_storageclassanalysis.go  |   2 +-
 .../s3/aws-s3-bucket_tagfilter.go             |   4 +-
 .../s3/aws-s3-bucket_tiering.go               |   4 +-
 .../s3/aws-s3-bucket_topicconfiguration.go    |   4 +-
 .../s3/aws-s3-bucket_transition.go            |   4 +-
 .../aws-s3-bucket_versioningconfiguration.go  |   4 +-
 .../s3/aws-s3-bucket_websiteconfiguration.go  |   4 +-
 .../cloudformation/s3/aws-s3-bucketpolicy.go  |   4 +-
 .../s3/aws-s3-multiregionaccesspoint.go       |   4 +-
 ...esspoint_publicaccessblockconfiguration.go |   4 +-
 .../aws-s3-multiregionaccesspoint_region.go   |   4 +-
 .../s3/aws-s3-multiregionaccesspointpolicy.go |   4 +-
 .../cloudformation/s3/aws-s3-storagelens.go   |   4 +-
 .../s3/aws-s3-storagelens_accountlevel.go     |   2 +-
 .../s3/aws-s3-storagelens_activitymetrics.go  |   4 +-
 .../s3/aws-s3-storagelens_awsorg.go           |   4 +-
 .../s3/aws-s3-storagelens_bucketlevel.go      |   2 +-
 .../aws-s3-storagelens_bucketsandregions.go   |   4 +-
 .../aws-s3-storagelens_cloudwatchmetrics.go   |   4 +-
 .../s3/aws-s3-storagelens_dataexport.go       |   2 +-
 .../s3/aws-s3-storagelens_encryption.go       |   2 +-
 .../s3/aws-s3-storagelens_prefixlevel.go      |   2 +-
 ...3-storagelens_prefixlevelstoragemetrics.go |   4 +-
 .../aws-s3-storagelens_s3bucketdestination.go |   4 +-
 .../aws-s3-storagelens_selectioncriteria.go   |   4 +-
 ...s3-storagelens_storagelensconfiguration.go |   4 +-
 .../aws-s3objectlambda-accesspoint.go         |   4 +-
 ...a-accesspoint_objectlambdaconfiguration.go |   4 +-
 ...accesspoint_transformationconfiguration.go |   4 +-
 .../aws-s3objectlambda-accesspointpolicy.go   |   4 +-
 .../s3outposts/aws-s3outposts-accesspoint.go  |   4 +-
 ...s3outposts-accesspoint_vpcconfiguration.go |   4 +-
 .../s3outposts/aws-s3outposts-bucket.go       |   6 +-
 ...s-bucket_abortincompletemultipartupload.go |   4 +-
 ...3outposts-bucket_lifecycleconfiguration.go |   2 +-
 .../s3outposts/aws-s3outposts-bucket_rule.go  |   4 +-
 .../s3outposts/aws-s3outposts-bucketpolicy.go |   4 +-
 .../s3outposts/aws-s3outposts-endpoint.go     |   4 +-
 ...ws-s3outposts-endpoint_networkinterface.go |   4 +-
 .../sagemaker/aws-sagemaker-app.go            |   6 +-
 .../aws-sagemaker-app_resourcespec.go         |   4 +-
 .../sagemaker/aws-sagemaker-appimageconfig.go |   6 +-
 ...gemaker-appimageconfig_filesystemconfig.go |   4 +-
 ...appimageconfig_kernelgatewayimageconfig.go |   2 +-
 ...aws-sagemaker-appimageconfig_kernelspec.go |   4 +-
 .../sagemaker/aws-sagemaker-coderepository.go |   6 +-
 .../aws-sagemaker-coderepository_gitconfig.go |   4 +-
 .../aws-sagemaker-dataqualityjobdefinition.go |   6 +-
 ...-dataqualityjobdefinition_clusterconfig.go |   4 +-
 ...ualityjobdefinition_constraintsresource.go |   4 +-
 ...bdefinition_dataqualityappspecification.go |   4 +-
 ...jobdefinition_dataqualitybaselineconfig.go |   4 +-
 ...ualityjobdefinition_dataqualityjobinput.go |   2 +-
 ...-dataqualityjobdefinition_endpointinput.go |   4 +-
 ...taqualityjobdefinition_monitoringoutput.go |   2 +-
 ...ityjobdefinition_monitoringoutputconfig.go |   4 +-
 ...ualityjobdefinition_monitoringresources.go |   2 +-
 ...-dataqualityjobdefinition_networkconfig.go |   4 +-
 ...maker-dataqualityjobdefinition_s3output.go |   4 +-
 ...qualityjobdefinition_statisticsresource.go |   4 +-
 ...aqualityjobdefinition_stoppingcondition.go |   4 +-
 ...aker-dataqualityjobdefinition_vpcconfig.go |   4 +-
 .../sagemaker/aws-sagemaker-device.go         |   6 +-
 .../sagemaker/aws-sagemaker-device_device.go  |   4 +-
 .../sagemaker/aws-sagemaker-devicefleet.go    |   6 +-
 ...-sagemaker-devicefleet_edgeoutputconfig.go |   4 +-
 .../sagemaker/aws-sagemaker-domain.go         |   6 +-
 .../aws-sagemaker-domain_customimage.go       |   4 +-
 ...gemaker-domain_jupyterserverappsettings.go |   2 +-
 ...gemaker-domain_kernelgatewayappsettings.go |   2 +-
 .../aws-sagemaker-domain_resourcespec.go      |   4 +-
 .../aws-sagemaker-domain_sharingsettings.go   |   4 +-
 .../aws-sagemaker-domain_usersettings.go      |   4 +-
 .../sagemaker/aws-sagemaker-endpoint.go       |   6 +-
 .../sagemaker/aws-sagemaker-endpoint_alarm.go |   4 +-
 ...s-sagemaker-endpoint_autorollbackconfig.go |   2 +-
 ...agemaker-endpoint_bluegreenupdatepolicy.go |   4 +-
 .../aws-sagemaker-endpoint_capacitysize.go    |   4 +-
 ...aws-sagemaker-endpoint_deploymentconfig.go |   2 +-
 ...sagemaker-endpoint_trafficroutingconfig.go |   4 +-
 .../aws-sagemaker-endpoint_variantproperty.go |   4 +-
 .../sagemaker/aws-sagemaker-endpointconfig.go |   6 +-
 ...dpointconfig_asyncinferenceclientconfig.go |   4 +-
 ...ker-endpointconfig_asyncinferenceconfig.go |   2 +-
 ...config_asyncinferencenotificationconfig.go |   4 +-
 ...dpointconfig_asyncinferenceoutputconfig.go |   4 +-
 ...endpointconfig_capturecontenttypeheader.go |   4 +-
 ...-sagemaker-endpointconfig_captureoption.go |   4 +-
 ...emaker-endpointconfig_datacaptureconfig.go |   4 +-
 ...emaker-endpointconfig_productionvariant.go |   4 +-
 ...gemaker-endpointconfig_serverlessconfig.go |   4 +-
 .../sagemaker/aws-sagemaker-featuregroup.go   |   6 +-
 ...agemaker-featuregroup_featuredefinition.go |   4 +-
 .../sagemaker/aws-sagemaker-image.go          |   6 +-
 .../sagemaker/aws-sagemaker-imageversion.go   |   4 +-
 .../sagemaker/aws-sagemaker-model.go          |   6 +-
 ...aws-sagemaker-model_containerdefinition.go |   4 +-
 .../aws-sagemaker-model_imageconfig.go        |   4 +-
 ...agemaker-model_inferenceexecutionconfig.go |   4 +-
 .../aws-sagemaker-model_multimodelconfig.go   |   4 +-
 ...ws-sagemaker-model_repositoryauthconfig.go |   4 +-
 .../aws-sagemaker-model_vpcconfig.go          |   4 +-
 .../aws-sagemaker-modelbiasjobdefinition.go   |   6 +-
 ...er-modelbiasjobdefinition_clusterconfig.go |   4 +-
 ...elbiasjobdefinition_constraintsresource.go |   4 +-
 ...er-modelbiasjobdefinition_endpointinput.go |   4 +-
 ...jobdefinition_modelbiasappspecification.go |   4 +-
 ...asjobdefinition_modelbiasbaselineconfig.go |   4 +-
 ...odelbiasjobdefinition_modelbiasjobinput.go |   2 +-
 ...definition_monitoringgroundtruths3input.go |   4 +-
 ...modelbiasjobdefinition_monitoringoutput.go |   2 +-
 ...iasjobdefinition_monitoringoutputconfig.go |   4 +-
 ...elbiasjobdefinition_monitoringresources.go |   2 +-
 ...er-modelbiasjobdefinition_networkconfig.go |   4 +-
 ...gemaker-modelbiasjobdefinition_s3output.go |   4 +-
 ...odelbiasjobdefinition_stoppingcondition.go |   4 +-
 ...emaker-modelbiasjobdefinition_vpcconfig.go |   4 +-
 ...emaker-modelexplainabilityjobdefinition.go |   6 +-
 ...plainabilityjobdefinition_clusterconfig.go |   4 +-
 ...bilityjobdefinition_constraintsresource.go |   4 +-
 ...plainabilityjobdefinition_endpointinput.go |   4 +-
 ...ion_modelexplainabilityappspecification.go |   4 +-
 ...ition_modelexplainabilitybaselineconfig.go |   4 +-
 ...bdefinition_modelexplainabilityjobinput.go |   2 +-
 ...inabilityjobdefinition_monitoringoutput.go |   2 +-
 ...ityjobdefinition_monitoringoutputconfig.go |   4 +-
 ...bilityjobdefinition_monitoringresources.go |   2 +-
 ...plainabilityjobdefinition_networkconfig.go |   4 +-
 ...delexplainabilityjobdefinition_s3output.go |   4 +-
 ...nabilityjobdefinition_stoppingcondition.go |   4 +-
 ...elexplainabilityjobdefinition_vpcconfig.go |   4 +-
 .../aws-sagemaker-modelpackagegroup.go        |   6 +-
 ...aws-sagemaker-modelqualityjobdefinition.go |   6 +-
 ...modelqualityjobdefinition_clusterconfig.go |   4 +-
 ...ualityjobdefinition_constraintsresource.go |   4 +-
 ...modelqualityjobdefinition_endpointinput.go |   4 +-
 ...definition_modelqualityappspecification.go |   4 +-
 ...obdefinition_modelqualitybaselineconfig.go |   4 +-
 ...alityjobdefinition_modelqualityjobinput.go |   2 +-
 ...definition_monitoringgroundtruths3input.go |   4 +-
 ...elqualityjobdefinition_monitoringoutput.go |   2 +-
 ...ityjobdefinition_monitoringoutputconfig.go |   4 +-
 ...ualityjobdefinition_monitoringresources.go |   2 +-
 ...modelqualityjobdefinition_networkconfig.go |   4 +-
 ...aker-modelqualityjobdefinition_s3output.go |   4 +-
 ...lqualityjobdefinition_stoppingcondition.go |   4 +-
 ...ker-modelqualityjobdefinition_vpcconfig.go |   4 +-
 .../aws-sagemaker-monitoringschedule.go       |   6 +-
 ...maker-monitoringschedule_baselineconfig.go |   2 +-
 ...emaker-monitoringschedule_clusterconfig.go |   4 +-
 ...-monitoringschedule_constraintsresource.go |   4 +-
 ...emaker-monitoringschedule_endpointinput.go |   4 +-
 ...agemaker-monitoringschedule_environment.go |   2 +-
 ...ringschedule_monitoringappspecification.go |   4 +-
 ...ringschedule_monitoringexecutionsummary.go |   4 +-
 ...aker-monitoringschedule_monitoringinput.go |   2 +-
 ...ker-monitoringschedule_monitoringinputs.go |   2 +-
 ...itoringschedule_monitoringjobdefinition.go |   4 +-
 ...ker-monitoringschedule_monitoringoutput.go |   2 +-
 ...nitoringschedule_monitoringoutputconfig.go |   4 +-
 ...-monitoringschedule_monitoringresources.go |   2 +-
 ...toringschedule_monitoringscheduleconfig.go |   4 +-
 ...emaker-monitoringschedule_networkconfig.go |   4 +-
 ...s-sagemaker-monitoringschedule_s3output.go |   4 +-
 ...maker-monitoringschedule_scheduleconfig.go |   4 +-
 ...r-monitoringschedule_statisticsresource.go |   4 +-
 ...er-monitoringschedule_stoppingcondition.go |   4 +-
 ...-sagemaker-monitoringschedule_vpcconfig.go |   4 +-
 .../aws-sagemaker-notebookinstance.go         |   6 +-
 ...gemaker-notebookinstancelifecycleconfig.go |   4 +-
 ...cleconfig_notebookinstancelifecyclehook.go |   4 +-
 .../sagemaker/aws-sagemaker-pipeline.go       |   6 +-
 .../sagemaker/aws-sagemaker-project.go        |   6 +-
 .../sagemaker/aws-sagemaker-userprofile.go    |   6 +-
 .../aws-sagemaker-userprofile_customimage.go  |   4 +-
 ...er-userprofile_jupyterserverappsettings.go |   2 +-
 ...er-userprofile_kernelgatewayappsettings.go |   2 +-
 .../aws-sagemaker-userprofile_resourcespec.go |   4 +-
 ...s-sagemaker-userprofile_sharingsettings.go |   4 +-
 .../aws-sagemaker-userprofile_usersettings.go |   4 +-
 .../sagemaker/aws-sagemaker-workteam.go       |   6 +-
 ...emaker-workteam_cognitomemberdefinition.go |   4 +-
 ...aws-sagemaker-workteam_memberdefinition.go |   2 +-
 ...aker-workteam_notificationconfiguration.go |   4 +-
 .../cloudformation/sdb/aws-sdb-domain.go      |   4 +-
 .../aws-secretsmanager-resourcepolicy.go      |   4 +-
 .../aws-secretsmanager-rotationschedule.go    |   4 +-
 ...r-rotationschedule_hostedrotationlambda.go |   4 +-
 ...smanager-rotationschedule_rotationrules.go |   4 +-
 .../aws-secretsmanager-secret.go              |   6 +-
 ...retsmanager-secret_generatesecretstring.go |   4 +-
 ...aws-secretsmanager-secret_replicaregion.go |   4 +-
 ...s-secretsmanager-secrettargetattachment.go |   4 +-
 .../securityhub/aws-securityhub-hub.go        |   2 +-
 .../cloudformation/serverless/api_cors.go     |   4 +-
 .../serverless/api_definitionuri.go           |   4 +-
 .../serverless/application_location.go        |   4 +-
 .../serverless/aws-serverless-api.go          |   4 +-
 .../aws-serverless-api_accesslogsetting.go    |   4 +-
 .../serverless/aws-serverless-api_auth.go     |   4 +-
 .../aws-serverless-api_corsconfiguration.go   |   4 +-
 .../aws-serverless-api_s3location.go          |   4 +-
 .../serverless/aws-serverless-application.go  |   4 +-
 ...verless-application_applicationlocation.go |   4 +-
 .../serverless/aws-serverless-function.go     |   4 +-
 ...aws-serverless-function_alexaskillevent.go |   4 +-
 .../aws-serverless-function_apievent.go       |   4 +-
 .../aws-serverless-function_bucketsampt.go    |   4 +-
 ...erverless-function_cloudwatcheventevent.go |   4 +-
 ...serverless-function_cloudwatchlogsevent.go |   4 +-
 ...aws-serverless-function_collectionsampt.go |   4 +-
 ...aws-serverless-function_deadletterqueue.go |   4 +-
 ...erverless-function_deploymentpreference.go |   4 +-
 ...s-serverless-function_destinationconfig.go |   2 +-
 .../aws-serverless-function_domainsampt.go    |   4 +-
 .../aws-serverless-function_dynamodbevent.go  |   4 +-
 .../aws-serverless-function_emptysampt.go     |   2 +-
 ...erverless-function_eventbridgeruleevent.go |   4 +-
 .../aws-serverless-function_eventsource.go    |   4 +-
 ...ws-serverless-function_filesystemconfig.go |   4 +-
 ...serverless-function_functionenvironment.go |   4 +-
 .../aws-serverless-function_functionsampt.go  |   4 +-
 ...s-serverless-function_iampolicydocument.go |   2 +-
 .../aws-serverless-function_identitysampt.go  |   4 +-
 .../aws-serverless-function_iotruleevent.go   |   4 +-
 .../aws-serverless-function_keysampt.go       |   4 +-
 .../aws-serverless-function_kinesisevent.go   |   4 +-
 .../aws-serverless-function_loggroupsampt.go  |   4 +-
 .../aws-serverless-function_onfailure.go      |   4 +-
 .../aws-serverless-function_queuesampt.go     |   4 +-
 .../aws-serverless-function_s3event.go        |   4 +-
 .../aws-serverless-function_s3keyfilter.go    |   2 +-
 ...aws-serverless-function_s3keyfilterrule.go |   4 +-
 .../aws-serverless-function_s3location.go     |   4 +-
 ...erverless-function_s3notificationfilter.go |   2 +-
 ...s-serverless-function_sampolicytemplate.go |   2 +-
 .../aws-serverless-function_scheduleevent.go  |   4 +-
 .../aws-serverless-function_snsevent.go       |   4 +-
 .../aws-serverless-function_sqsevent.go       |   4 +-
 ...s-serverless-function_statemachinesampt.go |   4 +-
 .../aws-serverless-function_streamsampt.go    |   4 +-
 .../aws-serverless-function_tablesampt.go     |   4 +-
 ...ws-serverless-function_tablestreamsampt.go |   4 +-
 .../aws-serverless-function_topicsampt.go     |   4 +-
 .../aws-serverless-function_vpcconfig.go      |   4 +-
 .../serverless/aws-serverless-layerversion.go |   4 +-
 .../serverless/aws-serverless-simpletable.go  |   4 +-
 .../aws-serverless-simpletable_primarykey.go  |   4 +-
 ...rless-simpletable_provisionedthroughput.go |   4 +-
 ...serverless-simpletable_ssespecification.go |   4 +-
 .../serverless/aws-serverless-statemachine.go |   4 +-
 .../aws-serverless-statemachine_apievent.go   |   4 +-
 ...rless-statemachine_cloudwatcheventevent.go |   4 +-
 ...ess-statemachine_cloudwatchlogsloggroup.go |   4 +-
 ...rless-statemachine_eventbridgeruleevent.go |   4 +-
 ...aws-serverless-statemachine_eventsource.go |   4 +-
 ...s-serverless-statemachine_functionsampt.go |   4 +-
 ...rverless-statemachine_iampolicydocument.go |   2 +-
 ...-serverless-statemachine_logdestination.go |   2 +-
 ...rless-statemachine_loggingconfiguration.go |   4 +-
 .../aws-serverless-statemachine_s3location.go |   4 +-
 ...rverless-statemachine_sampolicytemplate.go |   2 +-
 ...s-serverless-statemachine_scheduleevent.go |   4 +-
 ...rverless-statemachine_statemachinesampt.go |   4 +-
 .../serverless/function_codeuri.go            |   4 +-
 .../serverless/function_events.go             |   4 +-
 .../serverless/function_policies.go           |   4 +-
 .../serverless/function_properties.go         |   2 +-
 .../serverless/statemachine_definitionuri.go  |   4 +-
 .../serverless/statemachine_policies.go       |   4 +-
 .../serverless/statemachine_properties.go     |   2 +-
 ...s-servicecatalog-acceptedportfolioshare.go |   4 +-
 ...ws-servicecatalog-cloudformationproduct.go |   6 +-
 ...nproduct_provisioningartifactproperties.go |   4 +-
 ...atalog-cloudformationprovisionedproduct.go |   6 +-
 ...rovisionedproduct_provisioningparameter.go |   4 +-
 ...visionedproduct_provisioningpreferences.go |   4 +-
 ...icecatalog-launchnotificationconstraint.go |   4 +-
 ...aws-servicecatalog-launchroleconstraint.go |   4 +-
 ...servicecatalog-launchtemplateconstraint.go |   4 +-
 .../aws-servicecatalog-portfolio.go           |   6 +-
 ...cecatalog-portfolioprincipalassociation.go |   4 +-
 ...vicecatalog-portfolioproductassociation.go |   4 +-
 .../aws-servicecatalog-portfolioshare.go      |   4 +-
 ...servicecatalog-resourceupdateconstraint.go |   4 +-
 .../aws-servicecatalog-serviceaction.go       |   4 +-
 ...talog-serviceaction_definitionparameter.go |   4 +-
 ...servicecatalog-serviceactionassociation.go |   4 +-
 .../aws-servicecatalog-stacksetconstraint.go  |   4 +-
 .../aws-servicecatalog-tagoption.go           |   4 +-
 ...aws-servicecatalog-tagoptionassociation.go |   4 +-
 ...s-servicecatalogappregistry-application.go |   4 +-
 ...ervicecatalogappregistry-attributegroup.go |   4 +-
 ...ogappregistry-attributegroupassociation.go |   4 +-
 ...ecatalogappregistry-resourceassociation.go |   4 +-
 .../aws-servicediscovery-httpnamespace.go     |   6 +-
 .../aws-servicediscovery-instance.go          |   4 +-
 ...ws-servicediscovery-privatednsnamespace.go |   6 +-
 ...nsnamespace_privatednspropertiesmutable.go |   2 +-
 ...iscovery-privatednsnamespace_properties.go |   2 +-
 ...ervicediscovery-privatednsnamespace_soa.go |   4 +-
 ...aws-servicediscovery-publicdnsnamespace.go |   6 +-
 ...discovery-publicdnsnamespace_properties.go |   2 +-
 ...dnsnamespace_publicdnspropertiesmutable.go |   2 +-
 ...servicediscovery-publicdnsnamespace_soa.go |   4 +-
 .../aws-servicediscovery-service.go           |   6 +-
 .../aws-servicediscovery-service_dnsconfig.go |   4 +-
 .../aws-servicediscovery-service_dnsrecord.go |   4 +-
 ...vicediscovery-service_healthcheckconfig.go |   4 +-
 ...scovery-service_healthcheckcustomconfig.go |   4 +-
 .../ses/aws-ses-configurationset.go           |   4 +-
 ...ws-ses-configurationseteventdestination.go |   4 +-
 ...teventdestination_cloudwatchdestination.go |   2 +-
 ...eventdestination_dimensionconfiguration.go |   4 +-
 ...ionseteventdestination_eventdestination.go |   4 +-
 ...tdestination_kinesisfirehosedestination.go |   4 +-
 .../cloudformation/ses/aws-ses-contactlist.go |   6 +-
 .../ses/aws-ses-contactlist_topic.go          |   4 +-
 .../ses/aws-ses-receiptfilter.go              |   2 +-
 .../ses/aws-ses-receiptfilter_filter.go       |   4 +-
 .../ses/aws-ses-receiptfilter_ipfilter.go     |   4 +-
 .../cloudformation/ses/aws-ses-receiptrule.go |   4 +-
 .../ses/aws-ses-receiptrule_action.go         |   2 +-
 .../aws-ses-receiptrule_addheaderaction.go    |   4 +-
 .../ses/aws-ses-receiptrule_bounceaction.go   |   4 +-
 .../ses/aws-ses-receiptrule_lambdaaction.go   |   4 +-
 .../ses/aws-ses-receiptrule_rule.go           |   4 +-
 .../ses/aws-ses-receiptrule_s3action.go       |   4 +-
 .../ses/aws-ses-receiptrule_snsaction.go      |   4 +-
 .../ses/aws-ses-receiptrule_stopaction.go     |   4 +-
 .../ses/aws-ses-receiptrule_workmailaction.go |   4 +-
 .../ses/aws-ses-receiptruleset.go             |   4 +-
 .../cloudformation/ses/aws-ses-template.go    |   2 +-
 .../ses/aws-ses-template_template.go          |   4 +-
 .../signer/aws-signer-profilepermission.go    |   4 +-
 .../signer/aws-signer-signingprofile.go       |   6 +-
 ...-signingprofile_signaturevalidityperiod.go |   4 +-
 .../sns/aws-sns-subscription.go               |   4 +-
 .../cloudformation/sns/aws-sns-topic.go       |   6 +-
 .../sns/aws-sns-topic_subscription.go         |   4 +-
 .../cloudformation/sns/aws-sns-topicpolicy.go |   4 +-
 .../cloudformation/sqs/aws-sqs-queue.go       |   6 +-
 .../cloudformation/sqs/aws-sqs-queuepolicy.go |   4 +-
 .../cloudformation/ssm/aws-ssm-association.go |   4 +-
 ...ation_instanceassociationoutputlocation.go |   2 +-
 .../aws-ssm-association_parametervalues.go    |   4 +-
 .../aws-ssm-association_s3outputlocation.go   |   4 +-
 .../ssm/aws-ssm-association_target.go         |   4 +-
 .../cloudformation/ssm/aws-ssm-document.go    |   6 +-
 .../ssm/aws-ssm-document_attachmentssource.go |   4 +-
 .../ssm/aws-ssm-document_documentrequires.go  |   4 +-
 .../ssm/aws-ssm-maintenancewindow.go          |   6 +-
 .../ssm/aws-ssm-maintenancewindowtarget.go    |   4 +-
 ...aws-ssm-maintenancewindowtarget_targets.go |   4 +-
 .../ssm/aws-ssm-maintenancewindowtask.go      |   4 +-
 ...s-ssm-maintenancewindowtask_logginginfo.go |   4 +-
 ...k_maintenancewindowautomationparameters.go |   4 +-
 ...wtask_maintenancewindowlambdaparameters.go |   4 +-
 ...k_maintenancewindowruncommandparameters.go |   4 +-
 ...aintenancewindowstepfunctionsparameters.go |   4 +-
 ...aintenancewindowtask_notificationconfig.go |   4 +-
 .../aws-ssm-maintenancewindowtask_target.go   |   4 +-
 ...ancewindowtask_taskinvocationparameters.go |   2 +-
 .../cloudformation/ssm/aws-ssm-parameter.go   |   4 +-
 .../ssm/aws-ssm-patchbaseline.go              |   6 +-
 .../ssm/aws-ssm-patchbaseline_patchfilter.go  |   4 +-
 .../aws-ssm-patchbaseline_patchfiltergroup.go |   2 +-
 .../ssm/aws-ssm-patchbaseline_patchsource.go  |   4 +-
 .../aws-ssm-patchbaseline_patchstringdate.go  |   2 +-
 .../ssm/aws-ssm-patchbaseline_rule.go         |   4 +-
 .../ssm/aws-ssm-patchbaseline_rulegroup.go    |   2 +-
 .../ssm/aws-ssm-resourcedatasync.go           |   4 +-
 ...resourcedatasync_awsorganizationssource.go |   4 +-
 .../aws-ssm-resourcedatasync_s3destination.go |   4 +-
 .../aws-ssm-resourcedatasync_syncsource.go    |   4 +-
 .../ssmcontacts/aws-ssmcontacts-contact.go    |   4 +-
 ...s-ssmcontacts-contact_channeltargetinfo.go |   4 +-
 ...s-ssmcontacts-contact_contacttargetinfo.go |   4 +-
 .../aws-ssmcontacts-contact_stage.go          |   4 +-
 .../aws-ssmcontacts-contact_targets.go        |   2 +-
 .../aws-ssmcontacts-contactchannel.go         |   4 +-
 .../aws-ssmincidents-replicationset.go        |   4 +-
 ...ents-replicationset_regionconfiguration.go |   4 +-
 ...idents-replicationset_replicationregion.go |   4 +-
 .../aws-ssmincidents-responseplan.go          |   6 +-
 .../aws-ssmincidents-responseplan_action.go   |   2 +-
 ...s-ssmincidents-responseplan_chatchannel.go |   4 +-
 ...incidents-responseplan_incidenttemplate.go |   4 +-
 ...nts-responseplan_notificationtargetitem.go |   4 +-
 ...ssmincidents-responseplan_ssmautomation.go |   4 +-
 ...-ssmincidents-responseplan_ssmparameter.go |   4 +-
 .../cloudformation/sso/aws-sso-assignment.go  |   4 +-
 ...anceaccesscontrolattributeconfiguration.go |   4 +-
 ...uteconfiguration_accesscontrolattribute.go |   4 +-
 ...nfiguration_accesscontrolattributevalue.go |   4 +-
 .../sso/aws-sso-permissionset.go              |   6 +-
 .../aws-stepfunctions-activity.go             |   4 +-
 .../aws-stepfunctions-activity_tagsentry.go   |   4 +-
 .../aws-stepfunctions-statemachine.go         |   4 +-
 ...ons-statemachine_cloudwatchlogsloggroup.go |   4 +-
 ...s-stepfunctions-statemachine_definition.go |   2 +-
 ...ns-statemachine_definitionsubstitutions.go |   2 +-
 ...epfunctions-statemachine_logdestination.go |   2 +-
 ...tions-statemachine_loggingconfiguration.go |   4 +-
 ...s-stepfunctions-statemachine_s3location.go |   4 +-
 ...ws-stepfunctions-statemachine_tagsentry.go |   4 +-
 ...tions-statemachine_tracingconfiguration.go |   4 +-
 .../synthetics/aws-synthetics-canary.go       |   6 +-
 .../aws-synthetics-canary_artifactconfig.go   |   2 +-
 .../aws-synthetics-canary_basescreenshot.go   |   4 +-
 .../synthetics/aws-synthetics-canary_code.go  |   4 +-
 .../aws-synthetics-canary_runconfig.go        |   4 +-
 .../aws-synthetics-canary_s3encryption.go     |   4 +-
 .../aws-synthetics-canary_schedule.go         |   4 +-
 .../aws-synthetics-canary_visualreference.go  |   4 +-
 .../aws-synthetics-canary_vpcconfig.go        |   4 +-
 .../goformation}/cloudformation/tags/tag.go   |   2 +-
 .../goformation}/cloudformation/template.go   |   2 +-
 .../timestream/aws-timestream-database.go     |   6 +-
 .../aws-timestream-scheduledquery.go          |   6 +-
 ...estream-scheduledquery_dimensionmapping.go |   4 +-
 ...scheduledquery_errorreportconfiguration.go |   2 +-
 ...ream-scheduledquery_mixedmeasuremapping.go |   4 +-
 ...duledquery_multimeasureattributemapping.go |   4 +-
 ...eam-scheduledquery_multimeasuremappings.go |   4 +-
 ...cheduledquery_notificationconfiguration.go |   2 +-
 ...mestream-scheduledquery_s3configuration.go |   4 +-
 ...am-scheduledquery_scheduleconfiguration.go |   4 +-
 ...estream-scheduledquery_snsconfiguration.go |   4 +-
 ...ream-scheduledquery_targetconfiguration.go |   2 +-
 ...-scheduledquery_timestreamconfiguration.go |   4 +-
 .../timestream/aws-timestream-table.go        |   6 +-
 .../transfer/aws-transfer-server.go           |   6 +-
 .../aws-transfer-server_endpointdetails.go    |   4 +-
 ...transfer-server_identityproviderdetails.go |   4 +-
 .../transfer/aws-transfer-server_protocol.go  |   2 +-
 .../aws-transfer-server_protocoldetails.go    |   4 +-
 .../aws-transfer-server_securitygroupid.go    |   2 +-
 .../aws-transfer-server_workflowdetail.go     |   4 +-
 .../aws-transfer-server_workflowdetails.go    |   2 +-
 .../transfer/aws-transfer-user.go             |   6 +-
 ...aws-transfer-user_homedirectorymapentry.go |   4 +-
 .../aws-transfer-user_posixprofile.go         |   4 +-
 .../aws-transfer-user_sshpublickey.go         |   2 +-
 .../transfer/aws-transfer-workflow.go         |   6 +-
 .../aws-transfer-workflow_workflowstep.go     |   4 +-
 .../cloudformation/types/intrinsics.go        |   0
 .../cloudformation/types/types.go             |   0
 .../cloudformation/utils/utils.go             |   0
 .../waf/aws-waf-bytematchset.go               |   4 +-
 .../aws-waf-bytematchset_bytematchtuple.go    |   4 +-
 .../waf/aws-waf-bytematchset_fieldtomatch.go  |   4 +-
 .../cloudformation/waf/aws-waf-ipset.go       |   4 +-
 .../waf/aws-waf-ipset_ipsetdescriptor.go      |   4 +-
 .../cloudformation/waf/aws-waf-rule.go        |   4 +-
 .../waf/aws-waf-rule_predicate.go             |   4 +-
 .../waf/aws-waf-sizeconstraintset.go          |   4 +-
 .../aws-waf-sizeconstraintset_fieldtomatch.go |   4 +-
 ...ws-waf-sizeconstraintset_sizeconstraint.go |   4 +-
 .../waf/aws-waf-sqlinjectionmatchset.go       |   4 +-
 ...s-waf-sqlinjectionmatchset_fieldtomatch.go |   4 +-
 ...njectionmatchset_sqlinjectionmatchtuple.go |   4 +-
 .../cloudformation/waf/aws-waf-webacl.go      |   4 +-
 .../waf/aws-waf-webacl_activatedrule.go       |   4 +-
 .../waf/aws-waf-webacl_wafaction.go           |   4 +-
 .../cloudformation/waf/aws-waf-xssmatchset.go |   4 +-
 .../waf/aws-waf-xssmatchset_fieldtomatch.go   |   4 +-
 .../waf/aws-waf-xssmatchset_xssmatchtuple.go  |   4 +-
 .../aws-wafregional-bytematchset.go           |   4 +-
 ...wafregional-bytematchset_bytematchtuple.go |   4 +-
 ...s-wafregional-bytematchset_fieldtomatch.go |   4 +-
 .../aws-wafregional-geomatchset.go            |   4 +-
 ...regional-geomatchset_geomatchconstraint.go |   4 +-
 .../wafregional/aws-wafregional-ipset.go      |   4 +-
 .../aws-wafregional-ipset_ipsetdescriptor.go  |   4 +-
 .../aws-wafregional-ratebasedrule.go          |   4 +-
 ...aws-wafregional-ratebasedrule_predicate.go |   4 +-
 .../aws-wafregional-regexpatternset.go        |   4 +-
 .../wafregional/aws-wafregional-rule.go       |   4 +-
 .../aws-wafregional-rule_predicate.go         |   4 +-
 .../aws-wafregional-sizeconstraintset.go      |   4 +-
 ...regional-sizeconstraintset_fieldtomatch.go |   4 +-
 ...gional-sizeconstraintset_sizeconstraint.go |   4 +-
 .../aws-wafregional-sqlinjectionmatchset.go   |   4 +-
 ...ional-sqlinjectionmatchset_fieldtomatch.go |   4 +-
 ...njectionmatchset_sqlinjectionmatchtuple.go |   4 +-
 .../wafregional/aws-wafregional-webacl.go     |   4 +-
 .../aws-wafregional-webacl_action.go          |   4 +-
 .../aws-wafregional-webacl_rule.go            |   4 +-
 .../aws-wafregional-webaclassociation.go      |   4 +-
 .../aws-wafregional-xssmatchset.go            |   4 +-
 ...ws-wafregional-xssmatchset_fieldtomatch.go |   4 +-
 ...s-wafregional-xssmatchset_xssmatchtuple.go |   4 +-
 .../cloudformation/wafv2/aws-wafv2-ipset.go   |   6 +-
 .../wafv2/aws-wafv2-loggingconfiguration.go   |   4 +-
 ...wafv2-loggingconfiguration_fieldtomatch.go |   2 +-
 .../wafv2/aws-wafv2-regexpatternset.go        |   6 +-
 .../wafv2/aws-wafv2-rulegroup.go              |   6 +-
 .../wafv2/aws-wafv2-rulegroup_andstatement.go |   2 +-
 .../aws-wafv2-rulegroup_andstatementone.go    |   2 +-
 .../aws-wafv2-rulegroup_andstatementtwo.go    |   2 +-
 .../aws-wafv2-rulegroup_bytematchstatement.go |   4 +-
 .../aws-wafv2-rulegroup_customresponsebody.go |   4 +-
 .../wafv2/aws-wafv2-rulegroup_fieldtomatch.go |   2 +-
 ...afv2-rulegroup_forwardedipconfiguration.go |   4 +-
 .../aws-wafv2-rulegroup_geomatchstatement.go  |   4 +-
 ...rulegroup_ipsetforwardedipconfiguration.go |   4 +-
 ...wafv2-rulegroup_ipsetreferencestatement.go |   4 +-
 .../wafv2/aws-wafv2-rulegroup_jsonbody.go     |   4 +-
 .../aws-wafv2-rulegroup_jsonmatchpattern.go   |   4 +-
 .../wafv2/aws-wafv2-rulegroup_label.go        |   4 +-
 ...aws-wafv2-rulegroup_labelmatchstatement.go |   4 +-
 .../wafv2/aws-wafv2-rulegroup_labelsummary.go |   4 +-
 .../wafv2/aws-wafv2-rulegroup_notstatement.go |   2 +-
 .../aws-wafv2-rulegroup_notstatementone.go    |   2 +-
 .../aws-wafv2-rulegroup_notstatementtwo.go    |   2 +-
 .../wafv2/aws-wafv2-rulegroup_orstatement.go  |   2 +-
 .../aws-wafv2-rulegroup_orstatementone.go     |   2 +-
 .../aws-wafv2-rulegroup_orstatementtwo.go     |   2 +-
 .../aws-wafv2-rulegroup_ratebasedstatement.go |   4 +-
 ...s-wafv2-rulegroup_ratebasedstatementone.go |   4 +-
 ...s-wafv2-rulegroup_ratebasedstatementtwo.go |   4 +-
 ...group_regexpatternsetreferencestatement.go |   4 +-
 .../wafv2/aws-wafv2-rulegroup_rule.go         |   4 +-
 .../wafv2/aws-wafv2-rulegroup_ruleaction.go   |   2 +-
 ...wafv2-rulegroup_sizeconstraintstatement.go |   4 +-
 .../aws-wafv2-rulegroup_sqlimatchstatement.go |   2 +-
 .../wafv2/aws-wafv2-rulegroup_statement.go    |   2 +-
 .../wafv2/aws-wafv2-rulegroup_statementone.go |   2 +-
 .../aws-wafv2-rulegroup_statementthree.go     |   2 +-
 .../wafv2/aws-wafv2-rulegroup_statementtwo.go |   2 +-
 .../aws-wafv2-rulegroup_texttransformation.go |   4 +-
 .../aws-wafv2-rulegroup_visibilityconfig.go   |   4 +-
 .../aws-wafv2-rulegroup_xssmatchstatement.go  |   2 +-
 .../cloudformation/wafv2/aws-wafv2-webacl.go  |   6 +-
 .../wafv2/aws-wafv2-webacl_allowaction.go     |   2 +-
 .../wafv2/aws-wafv2-webacl_andstatement.go    |   2 +-
 .../wafv2/aws-wafv2-webacl_andstatementone.go |   2 +-
 .../wafv2/aws-wafv2-webacl_andstatementtwo.go |   2 +-
 .../wafv2/aws-wafv2-webacl_blockaction.go     |   2 +-
 .../aws-wafv2-webacl_bytematchstatement.go    |   4 +-
 .../wafv2/aws-wafv2-webacl_countaction.go     |   2 +-
 .../aws-wafv2-webacl_customhttpheader.go      |   4 +-
 .../aws-wafv2-webacl_customrequesthandling.go |   2 +-
 .../wafv2/aws-wafv2-webacl_customresponse.go  |   4 +-
 .../aws-wafv2-webacl_customresponsebody.go    |   4 +-
 .../wafv2/aws-wafv2-webacl_defaultaction.go   |   2 +-
 .../wafv2/aws-wafv2-webacl_excludedrule.go    |   4 +-
 .../wafv2/aws-wafv2-webacl_fieldtomatch.go    |   2 +-
 ...s-wafv2-webacl_forwardedipconfiguration.go |   4 +-
 .../aws-wafv2-webacl_geomatchstatement.go     |   4 +-
 ...v2-webacl_ipsetforwardedipconfiguration.go |   4 +-
 ...ws-wafv2-webacl_ipsetreferencestatement.go |   4 +-
 .../wafv2/aws-wafv2-webacl_jsonbody.go        |   4 +-
 .../aws-wafv2-webacl_jsonmatchpattern.go      |   4 +-
 .../wafv2/aws-wafv2-webacl_label.go           |   4 +-
 .../aws-wafv2-webacl_labelmatchstatement.go   |   4 +-
 ...-wafv2-webacl_managedrulegroupstatement.go |   4 +-
 .../wafv2/aws-wafv2-webacl_notstatement.go    |   2 +-
 .../wafv2/aws-wafv2-webacl_notstatementone.go |   2 +-
 .../wafv2/aws-wafv2-webacl_notstatementtwo.go |   2 +-
 .../wafv2/aws-wafv2-webacl_orstatement.go     |   2 +-
 .../wafv2/aws-wafv2-webacl_orstatementone.go  |   2 +-
 .../wafv2/aws-wafv2-webacl_orstatementtwo.go  |   2 +-
 .../wafv2/aws-wafv2-webacl_overrideaction.go  |   2 +-
 .../aws-wafv2-webacl_ratebasedstatement.go    |   4 +-
 .../aws-wafv2-webacl_ratebasedstatementone.go |   4 +-
 .../aws-wafv2-webacl_ratebasedstatementtwo.go |   4 +-
 ...ebacl_regexpatternsetreferencestatement.go |   4 +-
 .../wafv2/aws-wafv2-webacl_rule.go            |   4 +-
 .../wafv2/aws-wafv2-webacl_ruleaction.go      |   2 +-
 ...afv2-webacl_rulegroupreferencestatement.go |   4 +-
 ...ws-wafv2-webacl_sizeconstraintstatement.go |   4 +-
 .../aws-wafv2-webacl_sqlimatchstatement.go    |   2 +-
 .../wafv2/aws-wafv2-webacl_statement.go       |   2 +-
 .../wafv2/aws-wafv2-webacl_statementone.go    |   2 +-
 .../wafv2/aws-wafv2-webacl_statementthree.go  |   2 +-
 .../wafv2/aws-wafv2-webacl_statementtwo.go    |   2 +-
 .../aws-wafv2-webacl_texttransformation.go    |   4 +-
 .../aws-wafv2-webacl_visibilityconfig.go      |   4 +-
 .../aws-wafv2-webacl_xssmatchstatement.go     |   2 +-
 .../wafv2/aws-wafv2-webaclassociation.go      |   4 +-
 .../wisdom/aws-wisdom-assistant.go            |   6 +-
 ...stant_serversideencryptionconfiguration.go |   4 +-
 .../wisdom/aws-wisdom-assistantassociation.go |   6 +-
 ...om-assistantassociation_associationdata.go |   4 +-
 .../wisdom/aws-wisdom-knowledgebase.go        |   6 +-
 ...wledgebase_appintegrationsconfiguration.go |   4 +-
 ...om-knowledgebase_renderingconfiguration.go |   4 +-
 ...ebase_serversideencryptionconfiguration.go |   4 +-
 ...isdom-knowledgebase_sourceconfiguration.go |   2 +-
 .../aws-workspaces-connectionalias.go         |   6 +-
 ...nectionalias_connectionaliasassociation.go |   4 +-
 .../workspaces/aws-workspaces-workspace.go    |   6 +-
 ...orkspaces-workspace_workspaceproperties.go |   4 +-
 .../cloudformation/xray/aws-xray-group.go     |   4 +-
 .../aws-xray-group_insightsconfiguration.go   |   4 +-
 .../xray/aws-xray-samplingrule.go             |   4 +-
 .../aws-xray-samplingrule_samplingrule.go     |   4 +-
 ...ws-xray-samplingrule_samplingrulerecord.go |   4 +-
 ...ws-xray-samplingrule_samplingruleupdate.go |   4 +-
 .../goformation}/example/go-to-yaml/main.go   |   6 +-
 .../goformation}/example/yaml-to-go/main.go   |   2 +-
 .../example/yaml-to-go/template.yaml          |   0
 .../generate/create-pull-request.sh           |   0
 .../goformation}/generate/generate.go         |   0
 .../goformation}/generate/generate.sh         |   0
 .../generate/generate_suite_test.go           |   0
 .../goformation}/generate/main.go             |   0
 .../goformation}/generate/naming.go           |   0
 .../goformation}/generate/property.go         |   0
 .../goformation}/generate/property_test.go    |   4 +-
 .../goformation}/generate/resource.go         |   0
 .../goformation}/generate/resource_test.go    |  10 +-
 .../goformation}/generate/sam-2016-10-31.json |   0
 .../goformation}/generate/spec.go             |   0
 .../generate/templates/all.template           |   0
 .../templates/polymorphic-property.template   |   0
 .../generate/templates/resource.template      |   0
 .../templates/schema-property.template        |   0
 .../templates/schema-resource.template        |   0
 .../generate/templates/schema.template        |   0
 .../goformation}/goformation.go               |   4 +-
 .../goformation}/goformation_schema_test.go   |   0
 .../goformation}/goformation_suite_test.go    |   0
 .../goformation}/goformation_test.go          |  18 +-
 .../goformation}/intrinsics/intrinsics.go     |   0
 .../intrinsics/intrinsics_suite_test.go       |   0
 .../goformation}/intrinsics/tags.go           |   0
 .../goformation}/schema/README.md             |   0
 .../goformation}/schema/cloudformation.go     |   0
 .../schema/cloudformation.schema.json         |   0
 .../goformation}/schema/sam.go                |   0
 .../goformation}/schema/sam.schema.json       |   0
 .../goformation}/static/logo.png              | Bin
 {goformation => pkg/goformation}/test.go      |   0
 .../invalid-sam-template-no-transform.json    |   0
 .../invalid-sam-template-wrong-transform.json |   0
 .../invalid-template-additional-property.json |   0
 ...template-additional-resource-property.json |   0
 ...id-template-empty-resource-properties.json |   0
 ...nvalid-template-invalid-resource-name.json |   0
 ...template-invalid-resource-subproperty.json |   0
 ...-template-missing-resource-properties.json |   0
 ...nvalid-template-missing-resource-type.json |   0
 .../invalid-template-missing-resources.json   |   0
 ...template-subproperty-missing-property.json |   0
 ...nvalid-template-unknown-resource-type.json |   0
 ...template-unknown-subproperty-property.json |   0
 .../test/json/resource-with-tags.json         |   0
 .../test/json/valid-sam-template.json         |   0
 .../valid-template-resource-attributes.json   |   0
 .../test/json/valid-template-with-fns.json    |   0
 .../test/json/valid-template.json             |   0
 .../test/yaml/api-swagger-plain.yaml          |   0
 ...less-api-string-or-cors-configuration.yaml |   0
 .../test/yaml/aws-serverless-api-swagger.yaml |   0
 .../test/yaml/aws-serverless-api.yaml         |   0
 .../aws-serverless-function-2016-10-31.yaml   |   0
 .../aws-serverless-function-api-event.yaml    |   0
 .../aws-serverless-function-env-vars.yaml     |   0
 ...erless-function-string-or-s3-location.yaml |   0
 .../test/yaml/aws-serverless-simpletable.yaml |   0
 .../goformation}/test/yaml/codestar/java.yml  |   0
 .../test/yaml/codestar/nodejs.yml             |   0
 .../test/yaml/codestar/python.yml             |   0
 .../test/yaml/custom-resource.yaml            |   0
 .../test/yaml/output_section.yaml             |   0
 .../sam-official-samples/alexa_skill/index.js |   0
 .../alexa_skill/template.yaml                 |   0
 .../api-swagger-intrinsic.yaml                |   0
 .../api-swagger-plain.yaml                    |   0
 .../sam-official-samples/api_backend/index.js |   0
 .../api_backend/template.yaml                 |   0
 .../api_swagger_cors/index.js                 |   0
 .../api_swagger_cors/swagger.yaml             |   0
 .../api_swagger_cors/template.yaml            |   0
 .../codestar-node4.3.yaml                     |   0
 .../encryption_proxy/README.MD                |   0
 .../encryption_proxy/decryption.py            |   0
 .../encryption_proxy/encryption.py            |   0
 .../encryption_proxy/template.yaml            |   0
 .../yaml/sam-official-samples/function.yaml   |   0
 .../sam-official-samples/hello_world/index.js |   0
 .../hello_world/template.yaml                 |   0
 .../inline_swagger/index.js                   |   0
 .../inline_swagger/template.yaml              |   0
 .../sam-official-samples/iot_backend/index.js |   0
 .../iot_backend/template.yaml                 |   0
 .../s3_processor/index.js                     |   0
 .../s3_processor/template.yaml                |   0
 .../sam-official-samples/schedule/index.js    |   0
 .../schedule/template.yaml                    |   0
 .../stream_processor/index.js                 |   0
 .../stream_processor/template.yaml            |   0
 .../sam-official-samples/templates/basic.yaml |   0
 .../templates/intrinsic.yaml                  |   0
 .../sam-official-samples/templates/wrong.yaml |   0
 .../test/yaml/transform-multiple.yaml         |   0
 .../test/yaml/transform-single.yaml           |   0
 .../no-resources-section.yaml                 |   0
 .../test/yaml/yaml-intrinsic-tags.yaml        |   0
 pkg/vpc/fakes/fake_vpc_importer.go            |   2 +-
 pkg/vpc/importer.go                           |   2 +-
 pkg/vpc/importer_test.go                      |   2 +-
 4000 files changed, 7823 insertions(+), 8005 deletions(-)
 delete mode 100644 goformation/go.mod
 delete mode 100644 goformation/go.sum
 rename {goformation => pkg/goformation}/.gitignore (100%)
 rename {goformation => pkg/goformation}/AUTHORS.md (100%)
 rename {goformation => pkg/goformation}/CHANGELOG.md (100%)
 rename {goformation => pkg/goformation}/CODE_OF_CONDUCT.md (100%)
 rename {goformation => pkg/goformation}/CONTRIBUTING.md (100%)
 rename {goformation => pkg/goformation}/LICENSE (100%)
 rename {goformation => pkg/goformation}/LOGO.md (100%)
 rename {goformation => pkg/goformation}/NOTICE (100%)
 rename {goformation => pkg/goformation}/README.md (100%)
 rename {goformation => pkg/goformation}/cloudformation/README.md (100%)
 rename {goformation => pkg/goformation}/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer_archiverule.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer_filter.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/acmpca/aws-acmpca-certificate.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/acmpca/aws-acmpca-certificate_apipassthrough.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/acmpca/aws-acmpca-certificate_edipartyname.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/acmpca/aws-acmpca-certificate_extendedkeyusage.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/acmpca/aws-acmpca-certificate_extensions.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/acmpca/aws-acmpca-certificate_generalname.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/acmpca/aws-acmpca-certificate_keyusage.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/acmpca/aws-acmpca-certificate_othername.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/acmpca/aws-acmpca-certificate_policyinformation.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/acmpca/aws-acmpca-certificate_policyqualifierinfo.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/acmpca/aws-acmpca-certificate_qualifier.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/acmpca/aws-acmpca-certificate_subject.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/acmpca/aws-acmpca-certificate_validity.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/acmpca/aws-acmpca-certificateauthority.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/acmpca/aws-acmpca-certificateauthority_accessdescription.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/acmpca/aws-acmpca-certificateauthority_accessmethod.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/acmpca/aws-acmpca-certificateauthority_crlconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/acmpca/aws-acmpca-certificateauthority_csrextensions.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/acmpca/aws-acmpca-certificateauthority_edipartyname.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/acmpca/aws-acmpca-certificateauthority_generalname.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/acmpca/aws-acmpca-certificateauthority_keyusage.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/acmpca/aws-acmpca-certificateauthority_ocspconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/acmpca/aws-acmpca-certificateauthority_othername.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/acmpca/aws-acmpca-certificateauthority_revocationconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/acmpca/aws-acmpca-certificateauthority_subject.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/acmpca/aws-acmpca-certificateauthorityactivation.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/acmpca/aws-acmpca-permission.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/all.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/amazonmq/aws-amazonmq-broker.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/amazonmq/aws-amazonmq-broker_configurationid.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/amazonmq/aws-amazonmq-broker_encryptionoptions.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/amazonmq/aws-amazonmq-broker_ldapservermetadata.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/amazonmq/aws-amazonmq-broker_loglist.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/amazonmq/aws-amazonmq-broker_maintenancewindow.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/amazonmq/aws-amazonmq-broker_tagsentry.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/amazonmq/aws-amazonmq-broker_user.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/amazonmq/aws-amazonmq-configuration.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/amazonmq/aws-amazonmq-configuration_tagsentry.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/amazonmq/aws-amazonmq-configurationassociation.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/amazonmq/aws-amazonmq-configurationassociation_configurationid.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/amplify/aws-amplify-app.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/amplify/aws-amplify-app_autobranchcreationconfig.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/amplify/aws-amplify-app_basicauthconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/amplify/aws-amplify-app_customrule.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/amplify/aws-amplify-app_environmentvariable.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/amplify/aws-amplify-branch.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/amplify/aws-amplify-branch_basicauthconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/amplify/aws-amplify-branch_environmentvariable.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/amplify/aws-amplify-domain.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/amplify/aws-amplify-domain_subdomainsetting.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentbindingpropertiesvalue.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentbindingpropertiesvalueproperties.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentchild.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentconditionproperty.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentdataconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentoverrides.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentoverridesvalue.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentproperties.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentproperty.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentpropertybindingproperties.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentvariant.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentvariantvalues.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_formbindings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_predicate.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_sortproperty.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme_themevalue.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme_themevalues.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-account.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-apikey.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-apikey_stagekey.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-authorizer.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-basepathmapping.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-clientcertificate.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-deployment.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-deployment_accesslogsetting.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-deployment_canarysetting.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-deployment_deploymentcanarysettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-deployment_methodsetting.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-deployment_stagedescription.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-documentationpart.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-documentationpart_location.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-documentationversion.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-domainname.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-domainname_endpointconfiguration.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-domainname_mutualtlsauthentication.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-gatewayresponse.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-method.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-method_integration.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-method_integrationresponse.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-method_methodresponse.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-model.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-requestvalidator.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-resource.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-restapi.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-restapi_endpointconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-restapi_s3location.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-stage.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-stage_accesslogsetting.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-stage_canarysetting.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-stage_methodsetting.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-usageplan.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-usageplan_apistage.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-usageplan_quotasettings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-usageplan_throttlesettings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-usageplankey.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/apigateway/aws-apigateway-vpclink.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/apigatewayv2/aws-apigatewayv2-api.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/apigatewayv2/aws-apigatewayv2-api_bodys3location.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/apigatewayv2/aws-apigatewayv2-api_cors.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_accesslogsettings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_integrationoverrides.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_routeoverrides.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_routesettings.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_stageoverrides.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/apigatewayv2/aws-apigatewayv2-apimapping.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/apigatewayv2/aws-apigatewayv2-authorizer.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/apigatewayv2/aws-apigatewayv2-authorizer_jwtconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/apigatewayv2/aws-apigatewayv2-deployment.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/apigatewayv2/aws-apigatewayv2-domainname.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/apigatewayv2/aws-apigatewayv2-domainname_domainnameconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/apigatewayv2/aws-apigatewayv2-domainname_mutualtlsauthentication.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/apigatewayv2/aws-apigatewayv2-integration.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/apigatewayv2/aws-apigatewayv2-integration_responseparameter.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/apigatewayv2/aws-apigatewayv2-integration_responseparameterlist.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/apigatewayv2/aws-apigatewayv2-integration_tlsconfig.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/apigatewayv2/aws-apigatewayv2-integrationresponse.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/apigatewayv2/aws-apigatewayv2-model.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/apigatewayv2/aws-apigatewayv2-route.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/apigatewayv2/aws-apigatewayv2-route_parameterconstraints.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/apigatewayv2/aws-apigatewayv2-routeresponse.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/apigatewayv2/aws-apigatewayv2-routeresponse_parameterconstraints.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/apigatewayv2/aws-apigatewayv2-stage.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/apigatewayv2/aws-apigatewayv2-stage_accesslogsettings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/apigatewayv2/aws-apigatewayv2-stage_routesettings.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/apigatewayv2/aws-apigatewayv2-vpclink.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/appconfig/aws-appconfig-application.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appconfig/aws-appconfig-application_tags.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appconfig/aws-appconfig-configurationprofile.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/appconfig/aws-appconfig-configurationprofile_tags.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appconfig/aws-appconfig-configurationprofile_validators.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appconfig/aws-appconfig-deployment.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/appconfig/aws-appconfig-deployment_tags.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appconfig/aws-appconfig-deploymentstrategy.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/appconfig/aws-appconfig-deploymentstrategy_tags.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appconfig/aws-appconfig-environment.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/appconfig/aws-appconfig-environment_monitors.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appconfig/aws-appconfig-environment_tags.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appconfig/aws-appconfig-hostedconfigurationversion.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_amplitudeconnectorprofilecredentials.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_connectoroauthrequest.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofileconfig.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofilecredentials.go (99%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofileproperties.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_datadogconnectorprofilecredentials.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_datadogconnectorprofileproperties.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_dynatraceconnectorprofilecredentials.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_dynatraceconnectorprofileproperties.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_googleanalyticsconnectorprofilecredentials.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_infornexusconnectorprofilecredentials.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_infornexusconnectorprofileproperties.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_marketoconnectorprofilecredentials.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_marketoconnectorprofileproperties.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_oauthproperties.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_redshiftconnectorprofilecredentials.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_redshiftconnectorprofileproperties.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_salesforceconnectorprofilecredentials.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_salesforceconnectorprofileproperties.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_sapodataconnectorprofilecredentials.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_sapodataconnectorprofileproperties.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_servicenowconnectorprofilecredentials.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_servicenowconnectorprofileproperties.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_singularconnectorprofilecredentials.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_slackconnectorprofilecredentials.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_slackconnectorprofileproperties.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_snowflakeconnectorprofilecredentials.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_snowflakeconnectorprofileproperties.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_trendmicroconnectorprofilecredentials.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_veevaconnectorprofilecredentials.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_veevaconnectorprofileproperties.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_zendeskconnectorprofilecredentials.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-connectorprofile_zendeskconnectorprofileproperties.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_aggregationconfig.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_amplitudesourceproperties.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_connectoroperator.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_datadogsourceproperties.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_destinationconnectorproperties.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_destinationflowconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_dynatracesourceproperties.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_errorhandlingconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_eventbridgedestinationproperties.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_googleanalyticssourceproperties.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_incrementalpullconfig.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_infornexussourceproperties.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_lookoutmetricsdestinationproperties.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_marketosourceproperties.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_prefixconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_redshiftdestinationproperties.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_s3destinationproperties.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_s3inputformatconfig.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_s3outputformatconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_s3sourceproperties.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_salesforcedestinationproperties.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_salesforcesourceproperties.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_sapodatasourceproperties.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_scheduledtriggerproperties.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_servicenowsourceproperties.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_singularsourceproperties.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_slacksourceproperties.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_snowflakedestinationproperties.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_sourceconnectorproperties.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_sourceflowconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_task.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_taskpropertiesobject.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_trendmicrosourceproperties.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_triggerconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_upsolverdestinationproperties.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_upsolvers3outputformatconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_veevasourceproperties.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_zendeskdestinationproperties.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/appflow/aws-appflow-flow_zendesksourceproperties.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/appintegrations/aws-appintegrations-eventintegration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appintegrations/aws-appintegrations-eventintegration_eventfilter.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appintegrations/aws-appintegrations-eventintegration_eventintegrationassociation.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appintegrations/aws-appintegrations-eventintegration_metadata.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_scalabletargetaction.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_scheduledaction.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_suspendedstate.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_customizedmetricspecification.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_metricdimension.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_predefinedmetricspecification.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_stepadjustment.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_stepscalingpolicyconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_targettrackingscalingpolicyconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/applicationinsights/aws-applicationinsights-application.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/applicationinsights/aws-applicationinsights-application_alarm.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/applicationinsights/aws-applicationinsights-application_alarmmetric.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/applicationinsights/aws-applicationinsights-application_componentconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/applicationinsights/aws-applicationinsights-application_componentmonitoringsetting.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/applicationinsights/aws-applicationinsights-application_configurationdetails.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/applicationinsights/aws-applicationinsights-application_customcomponent.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/applicationinsights/aws-applicationinsights-application_jmxprometheusexporter.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/applicationinsights/aws-applicationinsights-application_log.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/applicationinsights/aws-applicationinsights-application_logpattern.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/applicationinsights/aws-applicationinsights-application_logpatternset.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/applicationinsights/aws-applicationinsights-application_subcomponentconfigurationdetails.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/applicationinsights/aws-applicationinsights-application_subcomponenttypeconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/applicationinsights/aws-applicationinsights-application_windowsevent.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-gatewayroute.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutehostnamematch.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutehostnamerewrite.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutemetadatamatch.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayrouterangematch.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutespec.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutetarget.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutevirtualservice.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroute.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayrouteaction.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroutematch.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroutemetadata.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayrouterewrite.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroute.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteaction.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteheader.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteheadermatch.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroutematch.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroutepathrewrite.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteprefixrewrite.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouterewrite.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-gatewayroute_httppathmatch.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-gatewayroute_httpqueryparametermatch.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-gatewayroute_queryparameter.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-mesh.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-mesh_egressfilter.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-mesh_meshspec.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-route.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-route_duration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-route_grpcretrypolicy.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-route_grpcroute.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-route_grpcrouteaction.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-route_grpcroutematch.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-route_grpcroutemetadata.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-route_grpcroutemetadatamatchmethod.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-route_grpctimeout.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-route_headermatchmethod.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-route_httppathmatch.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-route_httpqueryparametermatch.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-route_httpretrypolicy.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-route_httproute.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-route_httprouteaction.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-route_httprouteheader.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-route_httproutematch.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-route_httptimeout.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-route_matchrange.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-route_queryparameter.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-route_routespec.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-route_tcproute.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-route_tcprouteaction.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-route_tcptimeout.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-route_weightedtarget.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualgateway.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualgateway_subjectalternativenamematchers.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualgateway_subjectalternativenames.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayaccesslog.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaybackenddefaults.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclientpolicy.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclientpolicytls.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclienttlscertificate.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayconnectionpool.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayfileaccesslog.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaygrpcconnectionpool.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhealthcheckpolicy.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhttp2connectionpool.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhttpconnectionpool.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistener.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertls.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsacmcertificate.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlscertificate.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsfilecertificate.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlssdscertificate.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsvalidationcontext.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsvalidationcontexttrust.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylogging.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayportmapping.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayspec.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontext.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextacmtrust.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextfiletrust.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextsdstrust.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontexttrust.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_accesslog.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_awscloudmapinstanceattribute.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_awscloudmapservicediscovery.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_backend.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_backenddefaults.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_clientpolicy.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_clientpolicytls.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_clienttlscertificate.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_dnsservicediscovery.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_duration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_fileaccesslog.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_grpctimeout.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_healthcheck.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_httptimeout.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_listener.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_listenertimeout.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_listenertls.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsacmcertificate.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlscertificate.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsfilecertificate.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlssdscertificate.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsvalidationcontext.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsvalidationcontexttrust.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_logging.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_outlierdetection.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_portmapping.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_servicediscovery.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_subjectalternativenamematchers.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_subjectalternativenames.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_tcptimeout.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontext.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextacmtrust.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextfiletrust.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextsdstrust.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontexttrust.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodeconnectionpool.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodegrpcconnectionpool.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodehttp2connectionpool.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodehttpconnectionpool.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodespec.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodetcpconnectionpool.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualnode_virtualservicebackend.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualrouter.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualrouter_portmapping.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualrouter_virtualrouterlistener.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualrouter_virtualrouterspec.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualservice.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualservice_virtualnodeserviceprovider.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualservice_virtualrouterserviceprovider.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualservice_virtualserviceprovider.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appmesh/aws-appmesh-virtualservice_virtualservicespec.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/apprunner/aws-apprunner-service.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/apprunner/aws-apprunner-service_authenticationconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/apprunner/aws-apprunner-service_codeconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/apprunner/aws-apprunner-service_codeconfigurationvalues.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/apprunner/aws-apprunner-service_coderepository.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/apprunner/aws-apprunner-service_encryptionconfiguration.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/apprunner/aws-apprunner-service_healthcheckconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/apprunner/aws-apprunner-service_imageconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/apprunner/aws-apprunner-service_imagerepository.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/apprunner/aws-apprunner-service_instanceconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/apprunner/aws-apprunner-service_keyvaluepair.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/apprunner/aws-apprunner-service_sourcecodeversion.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/apprunner/aws-apprunner-service_sourceconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appstream/aws-appstream-appblock.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appstream/aws-appstream-appblock_s3location.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appstream/aws-appstream-appblock_scriptdetails.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/appstream/aws-appstream-application.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appstream/aws-appstream-application_s3location.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appstream/aws-appstream-applicationfleetassociation.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appstream/aws-appstream-directoryconfig.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/appstream/aws-appstream-directoryconfig_serviceaccountcredentials.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appstream/aws-appstream-fleet.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/appstream/aws-appstream-fleet_computecapacity.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/appstream/aws-appstream-fleet_domainjoininfo.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appstream/aws-appstream-fleet_vpcconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appstream/aws-appstream-imagebuilder.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/appstream/aws-appstream-imagebuilder_accessendpoint.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appstream/aws-appstream-imagebuilder_domainjoininfo.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appstream/aws-appstream-imagebuilder_vpcconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appstream/aws-appstream-stack.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/appstream/aws-appstream-stack_accessendpoint.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appstream/aws-appstream-stack_applicationsettings.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appstream/aws-appstream-stack_storageconnector.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appstream/aws-appstream-stack_usersetting.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appstream/aws-appstream-stackfleetassociation.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appstream/aws-appstream-stackuserassociation.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/appstream/aws-appstream-user.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/appsync/aws-appsync-apicache.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/appsync/aws-appsync-apikey.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/appsync/aws-appsync-datasource.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/appsync/aws-appsync-datasource_authorizationconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appsync/aws-appsync-datasource_awsiamconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appsync/aws-appsync-datasource_deltasyncconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/appsync/aws-appsync-datasource_dynamodbconfig.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appsync/aws-appsync-datasource_elasticsearchconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appsync/aws-appsync-datasource_httpconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appsync/aws-appsync-datasource_lambdaconfig.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/appsync/aws-appsync-datasource_opensearchserviceconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appsync/aws-appsync-datasource_rdshttpendpointconfig.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appsync/aws-appsync-datasource_relationaldatabaseconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appsync/aws-appsync-functionconfiguration.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/appsync/aws-appsync-functionconfiguration_lambdaconflicthandlerconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appsync/aws-appsync-functionconfiguration_syncconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/appsync/aws-appsync-graphqlapi.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/appsync/aws-appsync-graphqlapi_additionalauthenticationprovider.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appsync/aws-appsync-graphqlapi_additionalauthenticationproviders.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/appsync/aws-appsync-graphqlapi_cognitouserpoolconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/appsync/aws-appsync-graphqlapi_lambdaauthorizerconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/appsync/aws-appsync-graphqlapi_logconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/appsync/aws-appsync-graphqlapi_openidconnectconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/appsync/aws-appsync-graphqlapi_tags.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/appsync/aws-appsync-graphqlapi_userpoolconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/appsync/aws-appsync-graphqlschema.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/appsync/aws-appsync-resolver.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/appsync/aws-appsync-resolver_cachingconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appsync/aws-appsync-resolver_lambdaconflicthandlerconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/appsync/aws-appsync-resolver_pipelineconfig.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/appsync/aws-appsync-resolver_syncconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/aps/aws-aps-rulegroupsnamespace.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/aps/aws-aps-workspace.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ask/alexa-ask-skill.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ask/alexa-ask-skill_authenticationconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ask/alexa-ask-skill_overrides.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ask/alexa-ask-skill_skillpackage.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/athena/aws-athena-datacatalog.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/athena/aws-athena-datacatalog_tags.go (90%)
 rename {goformation => pkg/goformation}/cloudformation/athena/aws-athena-namedquery.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/athena/aws-athena-preparedstatement.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/athena/aws-athena-workgroup.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/athena/aws-athena-workgroup_encryptionconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/athena/aws-athena-workgroup_engineversion.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/athena/aws-athena-workgroup_resultconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/athena/aws-athena-workgroup_resultconfigurationupdates.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/athena/aws-athena-workgroup_tags.go (90%)
 rename {goformation => pkg/goformation}/cloudformation/athena/aws-athena-workgroup_workgroupconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/athena/aws-athena-workgroup_workgroupconfigurationupdates.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/auditmanager/aws-auditmanager-assessment.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/auditmanager/aws-auditmanager-assessment_assessmentreportsdestination.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/auditmanager/aws-auditmanager-assessment_awsaccount.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/auditmanager/aws-auditmanager-assessment_awsservice.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/auditmanager/aws-auditmanager-assessment_delegation.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/auditmanager/aws-auditmanager-assessment_role.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/auditmanager/aws-auditmanager-assessment_scope.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_acceleratorcountrequest.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_acceleratortotalmemorymibrequest.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_baselineebsbandwidthmbpsrequest.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_instancerequirements.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_instancesdistribution.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplate.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplateoverrides.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplatespecification.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_lifecyclehookspecification.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_memorygibpervcpurequest.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_memorymibrequest.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_metricscollection.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_mixedinstancespolicy.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_networkinterfacecountrequest.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_notificationconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_tagproperty.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_totallocalstoragegbrequest.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_vcpucountrequest.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-launchconfiguration.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_blockdevice.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_blockdevicemapping.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_metadataoption.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_metadataoptions.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-lifecyclehook.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-scalingpolicy.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_customizedmetricspecification.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_metricdimension.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predefinedmetricspecification.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingmetricspecification.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedloadmetric.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedmetricpair.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedscalingmetric.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_stepadjustment.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_targettrackingconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-scheduledaction.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/autoscaling/aws-autoscaling-warmpool.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_applicationsource.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_customizedloadmetricspecification.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_customizedscalingmetricspecification.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_metricdimension.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_predefinedloadmetricspecification.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_predefinedscalingmetricspecification.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_scalinginstruction.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_tagfilter.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_targettrackingconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/backup/aws-backup-backupplan.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/backup/aws-backup-backupplan_advancedbackupsettingresourcetype.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/backup/aws-backup-backupplan_backupplanresourcetype.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/backup/aws-backup-backupplan_backupruleresourcetype.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/backup/aws-backup-backupplan_copyactionresourcetype.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/backup/aws-backup-backupplan_lifecycleresourcetype.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/backup/aws-backup-backupselection.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/backup/aws-backup-backupselection_backupselectionresourcetype.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/backup/aws-backup-backupselection_conditionresourcetype.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/backup/aws-backup-backupvault.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/backup/aws-backup-backupvault_lockconfigurationtype.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/backup/aws-backup-backupvault_notificationobjecttype.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/backup/aws-backup-framework.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/backup/aws-backup-framework_controlinputparameter.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/backup/aws-backup-framework_frameworkcontrol.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/backup/aws-backup-reportplan.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/batch/aws-batch-computeenvironment.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/batch/aws-batch-computeenvironment_computeresources.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/batch/aws-batch-computeenvironment_ec2configurationobject.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/batch/aws-batch-computeenvironment_launchtemplatespecification.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/batch/aws-batch-jobdefinition.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/batch/aws-batch-jobdefinition_authorizationconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/batch/aws-batch-jobdefinition_containerproperties.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/batch/aws-batch-jobdefinition_device.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/batch/aws-batch-jobdefinition_efsvolumeconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/batch/aws-batch-jobdefinition_environment.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/batch/aws-batch-jobdefinition_evaluateonexit.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/batch/aws-batch-jobdefinition_fargateplatformconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/batch/aws-batch-jobdefinition_linuxparameters.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/batch/aws-batch-jobdefinition_logconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/batch/aws-batch-jobdefinition_mountpoints.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/batch/aws-batch-jobdefinition_networkconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/batch/aws-batch-jobdefinition_nodeproperties.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/batch/aws-batch-jobdefinition_noderangeproperty.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/batch/aws-batch-jobdefinition_resourcerequirement.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/batch/aws-batch-jobdefinition_retrystrategy.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/batch/aws-batch-jobdefinition_secret.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/batch/aws-batch-jobdefinition_timeout.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/batch/aws-batch-jobdefinition_tmpfs.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/batch/aws-batch-jobdefinition_ulimit.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/batch/aws-batch-jobdefinition_volumes.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/batch/aws-batch-jobdefinition_volumeshost.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/batch/aws-batch-jobqueue.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/batch/aws-batch-jobqueue_computeenvironmentorder.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/batch/aws-batch-schedulingpolicy.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/batch/aws-batch-schedulingpolicy_fairsharepolicy.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/batch/aws-batch-schedulingpolicy_shareattributes.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/budgets/aws-budgets-budget.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/budgets/aws-budgets-budget_budgetdata.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/budgets/aws-budgets-budget_costtypes.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/budgets/aws-budgets-budget_notification.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/budgets/aws-budgets-budget_notificationwithsubscribers.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/budgets/aws-budgets-budget_spend.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/budgets/aws-budgets-budget_subscriber.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/budgets/aws-budgets-budget_timeperiod.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/budgets/aws-budgets-budgetsaction.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/budgets/aws-budgets-budgetsaction_actionthreshold.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/budgets/aws-budgets-budgetsaction_definition.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/budgets/aws-budgets-budgetsaction_iamactiondefinition.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/budgets/aws-budgets-budgetsaction_scpactiondefinition.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/budgets/aws-budgets-budgetsaction_ssmactiondefinition.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/budgets/aws-budgets-budgetsaction_subscriber.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/cassandra/aws-cassandra-keyspace.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/cassandra/aws-cassandra-table.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/cassandra/aws-cassandra-table_billingmode.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/cassandra/aws-cassandra-table_clusteringkeycolumn.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/cassandra/aws-cassandra-table_column.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/cassandra/aws-cassandra-table_encryptionspecification.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cassandra/aws-cassandra-table_provisionedthroughput.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ce/aws-ce-anomalymonitor.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ce/aws-ce-anomalysubscription.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ce/aws-ce-anomalysubscription_subscriber.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ce/aws-ce-costcategory.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/certificatemanager/aws-certificatemanager-account.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/certificatemanager/aws-certificatemanager-account_expiryeventsconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/certificatemanager/aws-certificatemanager-certificate.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/certificatemanager/aws-certificatemanager-certificate_domainvalidationoption.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/chatbot/aws-chatbot-slackchannelconfiguration.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/cloud9/aws-cloud9-environmentec2.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/cloud9/aws-cloud9-environmentec2_repository.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cloudformation/aws-cloudformation-customresource.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/cloudformation/aws-cloudformation-macro.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/cloudformation/aws-cloudformation-moduledefaultversion.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/cloudformation/aws-cloudformation-moduleversion.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/cloudformation/aws-cloudformation-publictypeversion.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/cloudformation/aws-cloudformation-publisher.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/cloudformation/aws-cloudformation-resourcedefaultversion.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/cloudformation/aws-cloudformation-resourceversion.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/cloudformation/aws-cloudformation-resourceversion_loggingconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cloudformation/aws-cloudformation-stack.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/cloudformation/aws-cloudformation-stackset.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/cloudformation/aws-cloudformation-stackset_autodeployment.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cloudformation/aws-cloudformation-stackset_deploymenttargets.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cloudformation/aws-cloudformation-stackset_operationpreferences.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/cloudformation/aws-cloudformation-stackset_parameter.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/cloudformation/aws-cloudformation-stackset_stackinstances.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/cloudformation/aws-cloudformation-typeactivation.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/cloudformation/aws-cloudformation-typeactivation_loggingconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cloudformation/aws-cloudformation-waitcondition.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/cloudformation/aws-cloudformation-waitconditionhandle.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/cloudformation/tag.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/cloudformation_suite_test.go (100%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-cachepolicy.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-cachepolicy_cachepolicyconfig.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-cachepolicy_cookiesconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-cachepolicy_headersconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-cachepolicy_parametersincachekeyandforwardedtoorigin.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-cachepolicy_querystringsconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-cloudfrontoriginaccessidentity.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-cloudfrontoriginaccessidentity_cloudfrontoriginaccessidentityconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-distribution.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-distribution_cachebehavior.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-distribution_cookies.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-distribution_customerrorresponse.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-distribution_customoriginconfig.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-distribution_defaultcachebehavior.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-distribution_distributionconfig.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-distribution_forwardedvalues.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-distribution_functionassociation.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-distribution_georestriction.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-distribution_lambdafunctionassociation.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-distribution_legacycustomorigin.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-distribution_legacys3origin.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-distribution_logging.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-distribution_origin.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-distribution_origincustomheader.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-distribution_origingroup.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupfailovercriteria.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupmember.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupmembers.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-distribution_origingroups.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-distribution_originshield.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-distribution_restrictions.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-distribution_s3originconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-distribution_statuscodes.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-distribution_viewercertificate.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-function.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-function_functionconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-function_functionmetadata.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-keygroup.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-keygroup_keygroupconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_cookiesconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_headersconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_originrequestpolicyconfig.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_querystringsconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-publickey.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-publickey_publickeyconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig_endpoint.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig_kinesisstreamconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolallowheaders.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolallowmethods.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolalloworigins.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolexposeheaders.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_contentsecuritypolicy.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_contenttypeoptions.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_corsconfig.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_customheader.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_customheadersconfig.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_frameoptions.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_referrerpolicy.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_responseheaderspolicyconfig.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_securityheadersconfig.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_stricttransportsecurity.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_xssprotection.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-streamingdistribution.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_logging.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_s3origin.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_streamingdistributionconfig.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_trustedsigners.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cloudtrail/aws-cloudtrail-trail.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/cloudtrail/aws-cloudtrail-trail_dataresource.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/cloudtrail/aws-cloudtrail-trail_eventselector.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/cloudtrail/aws-cloudtrail-trail_insightselector.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/cloudwatch/aws-cloudwatch-alarm.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/cloudwatch/aws-cloudwatch-alarm_dimension.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/cloudwatch/aws-cloudwatch-alarm_metric.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cloudwatch/aws-cloudwatch-alarm_metricdataquery.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/cloudwatch/aws-cloudwatch-alarm_metricstat.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_configuration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_dimension.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metric.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricdataqueries.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricdataquery.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricmathanomalydetector.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricstat.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_range.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_singlemetricanomalydetector.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/cloudwatch/aws-cloudwatch-compositealarm.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/cloudwatch/aws-cloudwatch-dashboard.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/cloudwatch/aws-cloudwatch-insightrule.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/cloudwatch/aws-cloudwatch-insightrule_tags.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/cloudwatch/aws-cloudwatch-metricstream.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/cloudwatch/aws-cloudwatch-metricstream_metricstreamfilter.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/codeartifact/aws-codeartifact-domain.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/codeartifact/aws-codeartifact-repository.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/codebuild/aws-codebuild-project.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/codebuild/aws-codebuild-project_artifacts.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/codebuild/aws-codebuild-project_batchrestrictions.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codebuild/aws-codebuild-project_buildstatusconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/codebuild/aws-codebuild-project_cloudwatchlogsconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codebuild/aws-codebuild-project_environment.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/codebuild/aws-codebuild-project_environmentvariable.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codebuild/aws-codebuild-project_filtergroup.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/codebuild/aws-codebuild-project_gitsubmodulesconfig.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/codebuild/aws-codebuild-project_logsconfig.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/codebuild/aws-codebuild-project_projectbuildbatchconfig.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/codebuild/aws-codebuild-project_projectcache.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codebuild/aws-codebuild-project_projectfilesystemlocation.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/codebuild/aws-codebuild-project_projectsourceversion.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codebuild/aws-codebuild-project_projecttriggers.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codebuild/aws-codebuild-project_registrycredential.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codebuild/aws-codebuild-project_s3logsconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codebuild/aws-codebuild-project_source.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/codebuild/aws-codebuild-project_sourceauth.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/codebuild/aws-codebuild-project_vpcconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codebuild/aws-codebuild-project_webhookfilter.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codebuild/aws-codebuild-reportgroup.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/codebuild/aws-codebuild-reportgroup_reportexportconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codebuild/aws-codebuild-reportgroup_s3reportexportconfig.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/codebuild/aws-codebuild-sourcecredential.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/codecommit/aws-codecommit-repository.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/codecommit/aws-codecommit-repository_code.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/codecommit/aws-codecommit-repository_repositorytrigger.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/codecommit/aws-codecommit-repository_s3.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codedeploy/aws-codedeploy-application.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/codedeploy/aws-codedeploy-deploymentconfig.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_minimumhealthyhosts.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_timebasedcanary.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_timebasedlinear.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_trafficroutingconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/codedeploy/aws-codedeploy-deploymentgroup.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_alarm.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_alarmconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_autorollbackconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_bluegreendeploymentconfiguration.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_blueinstanceterminationoption.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deployment.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deploymentreadyoption.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deploymentstyle.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagfilter.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagset.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagsetlistobject.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ecsservice.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_elbinfo.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_githublocation.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_greenfleetprovisioningoption.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_loadbalancerinfo.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_onpremisestagset.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_onpremisestagsetlistobject.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_revisionlocation.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_s3location.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_tagfilter.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_targetgroupinfo.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_triggerconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/codeguruprofiler/aws-codeguruprofiler-profilinggroup.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/codeguruprofiler/aws-codeguruprofiler-profilinggroup_channel.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codegurureviewer/aws-codegurureviewer-repositoryassociation.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/codepipeline/aws-codepipeline-customactiontype.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/codepipeline/aws-codepipeline-customactiontype_artifactdetails.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codepipeline/aws-codepipeline-customactiontype_configurationproperties.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/codepipeline/aws-codepipeline-customactiontype_settings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/codepipeline/aws-codepipeline-pipeline.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/codepipeline/aws-codepipeline-pipeline_actiondeclaration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/codepipeline/aws-codepipeline-pipeline_actiontypeid.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/codepipeline/aws-codepipeline-pipeline_artifactstore.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codepipeline/aws-codepipeline-pipeline_artifactstoremap.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codepipeline/aws-codepipeline-pipeline_blockerdeclaration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/codepipeline/aws-codepipeline-pipeline_encryptionkey.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codepipeline/aws-codepipeline-pipeline_inputartifact.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/codepipeline/aws-codepipeline-pipeline_outputartifact.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/codepipeline/aws-codepipeline-pipeline_stagedeclaration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codepipeline/aws-codepipeline-pipeline_stagetransition.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codepipeline/aws-codepipeline-webhook.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/codepipeline/aws-codepipeline-webhook_webhookauthconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codepipeline/aws-codepipeline-webhook_webhookfilterrule.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codestar/aws-codestar-githubrepository.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/codestar/aws-codestar-githubrepository_code.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/codestar/aws-codestar-githubrepository_s3.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/codestarconnections/aws-codestarconnections-connection.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/codestarnotifications/aws-codestarnotifications-notificationrule.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/codestarnotifications/aws-codestarnotifications-notificationrule_target.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-identitypool.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-identitypool_cognitoidentityprovider.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-identitypool_cognitostreams.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-identitypool_pushsync.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-identitypoolroleattachment.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-identitypoolroleattachment_mappingrule.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-identitypoolroleattachment_rolemapping.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-identitypoolroleattachment_rulesconfigurationtype.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpool.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpool_accountrecoverysetting.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpool_admincreateuserconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpool_customemailsender.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpool_customsmssender.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpool_deviceconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpool_emailconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpool_invitemessagetemplate.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpool_lambdaconfig.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpool_numberattributeconstraints.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpool_passwordpolicy.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpool_policies.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpool_recoveryoption.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpool_schemaattribute.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpool_smsconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpool_stringattributeconstraints.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpool_usernameconfiguration.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpool_userpooladdons.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpool_verificationmessagetemplate.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpoolclient.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpoolclient_analyticsconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpoolclient_tokenvalidityunits.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpooldomain.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpooldomain_customdomainconfigtype.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpoolgroup.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpoolidentityprovider.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpoolresourceserver.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpoolresourceserver_resourceserverscopetype.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoveractionstype.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoveractiontype.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoverriskconfigurationtype.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_compromisedcredentialsactionstype.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_compromisedcredentialsriskconfigurationtype.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_notifyconfigurationtype.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_notifyemailtype.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_riskexceptionconfigurationtype.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpooluicustomizationattachment.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpooluser.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpooluser_attributetype.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/cognito/aws-cognito-userpoolusertogroupattachment.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/config/aws-config-aggregationauthorization.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/config/aws-config-configrule.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/config/aws-config-configrule_scope.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/config/aws-config-configrule_source.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/config/aws-config-configrule_sourcedetail.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/config/aws-config-configurationaggregator.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/config/aws-config-configurationaggregator_accountaggregationsource.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/config/aws-config-configurationaggregator_organizationaggregationsource.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/config/aws-config-configurationrecorder.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/config/aws-config-configurationrecorder_recordinggroup.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/config/aws-config-conformancepack.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/config/aws-config-conformancepack_conformancepackinputparameter.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/config/aws-config-deliverychannel.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/config/aws-config-deliverychannel_configsnapshotdeliveryproperties.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/config/aws-config-organizationconfigrule.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/config/aws-config-organizationconfigrule_organizationcustomrulemetadata.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/config/aws-config-organizationconfigrule_organizationmanagedrulemetadata.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/config/aws-config-organizationconformancepack.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/config/aws-config-organizationconformancepack_conformancepackinputparameter.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/config/aws-config-remediationconfiguration.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/config/aws-config-remediationconfiguration_executioncontrols.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/config/aws-config-remediationconfiguration_remediationparametervalue.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/config/aws-config-remediationconfiguration_resourcevalue.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/config/aws-config-remediationconfiguration_ssmcontrols.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/config/aws-config-remediationconfiguration_staticvalue.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/config/aws-config-storedquery.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/connect/aws-connect-contactflow.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/connect/aws-connect-contactflowmodule.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/connect/aws-connect-hoursofoperation.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/connect/aws-connect-hoursofoperation_hoursofoperationconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/connect/aws-connect-hoursofoperation_hoursofoperationtimeslice.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/connect/aws-connect-quickconnect.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/connect/aws-connect-quickconnect_phonenumberquickconnectconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/connect/aws-connect-quickconnect_queuequickconnectconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/connect/aws-connect-quickconnect_quickconnectconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/connect/aws-connect-quickconnect_userquickconnectconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/connect/aws-connect-user.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/connect/aws-connect-user_useridentityinfo.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/connect/aws-connect-user_userphoneconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/connect/aws-connect-userhierarchygroup.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/cur/aws-cur-reportdefinition.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/custom_resource.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/customerprofiles/aws-customerprofiles-domain.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/customerprofiles/aws-customerprofiles-integration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/customerprofiles/aws-customerprofiles-integration_connectoroperator.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/customerprofiles/aws-customerprofiles-integration_flowdefinition.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/customerprofiles/aws-customerprofiles-integration_incrementalpullconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/customerprofiles/aws-customerprofiles-integration_marketosourceproperties.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/customerprofiles/aws-customerprofiles-integration_s3sourceproperties.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/customerprofiles/aws-customerprofiles-integration_salesforcesourceproperties.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/customerprofiles/aws-customerprofiles-integration_scheduledtriggerproperties.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/customerprofiles/aws-customerprofiles-integration_servicenowsourceproperties.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/customerprofiles/aws-customerprofiles-integration_sourceconnectorproperties.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/customerprofiles/aws-customerprofiles-integration_sourceflowconfig.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/customerprofiles/aws-customerprofiles-integration_task.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/customerprofiles/aws-customerprofiles-integration_taskpropertiesmap.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/customerprofiles/aws-customerprofiles-integration_triggerconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/customerprofiles/aws-customerprofiles-integration_triggerproperties.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/customerprofiles/aws-customerprofiles-integration_zendesksourceproperties.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/customerprofiles/aws-customerprofiles-objecttype.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/customerprofiles/aws-customerprofiles-objecttype_fieldmap.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/customerprofiles/aws-customerprofiles-objecttype_keymap.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/customerprofiles/aws-customerprofiles-objecttype_objecttypefield.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/customerprofiles/aws-customerprofiles-objecttype_objecttypekey.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-dataset.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-dataset_csvoptions.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-dataset_databaseinputdefinition.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-dataset_datacataloginputdefinition.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-dataset_datasetparameter.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-dataset_datetimeoptions.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-dataset_exceloptions.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-dataset_fileslimit.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-dataset_filterexpression.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-dataset_filtervalue.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-dataset_formatoptions.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-dataset_input.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-dataset_jsonoptions.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-dataset_metadata.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-dataset_pathoptions.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-dataset_pathparameter.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-dataset_s3location.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-job.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-job_allowedstatistics.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-job_columnselector.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-job_columnstatisticsconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-job_csvoutputoptions.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-job_databaseoutput.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-job_databasetableoutputoptions.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-job_datacatalogoutput.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-job_entitydetectorconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-job_jobsample.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-job_output.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-job_outputformatoptions.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-job_outputlocation.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-job_parametermap.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-job_profileconfiguration.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-job_recipe.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-job_s3location.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-job_s3tableoutputoptions.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-job_statisticoverride.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-job_statisticsconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-job_validationconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-project.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-project_sample.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-recipe.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-recipe_action.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-recipe_conditionexpression.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-recipe_datacataloginputdefinition.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-recipe_parametermap.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-recipe_recipeparameters.go (99%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-recipe_recipestep.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-recipe_s3location.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-recipe_secondaryinput.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-ruleset.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-ruleset_columnselector.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-ruleset_rule.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-ruleset_substitutionvalue.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-ruleset_threshold.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/databrew/aws-databrew-schedule.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/datapipeline/aws-datapipeline-pipeline.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/datapipeline/aws-datapipeline-pipeline_field.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/datapipeline/aws-datapipeline-pipeline_parameterattribute.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/datapipeline/aws-datapipeline-pipeline_parameterobject.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/datapipeline/aws-datapipeline-pipeline_parametervalue.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/datapipeline/aws-datapipeline-pipeline_pipelineobject.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/datapipeline/aws-datapipeline-pipeline_pipelinetag.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/datasync/aws-datasync-agent.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/datasync/aws-datasync-locationefs.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/datasync/aws-datasync-locationefs_ec2config.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/datasync/aws-datasync-locationfsxwindows.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/datasync/aws-datasync-locationhdfs.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/datasync/aws-datasync-locationhdfs_namenode.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/datasync/aws-datasync-locationhdfs_qopconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/datasync/aws-datasync-locationnfs.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/datasync/aws-datasync-locationnfs_mountoptions.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/datasync/aws-datasync-locationnfs_onpremconfig.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/datasync/aws-datasync-locationobjectstorage.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/datasync/aws-datasync-locations3.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/datasync/aws-datasync-locations3_s3config.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/datasync/aws-datasync-locationsmb.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/datasync/aws-datasync-locationsmb_mountoptions.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/datasync/aws-datasync-task.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/datasync/aws-datasync-task_filterrule.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/datasync/aws-datasync-task_options.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/datasync/aws-datasync-task_taskschedule.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/dax/aws-dax-cluster.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/dax/aws-dax-cluster_ssespecification.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/dax/aws-dax-parametergroup.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/dax/aws-dax-subnetgroup.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/detective/aws-detective-graph.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/detective/aws-detective-memberinvitation.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/devopsguru/aws-devopsguru-notificationchannel.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/devopsguru/aws-devopsguru-notificationchannel_notificationchannelconfig.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/devopsguru/aws-devopsguru-notificationchannel_snschannelconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/devopsguru/aws-devopsguru-resourcecollection.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/devopsguru/aws-devopsguru-resourcecollection_cloudformationcollectionfilter.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/devopsguru/aws-devopsguru-resourcecollection_resourcecollectionfilter.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/directoryservice/aws-directoryservice-microsoftad.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/directoryservice/aws-directoryservice-microsoftad_vpcsettings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/directoryservice/aws-directoryservice-simplead.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/directoryservice/aws-directoryservice-simplead_vpcsettings.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/dlm/aws-dlm-lifecyclepolicy.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/dlm/aws-dlm-lifecyclepolicy_action.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/dlm/aws-dlm-lifecyclepolicy_createrule.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyaction.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopydeprecaterule.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyretainrule.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyrule.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/dlm/aws-dlm-lifecyclepolicy_deprecaterule.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/dlm/aws-dlm-lifecyclepolicy_encryptionconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/dlm/aws-dlm-lifecyclepolicy_eventparameters.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/dlm/aws-dlm-lifecyclepolicy_eventsource.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/dlm/aws-dlm-lifecyclepolicy_fastrestorerule.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/dlm/aws-dlm-lifecyclepolicy_parameters.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/dlm/aws-dlm-lifecyclepolicy_policydetails.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/dlm/aws-dlm-lifecyclepolicy_retainrule.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/dlm/aws-dlm-lifecyclepolicy_schedule.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/dlm/aws-dlm-lifecyclepolicy_sharerule.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/dms/aws-dms-certificate.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/dms/aws-dms-endpoint.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/dms/aws-dms-endpoint_docdbsettings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/dms/aws-dms-endpoint_dynamodbsettings.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/dms/aws-dms-endpoint_elasticsearchsettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/dms/aws-dms-endpoint_ibmdb2settings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/dms/aws-dms-endpoint_kafkasettings.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/dms/aws-dms-endpoint_kinesissettings.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/dms/aws-dms-endpoint_microsoftsqlserversettings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/dms/aws-dms-endpoint_mongodbsettings.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/dms/aws-dms-endpoint_mysqlsettings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/dms/aws-dms-endpoint_neptunesettings.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/dms/aws-dms-endpoint_oraclesettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/dms/aws-dms-endpoint_postgresqlsettings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/dms/aws-dms-endpoint_redissettings.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/dms/aws-dms-endpoint_redshiftsettings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/dms/aws-dms-endpoint_s3settings.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/dms/aws-dms-endpoint_sybasesettings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/dms/aws-dms-eventsubscription.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/dms/aws-dms-replicationinstance.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/dms/aws-dms-replicationsubnetgroup.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/dms/aws-dms-replicationtask.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/docdb/aws-docdb-dbcluster.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/docdb/aws-docdb-dbclusterparametergroup.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/docdb/aws-docdb-dbinstance.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/docdb/aws-docdb-dbsubnetgroup.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/dynamodb/aws-dynamodb-globaltable.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/dynamodb/aws-dynamodb-globaltable_attributedefinition.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/dynamodb/aws-dynamodb-globaltable_capacityautoscalingsettings.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/dynamodb/aws-dynamodb-globaltable_contributorinsightsspecification.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/dynamodb/aws-dynamodb-globaltable_globalsecondaryindex.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/dynamodb/aws-dynamodb-globaltable_keyschema.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/dynamodb/aws-dynamodb-globaltable_localsecondaryindex.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/dynamodb/aws-dynamodb-globaltable_pointintimerecoveryspecification.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/dynamodb/aws-dynamodb-globaltable_projection.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/dynamodb/aws-dynamodb-globaltable_readprovisionedthroughputsettings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/dynamodb/aws-dynamodb-globaltable_replicaglobalsecondaryindexspecification.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/dynamodb/aws-dynamodb-globaltable_replicaspecification.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/dynamodb/aws-dynamodb-globaltable_replicassespecification.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/dynamodb/aws-dynamodb-globaltable_ssespecification.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/dynamodb/aws-dynamodb-globaltable_streamspecification.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/dynamodb/aws-dynamodb-globaltable_targettrackingscalingpolicyconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/dynamodb/aws-dynamodb-globaltable_timetolivespecification.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/dynamodb/aws-dynamodb-globaltable_writeprovisionedthroughputsettings.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/dynamodb/aws-dynamodb-table.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/dynamodb/aws-dynamodb-table_attributedefinition.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/dynamodb/aws-dynamodb-table_contributorinsightsspecification.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/dynamodb/aws-dynamodb-table_globalsecondaryindex.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/dynamodb/aws-dynamodb-table_keyschema.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/dynamodb/aws-dynamodb-table_kinesisstreamspecification.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/dynamodb/aws-dynamodb-table_localsecondaryindex.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/dynamodb/aws-dynamodb-table_pointintimerecoveryspecification.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/dynamodb/aws-dynamodb-table_projection.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/dynamodb/aws-dynamodb-table_provisionedthroughput.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/dynamodb/aws-dynamodb-table_ssespecification.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/dynamodb/aws-dynamodb-table_streamspecification.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/dynamodb/aws-dynamodb-table_timetolivespecification.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-capacityreservation.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-capacityreservation_tagspecification.go (89%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-capacityreservationfleet.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-capacityreservationfleet_instancetypespecification.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-capacityreservationfleet_tagspecification.go (90%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-carriergateway.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-carriergateway_tags.go (90%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-clientvpnauthorizationrule.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-clientvpnendpoint.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-clientvpnendpoint_certificateauthenticationrequest.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-clientvpnendpoint_clientauthenticationrequest.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-clientvpnendpoint_clientconnectoptions.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-clientvpnendpoint_connectionlogoptions.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-clientvpnendpoint_directoryserviceauthenticationrequest.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-clientvpnendpoint_federatedauthenticationrequest.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-clientvpnendpoint_tagspecification.go (89%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-clientvpnroute.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-clientvpntargetnetworkassociation.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-customergateway.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-dhcpoptions.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-ec2fleet.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-ec2fleet_acceleratorcountrequest.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-ec2fleet_acceleratortotalmemorymibrequest.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-ec2fleet_baselineebsbandwidthmbpsrequest.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-ec2fleet_capacityrebalance.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-ec2fleet_capacityreservationoptionsrequest.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplateconfigrequest.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplateoverridesrequest.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplatespecificationrequest.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-ec2fleet_instancerequirementsrequest.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-ec2fleet_maintenancestrategies.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-ec2fleet_memorygibpervcpurequest.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-ec2fleet_memorymibrequest.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-ec2fleet_networkinterfacecountrequest.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-ec2fleet_ondemandoptionsrequest.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-ec2fleet_placement.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-ec2fleet_spotoptionsrequest.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-ec2fleet_tagspecification.go (89%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-ec2fleet_targetcapacityspecificationrequest.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-ec2fleet_totallocalstoragegbrequest.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-ec2fleet_vcpucountrangerequest.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-egressonlyinternetgateway.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-eip.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-eipassociation.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-enclavecertificateiamroleassociation.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-flowlog.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-gatewayroutetableassociation.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-host.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-instance.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-instance_associationparameter.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-instance_blockdevicemapping.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-instance_cpuoptions.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-instance_creditspecification.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-instance_ebs.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-instance_elasticgpuspecification.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-instance_elasticinferenceaccelerator.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-instance_enclaveoptions.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-instance_hibernationoptions.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-instance_instanceipv6address.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-instance_launchtemplatespecification.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-instance_licensespecification.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-instance_networkinterface.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-instance_nodevice.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-instance_privateipaddressspecification.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-instance_ssmassociation.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-instance_volume.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-internetgateway.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-ipam.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-ipam_ipamoperatingregion.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-ipamallocation.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-ipampool.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-ipampool_provisionedcidr.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-ipamscope.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-launchtemplate.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-launchtemplate_acceleratorcount.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-launchtemplate_acceleratortotalmemorymib.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-launchtemplate_baselineebsbandwidthmbps.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-launchtemplate_blockdevicemapping.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-launchtemplate_capacityreservationspecification.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-launchtemplate_capacityreservationtarget.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-launchtemplate_cpuoptions.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-launchtemplate_creditspecification.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-launchtemplate_ebs.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-launchtemplate_elasticgpuspecification.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-launchtemplate_enclaveoptions.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-launchtemplate_hibernationoptions.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-launchtemplate_iaminstanceprofile.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-launchtemplate_instancemarketoptions.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-launchtemplate_ipv6add.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplatedata.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplateelasticinferenceaccelerator.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplatetagspecification.go (90%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-launchtemplate_licensespecification.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-launchtemplate_memorygibpervcpu.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-launchtemplate_memorymib.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-launchtemplate_metadataoptions.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-launchtemplate_monitoring.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-launchtemplate_networkinterface.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-launchtemplate_networkinterfacecount.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-launchtemplate_placement.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-launchtemplate_privateipadd.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-launchtemplate_spotoptions.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-launchtemplate_tagspecification.go (89%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-launchtemplate_totallocalstoragegb.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-launchtemplate_vcpucount.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-localgatewayroute.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-localgatewayroutetablevpcassociation.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-localgatewayroutetablevpcassociation_tags.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-natgateway.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-networkacl.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-networkaclentry.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-networkaclentry_icmp.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-networkaclentry_portrange.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-networkinsightsanalysis.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-networkinsightsanalysis_alternatepathhint.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisaclrule.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysiscomponent.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisloadbalancerlistener.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisloadbalancertarget.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysispacketheader.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisroutetableroute.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysissecuritygrouprule.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-networkinsightsanalysis_explanation.go (99%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-networkinsightsanalysis_pathcomponent.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-networkinsightsanalysis_portrange.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-networkinsightspath.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-networkinterface.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-networkinterface_instanceipv6address.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-networkinterface_privateipaddressspecification.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-networkinterfaceattachment.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-networkinterfacepermission.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-placementgroup.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-prefixlist.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-prefixlist_entry.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-route.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-routetable.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-securitygroup.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-securitygroup_egress.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-securitygroup_ingress.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-securitygroupegress.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-securitygroupingress.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-spotfleet.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-spotfleet_acceleratorcountrequest.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-spotfleet_acceleratortotalmemorymibrequest.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-spotfleet_baselineebsbandwidthmbpsrequest.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-spotfleet_blockdevicemapping.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-spotfleet_classicloadbalancer.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-spotfleet_classicloadbalancersconfig.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-spotfleet_ebsblockdevice.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-spotfleet_fleetlaunchtemplatespecification.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-spotfleet_groupidentifier.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-spotfleet_iaminstanceprofilespecification.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-spotfleet_instanceipv6address.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-spotfleet_instancenetworkinterfacespecification.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-spotfleet_instancerequirementsrequest.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-spotfleet_launchtemplateconfig.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-spotfleet_launchtemplateoverrides.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-spotfleet_loadbalancersconfig.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-spotfleet_memorygibpervcpurequest.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-spotfleet_memorymibrequest.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-spotfleet_networkinterfacecountrequest.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-spotfleet_privateipaddressspecification.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-spotfleet_spotcapacityrebalance.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-spotfleet_spotfleetlaunchspecification.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-spotfleet_spotfleetmonitoring.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-spotfleet_spotfleetrequestconfigdata.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-spotfleet_spotfleettagspecification.go (89%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-spotfleet_spotmaintenancestrategies.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-spotfleet_spotplacement.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-spotfleet_targetgroup.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-spotfleet_targetgroupsconfig.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-spotfleet_totallocalstoragegbrequest.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-spotfleet_vcpucountrangerequest.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-subnet.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-subnet_privatednsnameoptionsonlaunch.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-subnetcidrblock.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-subnetnetworkaclassociation.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-subnetroutetableassociation.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-trafficmirrorfilter.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-trafficmirrorfilterrule.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-trafficmirrorfilterrule_trafficmirrorportrange.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-trafficmirrorsession.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-trafficmirrortarget.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-transitgateway.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-transitgatewayattachment.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-transitgatewayconnect.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-transitgatewayconnect_transitgatewayconnectoptions.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-transitgatewaymulticastdomain.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-transitgatewaymulticastdomainassociation.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-transitgatewaymulticastgroupmember.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-transitgatewaymulticastgroupsource.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-transitgatewaypeeringattachment.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-transitgatewaypeeringattachment_transitgatewaypeeringattachmentoptions.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-transitgatewayroute.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-transitgatewayroutetable.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-transitgatewayroutetableassociation.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-transitgatewayroutetablepropagation.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-transitgatewayvpcattachment.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-volume.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-volumeattachment.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-vpc.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-vpccidrblock.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-vpcdhcpoptionsassociation.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-vpcendpoint.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-vpcendpointconnectionnotification.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-vpcendpointservice.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-vpcendpointservicepermissions.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-vpcgatewayattachment.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-vpcpeeringconnection.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-vpnconnection.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-vpnconnection_vpntunneloptionsspecification.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-vpnconnectionroute.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-vpngateway.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ec2/aws-ec2-vpngatewayroutepropagation.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ecr/aws-ecr-publicrepository.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ecr/aws-ecr-registrypolicy.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/ecr/aws-ecr-replicationconfiguration.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationdestination.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationrule.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ecr/aws-ecr-replicationconfiguration_repositoryfilter.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ecr/aws-ecr-repository.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ecr/aws-ecr-repository_encryptionconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ecr/aws-ecr-repository_imagescanningconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ecr/aws-ecr-repository_lifecyclepolicy.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-capacityprovider.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-capacityprovider_autoscalinggroupprovider.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-capacityprovider_managedscaling.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-cluster.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-cluster_capacityproviderstrategyitem.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-cluster_clusterconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-cluster_clustersettings.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-cluster_executecommandconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-cluster_executecommandlogconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-clustercapacityproviderassociations.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-clustercapacityproviderassociations_capacityproviderstrategy.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-primarytaskset.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-service.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-service_awsvpcconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-service_capacityproviderstrategyitem.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-service_deploymentcircuitbreaker.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-service_deploymentconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-service_deploymentcontroller.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-service_loadbalancer.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-service_networkconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-service_placementconstraint.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-service_placementstrategy.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-service_serviceregistry.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskdefinition.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskdefinition_authorizationconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskdefinition_containerdefinition.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskdefinition_containerdependency.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskdefinition_device.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskdefinition_dockervolumeconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskdefinition_efsvolumeconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskdefinition_environmentfile.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskdefinition_ephemeralstorage.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskdefinition_firelensconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskdefinition_healthcheck.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskdefinition_hostentry.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskdefinition_hostvolumeproperties.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskdefinition_inferenceaccelerator.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskdefinition_kernelcapabilities.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskdefinition_keyvaluepair.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskdefinition_linuxparameters.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskdefinition_logconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskdefinition_mountpoint.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskdefinition_portmapping.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskdefinition_proxyconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskdefinition_repositorycredentials.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskdefinition_resourcerequirement.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskdefinition_runtimeplatform.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskdefinition_secret.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskdefinition_systemcontrol.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskdefinition_taskdefinitionplacementconstraint.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskdefinition_tmpfs.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskdefinition_ulimit.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskdefinition_volume.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskdefinition_volumefrom.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskset.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskset_awsvpcconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskset_loadbalancer.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskset_networkconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskset_scale.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ecs/aws-ecs-taskset_serviceregistry.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/efs/aws-efs-accesspoint.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/efs/aws-efs-accesspoint_accesspointtag.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/efs/aws-efs-accesspoint_creationinfo.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/efs/aws-efs-accesspoint_posixuser.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/efs/aws-efs-accesspoint_rootdirectory.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/efs/aws-efs-filesystem.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/efs/aws-efs-filesystem_backuppolicy.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/efs/aws-efs-filesystem_elasticfilesystemtag.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/efs/aws-efs-filesystem_lifecyclepolicy.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/efs/aws-efs-mounttarget.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-access-config.go (90%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-access-entry.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-access-entry_access_scope.go (88%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-access-entry_policy.go (89%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-addon.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-cluster.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-cluster_clusterlogging.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-cluster_compute_config.go (89%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-cluster_controlplaneplacement.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-cluster_elastic_loadbalancing.go (88%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-cluster_encryptionconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-cluster_kubernetesnetworkconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-cluster_logging.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-cluster_loggingtypeconfig.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-cluster_outpostconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-cluster_provider.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-cluster_remotenetworks.go (86%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-cluster_resourcesvpcconfig.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-cluster_storage_config.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-cluster_zonal-shift.go (88%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-fargateprofile.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-fargateprofile_label.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-fargateprofile_selector.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-identityproviderconfig.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-identityproviderconfig_oidcidentityproviderconfig.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-identityproviderconfig_requiredclaim.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-nodegroup.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-nodegroup_launchtemplatespecification.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-nodegroup_noderepairconfig.go (89%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-nodegroup_remoteaccess.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-nodegroup_scalingconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-nodegroup_taint.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-nodegroup_taints.go (84%)
 rename {goformation => pkg/goformation}/cloudformation/eks/aws-eks-nodegroup_updateconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/elasticache/aws-elasticache-cachecluster.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/elasticache/aws-elasticache-cachecluster_cloudwatchlogsdestinationdetails.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/elasticache/aws-elasticache-cachecluster_destinationdetails.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/elasticache/aws-elasticache-cachecluster_kinesisfirehosedestinationdetails.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/elasticache/aws-elasticache-cachecluster_logdeliveryconfigurationrequest.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/elasticache/aws-elasticache-globalreplicationgroup.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_globalreplicationgroupmember.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_regionalconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_reshardingconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/elasticache/aws-elasticache-parametergroup.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/elasticache/aws-elasticache-replicationgroup.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/elasticache/aws-elasticache-replicationgroup_cloudwatchlogsdestinationdetails.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/elasticache/aws-elasticache-replicationgroup_destinationdetails.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/elasticache/aws-elasticache-replicationgroup_kinesisfirehosedestinationdetails.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/elasticache/aws-elasticache-replicationgroup_logdeliveryconfigurationrequest.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/elasticache/aws-elasticache-replicationgroup_nodegroupconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/elasticache/aws-elasticache-securitygroup.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/elasticache/aws-elasticache-securitygroupingress.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/elasticache/aws-elasticache-subnetgroup.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/elasticache/aws-elasticache-user.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/elasticache/aws-elasticache-usergroup.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_applicationresourcelifecycleconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_applicationversionlifecycleconfig.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_maxagerule.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_maxcountrule.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-applicationversion.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-applicationversion_sourcebundle.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate_configurationoptionsetting.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate_sourceconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment_optionsetting.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment_tier.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_accessloggingpolicy.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_appcookiestickinesspolicy.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_connectiondrainingpolicy.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_connectionsettings.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_healthcheck.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_lbcookiestickinesspolicy.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_listeners.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_policies.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_action.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_authenticatecognitoconfig.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_authenticateoidcconfig.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_certificate.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_fixedresponseconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_forwardconfig.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_redirectconfig.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_targetgroupstickinessconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_targetgrouptuple.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenercertificate.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenercertificate_certificate.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_action.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_authenticatecognitoconfig.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_authenticateoidcconfig.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_fixedresponseconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_forwardconfig.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_hostheaderconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_httpheaderconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_httprequestmethodconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_pathpatternconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_querystringconfig.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_querystringkeyvalue.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_redirectconfig.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_rulecondition.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_sourceipconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_targetgroupstickinessconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_targetgrouptuple.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer_loadbalancerattribute.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer_subnetmapping.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_matcher.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_targetdescription.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_targetgroupattribute.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/elasticsearch/aws-elasticsearch-domain.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/elasticsearch/aws-elasticsearch-domain_advancedsecurityoptionsinput.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/elasticsearch/aws-elasticsearch-domain_cognitooptions.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/elasticsearch/aws-elasticsearch-domain_coldstorageoptions.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/elasticsearch/aws-elasticsearch-domain_domainendpointoptions.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/elasticsearch/aws-elasticsearch-domain_ebsoptions.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/elasticsearch/aws-elasticsearch-domain_elasticsearchclusterconfig.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/elasticsearch/aws-elasticsearch-domain_encryptionatrestoptions.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/elasticsearch/aws-elasticsearch-domain_logpublishingoption.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/elasticsearch/aws-elasticsearch-domain_masteruseroptions.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/elasticsearch/aws-elasticsearch-domain_nodetonodeencryptionoptions.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/elasticsearch/aws-elasticsearch-domain_snapshotoptions.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/elasticsearch/aws-elasticsearch-domain_vpcoptions.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/elasticsearch/aws-elasticsearch-domain_zoneawarenessconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-cluster.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-cluster_application.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-cluster_autoscalingpolicy.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-cluster_bootstrapactionconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-cluster_cloudwatchalarmdefinition.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-cluster_computelimits.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-cluster_configuration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-cluster_ebsblockdeviceconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-cluster_ebsconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-cluster_hadoopjarstepconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-cluster_instancefleetconfig.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-cluster_instancefleetprovisioningspecifications.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-cluster_instancegroupconfig.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-cluster_instancetypeconfig.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-cluster_jobflowinstancesconfig.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-cluster_kerberosattributes.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-cluster_keyvalue.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-cluster_managedscalingpolicy.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-cluster_metricdimension.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-cluster_ondemandprovisioningspecification.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-cluster_placementtype.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-cluster_scalingaction.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-cluster_scalingconstraints.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-cluster_scalingrule.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-cluster_scalingtrigger.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-cluster_scriptbootstrapactionconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-cluster_simplescalingpolicyconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-cluster_spotprovisioningspecification.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-cluster_stepconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-cluster_volumespecification.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-instancefleetconfig.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-instancefleetconfig_configuration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-instancefleetconfig_ebsblockdeviceconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-instancefleetconfig_ebsconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-instancefleetconfig_instancefleetprovisioningspecifications.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-instancefleetconfig_instancetypeconfig.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-instancefleetconfig_ondemandprovisioningspecification.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-instancefleetconfig_spotprovisioningspecification.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-instancefleetconfig_volumespecification.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-instancegroupconfig.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-instancegroupconfig_autoscalingpolicy.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-instancegroupconfig_cloudwatchalarmdefinition.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-instancegroupconfig_configuration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-instancegroupconfig_ebsblockdeviceconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-instancegroupconfig_ebsconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-instancegroupconfig_metricdimension.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-instancegroupconfig_scalingaction.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-instancegroupconfig_scalingconstraints.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-instancegroupconfig_scalingrule.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-instancegroupconfig_scalingtrigger.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-instancegroupconfig_simplescalingpolicyconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-instancegroupconfig_volumespecification.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-securityconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-step.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-step_hadoopjarstepconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-step_keyvalue.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-studio.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/emr/aws-emr-studiosessionmapping.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_containerinfo.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_containerprovider.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_eksinfo.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/events/aws-events-apidestination.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/events/aws-events-archive.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/events/aws-events-connection.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/events/aws-events-eventbus.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/events/aws-events-eventbuspolicy.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/events/aws-events-eventbuspolicy_condition.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/events/aws-events-rule.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/events/aws-events-rule_awsvpcconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/events/aws-events-rule_batcharrayproperties.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/events/aws-events-rule_batchparameters.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/events/aws-events-rule_batchretrystrategy.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/events/aws-events-rule_capacityproviderstrategyitem.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/events/aws-events-rule_deadletterconfig.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/events/aws-events-rule_ecsparameters.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/events/aws-events-rule_httpparameters.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/events/aws-events-rule_inputtransformer.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/events/aws-events-rule_kinesisparameters.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/events/aws-events-rule_networkconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/events/aws-events-rule_placementconstraint.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/events/aws-events-rule_placementstrategy.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/events/aws-events-rule_redshiftdataparameters.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/events/aws-events-rule_retrypolicy.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/events/aws-events-rule_runcommandparameters.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/events/aws-events-rule_runcommandtarget.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/events/aws-events-rule_sqsparameters.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/events/aws-events-rule_tag.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/events/aws-events-rule_target.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/eventschemas/aws-eventschemas-discoverer.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/eventschemas/aws-eventschemas-discoverer_tagsentry.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/eventschemas/aws-eventschemas-registry.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/eventschemas/aws-eventschemas-registry_tagsentry.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/eventschemas/aws-eventschemas-registrypolicy.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/eventschemas/aws-eventschemas-schema.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/eventschemas/aws-eventschemas-schema_tagsentry.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/evidently/aws-evidently-experiment.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/evidently/aws-evidently-experiment_metricgoalobject.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/evidently/aws-evidently-experiment_onlineabconfigobject.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/evidently/aws-evidently-experiment_treatmentobject.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/evidently/aws-evidently-experiment_treatmenttoweight.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/evidently/aws-evidently-feature.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/evidently/aws-evidently-feature_entityoverride.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/evidently/aws-evidently-feature_variationobject.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/evidently/aws-evidently-launch.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/evidently/aws-evidently-launch_grouptoweight.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/evidently/aws-evidently-launch_launchgroupobject.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/evidently/aws-evidently-launch_metricdefinitionobject.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/evidently/aws-evidently-launch_stepconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/evidently/aws-evidently-project.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/evidently/aws-evidently-project_datadeliveryobject.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/evidently/aws-evidently-project_s3destination.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/finspace/aws-finspace-environment.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/finspace/aws-finspace-environment_federationparameters.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/finspace/aws-finspace-environment_superuserparameters.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/fis/aws-fis-experimenttemplate.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplateaction.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatestopcondition.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatetarget.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatetargetfilter.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/fms/aws-fms-notificationchannel.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/fms/aws-fms-policy.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/fms/aws-fms-policy_iemap.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/fms/aws-fms-policy_policytag.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/fms/aws-fms-policy_resourcetag.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/frauddetector/aws-frauddetector-detector.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/frauddetector/aws-frauddetector-detector_entitytype.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/frauddetector/aws-frauddetector-detector_eventtype.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/frauddetector/aws-frauddetector-detector_eventvariable.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/frauddetector/aws-frauddetector-detector_label.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/frauddetector/aws-frauddetector-detector_model.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/frauddetector/aws-frauddetector-detector_outcome.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/frauddetector/aws-frauddetector-detector_rule.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/frauddetector/aws-frauddetector-entitytype.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/frauddetector/aws-frauddetector-eventtype.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/frauddetector/aws-frauddetector-eventtype_entitytype.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/frauddetector/aws-frauddetector-eventtype_eventvariable.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/frauddetector/aws-frauddetector-eventtype_label.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/frauddetector/aws-frauddetector-label.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/frauddetector/aws-frauddetector-outcome.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/frauddetector/aws-frauddetector-variable.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/fsx/aws-fsx-filesystem.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/fsx/aws-fsx-filesystem_auditlogconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/fsx/aws-fsx-filesystem_clientconfigurations.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/fsx/aws-fsx-filesystem_diskiopsconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/fsx/aws-fsx-filesystem_lustreconfiguration.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/fsx/aws-fsx-filesystem_nfsexports.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/fsx/aws-fsx-filesystem_ontapconfiguration.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/fsx/aws-fsx-filesystem_openzfsconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/fsx/aws-fsx-filesystem_rootvolumeconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/fsx/aws-fsx-filesystem_selfmanagedactivedirectoryconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/fsx/aws-fsx-filesystem_userandgroupquotas.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/fsx/aws-fsx-filesystem_windowsconfiguration.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/gamelift/aws-gamelift-alias.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/gamelift/aws-gamelift-alias_routingstrategy.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/gamelift/aws-gamelift-build.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/gamelift/aws-gamelift-build_s3location.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/gamelift/aws-gamelift-fleet.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/gamelift/aws-gamelift-fleet_certificateconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/gamelift/aws-gamelift-fleet_ippermission.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/gamelift/aws-gamelift-fleet_locationcapacity.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/gamelift/aws-gamelift-fleet_locationconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/gamelift/aws-gamelift-fleet_resourcecreationlimitpolicy.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/gamelift/aws-gamelift-fleet_runtimeconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/gamelift/aws-gamelift-fleet_serverprocess.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/gamelift/aws-gamelift-gameservergroup.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/gamelift/aws-gamelift-gameservergroup_autoscalingpolicy.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/gamelift/aws-gamelift-gameservergroup_instancedefinition.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/gamelift/aws-gamelift-gameservergroup_instancedefinitions.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/gamelift/aws-gamelift-gameservergroup_launchtemplate.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/gamelift/aws-gamelift-gameservergroup_tags.go (90%)
 rename {goformation => pkg/goformation}/cloudformation/gamelift/aws-gamelift-gameservergroup_targettrackingconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/gamelift/aws-gamelift-gameservergroup_vpcsubnets.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/gamelift/aws-gamelift-gamesessionqueue.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/gamelift/aws-gamelift-gamesessionqueue_destination.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/gamelift/aws-gamelift-gamesessionqueue_filterconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/gamelift/aws-gamelift-gamesessionqueue_playerlatencypolicy.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/gamelift/aws-gamelift-gamesessionqueue_priorityconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/gamelift/aws-gamelift-matchmakingconfiguration.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/gamelift/aws-gamelift-matchmakingconfiguration_gameproperty.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/gamelift/aws-gamelift-matchmakingruleset.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/gamelift/aws-gamelift-script.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/gamelift/aws-gamelift-script_s3location.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/globalaccelerator/aws-globalaccelerator-accelerator.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup_endpointconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup_portoverride.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/globalaccelerator/aws-globalaccelerator-listener.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/globalaccelerator/aws-globalaccelerator-listener_portrange.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-classifier.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-classifier_csvclassifier.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-classifier_grokclassifier.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-classifier_jsonclassifier.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-classifier_xmlclassifier.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-connection.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-connection_connectioninput.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-connection_physicalconnectionrequirements.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-crawler.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-crawler_catalogtarget.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-crawler_dynamodbtarget.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-crawler_jdbctarget.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-crawler_recrawlpolicy.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-crawler_s3target.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-crawler_schedule.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-crawler_schemachangepolicy.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-crawler_targets.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-database.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-database_databaseidentifier.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-database_databaseinput.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-database_datalakeprincipal.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-database_principalprivileges.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-datacatalogencryptionsettings.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-datacatalogencryptionsettings_connectionpasswordencryption.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-datacatalogencryptionsettings_datacatalogencryptionsettings.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-datacatalogencryptionsettings_encryptionatrest.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-devendpoint.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-job.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-job_connectionslist.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-job_executionproperty.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-job_jobcommand.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-job_notificationproperty.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-mltransform.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-mltransform_findmatchesparameters.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-mltransform_gluetables.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-mltransform_inputrecordtables.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-mltransform_mluserdataencryption.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-mltransform_transformencryption.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-mltransform_transformparameters.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-partition.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-partition_column.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-partition_order.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-partition_partitioninput.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-partition_schemaid.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-partition_schemareference.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-partition_serdeinfo.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-partition_skewedinfo.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-partition_storagedescriptor.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-registry.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-schema.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-schema_registry.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-schema_schemaversion.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-schemaversion.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-schemaversion_schema.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-schemaversionmetadata.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-securityconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-securityconfiguration_cloudwatchencryption.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-securityconfiguration_encryptionconfiguration.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-securityconfiguration_jobbookmarksencryption.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-securityconfiguration_s3encryption.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-securityconfiguration_s3encryptions.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-table.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-table_column.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-table_order.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-table_schemaid.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-table_schemareference.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-table_serdeinfo.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-table_skewedinfo.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-table_storagedescriptor.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-table_tableidentifier.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-table_tableinput.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-trigger.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-trigger_action.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-trigger_condition.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-trigger_notificationproperty.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-trigger_predicate.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/glue/aws-glue-workflow.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-connectordefinition.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-connectordefinition_connector.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-connectordefinition_connectordefinitionversion.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-connectordefinitionversion.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-connectordefinitionversion_connector.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-coredefinition.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-coredefinition_core.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-coredefinition_coredefinitionversion.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-coredefinitionversion.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-coredefinitionversion_core.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-devicedefinition.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-devicedefinition_device.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-devicedefinition_devicedefinitionversion.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-devicedefinitionversion.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-devicedefinitionversion_device.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-functiondefinition.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-functiondefinition_defaultconfig.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-functiondefinition_environment.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-functiondefinition_execution.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-functiondefinition_function.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-functiondefinition_functionconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-functiondefinition_functiondefinitionversion.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-functiondefinition_resourceaccesspolicy.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-functiondefinition_runas.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-functiondefinitionversion.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_defaultconfig.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_environment.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_execution.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_function.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_functionconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_resourceaccesspolicy.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_runas.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-group.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-group_groupversion.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-groupversion.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-loggerdefinition.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-loggerdefinition_logger.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-loggerdefinition_loggerdefinitionversion.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-loggerdefinitionversion.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-loggerdefinitionversion_logger.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-resourcedefinition.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-resourcedefinition_groupownersetting.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-resourcedefinition_localdeviceresourcedata.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-resourcedefinition_localvolumeresourcedata.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedatacontainer.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedefinitionversion.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedownloadownersetting.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourceinstance.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-resourcedefinition_s3machinelearningmodelresourcedata.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-resourcedefinition_sagemakermachinelearningmodelresourcedata.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-resourcedefinition_secretsmanagersecretresourcedata.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_groupownersetting.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_localdeviceresourcedata.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_localvolumeresourcedata.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourcedatacontainer.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourcedownloadownersetting.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourceinstance.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_s3machinelearningmodelresourcedata.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_sagemakermachinelearningmodelresourcedata.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_secretsmanagersecretresourcedata.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-subscriptiondefinition.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-subscriptiondefinition_subscription.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-subscriptiondefinition_subscriptiondefinitionversion.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-subscriptiondefinitionversion.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/greengrass/aws-greengrass-subscriptiondefinitionversion_subscription.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/greengrassv2/aws-greengrassv2-componentversion.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/greengrassv2/aws-greengrassv2-componentversion_componentdependencyrequirement.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/greengrassv2/aws-greengrassv2-componentversion_componentplatform.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdacontainerparams.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdadevicemount.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdaeventsource.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdaexecutionparameters.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdafunctionrecipesource.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdalinuxprocessparams.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdavolumemount.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/groundstation/aws-groundstation-config.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/groundstation/aws-groundstation-config_antennadownlinkconfig.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/groundstation/aws-groundstation-config_antennadownlinkdemoddecodeconfig.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/groundstation/aws-groundstation-config_antennauplinkconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/groundstation/aws-groundstation-config_configdata.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/groundstation/aws-groundstation-config_dataflowendpointconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/groundstation/aws-groundstation-config_decodeconfig.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/groundstation/aws-groundstation-config_demodulationconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/groundstation/aws-groundstation-config_eirp.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/groundstation/aws-groundstation-config_frequency.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/groundstation/aws-groundstation-config_frequencybandwidth.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/groundstation/aws-groundstation-config_s3recordingconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/groundstation/aws-groundstation-config_spectrumconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/groundstation/aws-groundstation-config_trackingconfig.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/groundstation/aws-groundstation-config_uplinkechoconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/groundstation/aws-groundstation-config_uplinkspectrumconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_dataflowendpoint.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_endpointdetails.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_securitydetails.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_socketaddress.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/groundstation/aws-groundstation-missionprofile.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/groundstation/aws-groundstation-missionprofile_dataflowedge.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/guardduty/aws-guardduty-detector.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/guardduty/aws-guardduty-detector_cfndatasourceconfigurations.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/guardduty/aws-guardduty-detector_cfns3logsconfiguration.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/guardduty/aws-guardduty-filter.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/guardduty/aws-guardduty-filter_condition.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/guardduty/aws-guardduty-filter_findingcriteria.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/guardduty/aws-guardduty-ipset.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/guardduty/aws-guardduty-master.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/guardduty/aws-guardduty-member.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/guardduty/aws-guardduty-threatintelset.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/healthlake/aws-healthlake-fhirdatastore.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/healthlake/aws-healthlake-fhirdatastore_kmsencryptionconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/healthlake/aws-healthlake-fhirdatastore_preloaddataconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/healthlake/aws-healthlake-fhirdatastore_sseconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iam/aws-iam-accesskey.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iam/aws-iam-group.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iam/aws-iam-group_policy.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iam/aws-iam-instanceprofile.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iam/aws-iam-managedpolicy.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/iam/aws-iam-oidcprovider.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iam/aws-iam-policy.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/iam/aws-iam-role.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iam/aws-iam-role_policy.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iam/aws-iam-samlprovider.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iam/aws-iam-servercertificate.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iam/aws-iam-servicelinkedrole.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iam/aws-iam-user.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iam/aws-iam-user_loginprofile.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iam/aws-iam-user_policy.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iam/aws-iam-usertogroupaddition.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iam/aws-iam-virtualmfadevice.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/imagebuilder/aws-imagebuilder-component.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_componentconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_ebsinstanceblockdevicespecification.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_instanceblockdevicemapping.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_instanceconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_targetcontainerrepository.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration_distribution.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration_launchtemplateconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/imagebuilder/aws-imagebuilder-image.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/imagebuilder/aws-imagebuilder-image_imagetestsconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline_imagetestsconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline_schedule.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_additionalinstanceconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_componentconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_componentparameter.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_ebsinstanceblockdevicespecification.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_instanceblockdevicemapping.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_systemsmanageragent.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_instancemetadataoptions.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_logging.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_s3logs.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/inspector/aws-inspector-assessmenttarget.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/inspector/aws-inspector-assessmenttemplate.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/inspector/aws-inspector-resourcegroup.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/intrinsics.go (99%)
 rename {goformation => pkg/goformation}/cloudformation/intrinsics_test.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-accountauditconfiguration.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-accountauditconfiguration_auditcheckconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-accountauditconfiguration_auditcheckconfigurations.go (99%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-accountauditconfiguration_auditnotificationtarget.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-accountauditconfiguration_auditnotificationtargetconfigurations.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-authorizer.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-authorizer_tags.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-authorizer_tokensigningpublickeys.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-certificate.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-custommetric.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-dimension.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-domainconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-domainconfiguration_authorizerconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-domainconfiguration_servercertificatesummary.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-domainconfiguration_tags.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-fleetmetric.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-fleetmetric_aggregationtype.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-jobtemplate.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-logging.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-mitigationaction.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-mitigationaction_actionparams.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-mitigationaction_addthingstothinggroupparams.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-mitigationaction_enableiotloggingparams.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-mitigationaction_publishfindingtosnsparams.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-mitigationaction_replacedefaultpolicyversionparams.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-mitigationaction_updatecacertificateparams.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-mitigationaction_updatedevicecertificateparams.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-policy.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-policyprincipalattachment.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-provisioningtemplate.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-provisioningtemplate_provisioninghook.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-provisioningtemplate_tags.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-resourcespecificlogging.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-scheduledaudit.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-securityprofile.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-securityprofile_alerttarget.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-securityprofile_behavior.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-securityprofile_behaviorcriteria.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-securityprofile_machinelearningdetectionconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-securityprofile_metricdimension.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-securityprofile_metrictoretain.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-securityprofile_metricvalue.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-securityprofile_statisticalthreshold.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-thing.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-thing_attributepayload.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-thingprincipalattachment.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_action.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_assetpropertytimestamp.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_assetpropertyvalue.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_assetpropertyvariant.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_cloudwatchalarmaction.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_cloudwatchlogsaction.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_cloudwatchmetricaction.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_dynamodbaction.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_dynamodbv2action.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_elasticsearchaction.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_firehoseaction.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_httpaction.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_httpactionheader.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_httpauthorization.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_iotanalyticsaction.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_ioteventsaction.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_iotsitewiseaction.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_kafkaaction.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_kinesisaction.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_lambdaaction.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_opensearchaction.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_putassetpropertyvalueentry.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_putiteminput.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_republishaction.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_s3action.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_sigv4authorization.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_snsaction.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_sqsaction.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_stepfunctionsaction.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_timestreamaction.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_timestreamdimension.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_timestreamtimestamp.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicrule_topicrulepayload.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicruledestination.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicruledestination_httpurldestinationsummary.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iot/aws-iot-topicruledestination_vpcdestinationproperties.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/iot1click/aws-iot1click-device.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iot1click/aws-iot1click-placement.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/iot1click/aws-iot1click-project.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iot1click/aws-iot1click-project_devicetemplate.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iot1click/aws-iot1click-project_placementtemplate.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-channel.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-channel_channelstorage.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-channel_customermanageds3.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-channel_retentionperiod.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-channel_servicemanageds3.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-dataset.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-dataset_action.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-dataset_containeraction.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentdeliveryrule.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentdeliveryruledestination.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentversionvalue.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-dataset_deltatime.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-dataset_deltatimesessionwindowconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-dataset_filter.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-dataset_glueconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-dataset_ioteventsdestinationconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-dataset_latedatarule.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-dataset_latedataruleconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-dataset_outputfileurivalue.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-dataset_queryaction.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-dataset_resourceconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-dataset_retentionperiod.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-dataset_s3destinationconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-dataset_schedule.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-dataset_trigger.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-dataset_triggeringdataset.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-dataset_variable.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-dataset_versioningconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-datastore.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-datastore_column.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-datastore_customermanageds3.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-datastore_customermanageds3storage.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorepartition.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorepartitions.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorestorage.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-datastore_fileformatconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-datastore_iotsitewisemultilayerstorage.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-datastore_jsonconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-datastore_parquetconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-datastore_partition.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-datastore_retentionperiod.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-datastore_schemadefinition.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-datastore_servicemanageds3.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-datastore_timestamppartition.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-pipeline.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-pipeline_activity.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-pipeline_addattributes.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-pipeline_channel.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-pipeline_datastore.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-pipeline_deviceregistryenrich.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-pipeline_deviceshadowenrich.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-pipeline_filter.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-pipeline_lambda.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-pipeline_math.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-pipeline_removeattributes.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotanalytics/aws-iotanalytics-pipeline_selectattributes.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotcoredeviceadvisor/aws-iotcoredeviceadvisor-suitedefinition.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iotevents/aws-iotevents-detectormodel.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iotevents/aws-iotevents-detectormodel_action.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertytimestamp.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertyvalue.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertyvariant.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/iotevents/aws-iotevents-detectormodel_cleartimer.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/iotevents/aws-iotevents-detectormodel_detectormodeldefinition.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotevents/aws-iotevents-detectormodel_dynamodb.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iotevents/aws-iotevents-detectormodel_dynamodbv2.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iotevents/aws-iotevents-detectormodel_event.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotevents/aws-iotevents-detectormodel_firehose.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotevents/aws-iotevents-detectormodel_iotevents.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iotevents/aws-iotevents-detectormodel_iotsitewise.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iotevents/aws-iotevents-detectormodel_iottopicpublish.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotevents/aws-iotevents-detectormodel_lambda.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iotevents/aws-iotevents-detectormodel_onenter.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iotevents/aws-iotevents-detectormodel_onexit.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iotevents/aws-iotevents-detectormodel_oninput.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iotevents/aws-iotevents-detectormodel_payload.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iotevents/aws-iotevents-detectormodel_resettimer.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/iotevents/aws-iotevents-detectormodel_settimer.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotevents/aws-iotevents-detectormodel_setvariable.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iotevents/aws-iotevents-detectormodel_sns.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iotevents/aws-iotevents-detectormodel_sqs.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotevents/aws-iotevents-detectormodel_state.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/iotevents/aws-iotevents-detectormodel_transitionevent.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/iotevents/aws-iotevents-input.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iotevents/aws-iotevents-input_attribute.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/iotevents/aws-iotevents-input_inputdefinition.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iotfleethub/aws-iotfleethub-application.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_accesspolicyidentity.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_accesspolicyresource.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_iamrole.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_iamuser.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_portal.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_project.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_user.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/iotsitewise/aws-iotsitewise-asset.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iotsitewise/aws-iotsitewise-asset_assethierarchy.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iotsitewise/aws-iotsitewise-asset_assetproperty.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotsitewise/aws-iotsitewise-assetmodel.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelcompositemodel.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelhierarchy.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelproperty.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_attribute.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_expressionvariable.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_metric.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_metricwindow.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_propertytype.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_transform.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_tumblingwindow.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_variablevalue.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotsitewise/aws-iotsitewise-dashboard.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iotsitewise/aws-iotsitewise-gateway.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iotsitewise/aws-iotsitewise-gateway_gatewaycapabilitysummary.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotsitewise/aws-iotsitewise-gateway_gatewayplatform.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iotsitewise/aws-iotsitewise-gateway_greengrass.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/iotsitewise/aws-iotsitewise-portal.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iotsitewise/aws-iotsitewise-project.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iotthingsgraph/aws-iotthingsgraph-flowtemplate.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iotthingsgraph/aws-iotthingsgraph-flowtemplate_definitiondocument.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotwireless/aws-iotwireless-destination.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iotwireless/aws-iotwireless-deviceprofile.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iotwireless/aws-iotwireless-deviceprofile_lorawandeviceprofile.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/iotwireless/aws-iotwireless-fuotatask.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iotwireless/aws-iotwireless-fuotatask_lorawan.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iotwireless/aws-iotwireless-multicastgroup.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iotwireless/aws-iotwireless-multicastgroup_lorawan.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/iotwireless/aws-iotwireless-partneraccount.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iotwireless/aws-iotwireless-partneraccount_sidewalkaccountinfo.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iotwireless/aws-iotwireless-partneraccount_sidewalkupdateaccount.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iotwireless/aws-iotwireless-serviceprofile.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iotwireless/aws-iotwireless-serviceprofile_lorawanserviceprofile.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/iotwireless/aws-iotwireless-taskdefinition.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawangatewayversion.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawanupdategatewaytaskcreate.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawanupdategatewaytaskentry.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iotwireless/aws-iotwireless-taskdefinition_updatewirelessgatewaytaskcreate.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/iotwireless/aws-iotwireless-wirelessdevice.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_abpv10x.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_abpv11.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_lorawandevice.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_otaav10x.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_otaav11.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_sessionkeysabpv10x.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_sessionkeysabpv11.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/iotwireless/aws-iotwireless-wirelessgateway.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/iotwireless/aws-iotwireless-wirelessgateway_lorawangateway.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ivs/aws-ivs-channel.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ivs/aws-ivs-playbackkeypair.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ivs/aws-ivs-recordingconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ivs/aws-ivs-recordingconfiguration_destinationconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ivs/aws-ivs-recordingconfiguration_s3destinationconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ivs/aws-ivs-streamkey.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_accesscontrollistconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_aclconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_changedetectingcolumns.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_columnconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_confluenceattachmentconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_confluenceattachmenttoindexfieldmapping.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_confluenceblogconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_confluenceblogtoindexfieldmapping.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_confluenceconfiguration.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_confluencepageconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_confluencepagetoindexfieldmapping.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_confluencespaceconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_confluencespacetoindexfieldmapping.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_connectionconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_databaseconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_datasourceconfiguration.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_datasourceinclusionsexclusionsstrings.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_datasourcetoindexfieldmapping.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_datasourcetoindexfieldmappinglist.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_datasourcevpcconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_documentsmetadataconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_googledriveconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_onedriveconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_onedriveuserlist.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_onedriveusers.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_proxyconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_s3datasourceconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_s3path.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_salesforcechatterfeedconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_salesforcechatterfeedincludefiltertypes.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_salesforceconfiguration.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_salesforcecustomknowledgearticletypeconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_salesforcecustomknowledgearticletypeconfigurationlist.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_salesforceknowledgearticleconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_salesforceknowledgearticlestatelist.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_salesforcestandardknowledgearticletypeconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectattachmentconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectconfigurationlist.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_servicenowconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_servicenowknowledgearticleconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_servicenowservicecatalogconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_sharepointconfiguration.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_sqlconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_taglist.go (90%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_webcrawlerauthenticationconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_webcrawlerbasicauthentication.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_webcrawlerconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_webcrawlerseedurlconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_webcrawlersitemapsconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_webcrawlerurls.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-datasource_workdocsconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-faq.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-faq_s3path.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-faq_taglist.go (90%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-index.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-index_capacityunitsconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-index_documentmetadataconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-index_documentmetadataconfigurationlist.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-index_jsontokentypeconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-index_jwttokentypeconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-index_relevance.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-index_search.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-index_serversideencryptionconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-index_taglist.go (90%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-index_usertokenconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-index_valueimportanceitem.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kendra/aws-kendra-index_valueimportanceitems.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/kinesis/aws-kinesis-stream.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/kinesis/aws-kinesis-stream_streamencryption.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kinesis/aws-kinesis-streamconsumer.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalytics/aws-kinesisanalytics-application.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_csvmappingparameters.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_input.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputlambdaprocessor.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputparallelism.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputprocessingconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputschema.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_jsonmappingparameters.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_kinesisfirehoseinput.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_kinesisstreamsinput.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_mappingparameters.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_recordcolumn.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_recordformat.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_destinationschema.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_kinesisfirehoseoutput.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_kinesisstreamsoutput.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_lambdaoutput.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_output.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_csvmappingparameters.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_jsonmappingparameters.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_mappingparameters.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_recordcolumn.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_recordformat.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_referencedatasource.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_referenceschema.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_s3referencedatasource.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationcodeconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationconfiguration.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationsnapshotconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_catalogconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_checkpointconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_codecontent.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_csvmappingparameters.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_customartifactconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_customartifactsconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_deployasapplicationconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_environmentproperties.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_flinkapplicationconfiguration.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_gluedatacatalogconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_input.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputlambdaprocessor.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputparallelism.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputprocessingconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputschema.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_jsonmappingparameters.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_kinesisfirehoseinput.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_kinesisstreamsinput.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_mappingparameters.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_mavenreference.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_monitoringconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_parallelismconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_propertygroup.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_recordcolumn.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_recordformat.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_s3contentbaselocation.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_s3contentlocation.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_sqlapplicationconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_zeppelinapplicationconfiguration.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_zeppelinmonitoringconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationcloudwatchloggingoption.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationcloudwatchloggingoption_cloudwatchloggingoption.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_destinationschema.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_kinesisfirehoseoutput.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_kinesisstreamsoutput.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_lambdaoutput.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_output.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_csvmappingparameters.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_jsonmappingparameters.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_mappingparameters.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_recordcolumn.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_recordformat.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_referencedatasource.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_referenceschema.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_s3referencedatasource.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchservicebufferinghints.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchservicedestinationconfiguration.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchserviceretryoptions.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_bufferinghints.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_cloudwatchloggingoptions.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_copycommand.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_dataformatconversionconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_deliverystreamencryptionconfigurationinput.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_deserializer.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_dynamicpartitioningconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchbufferinghints.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchdestinationconfiguration.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchretryoptions.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_encryptionconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_extendeds3destinationconfiguration.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_hivejsonserde.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointcommonattribute.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointdestinationconfiguration.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointrequestconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_inputformatconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_kinesisstreamsourceconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_kmsencryptionconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_openxjsonserde.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_orcserde.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_outputformatconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_parquetserde.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processingconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processor.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processorparameter.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_redshiftdestinationconfiguration.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_redshiftretryoptions.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_retryoptions.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_s3destinationconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_schemaconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_serializer.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_splunkdestinationconfiguration.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_splunkretryoptions.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_vpcconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/kms/aws-kms-alias.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kms/aws-kms-key.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/kms/aws-kms-replicakey.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/lakeformation/aws-lakeformation-datalakesettings.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/lakeformation/aws-lakeformation-datalakesettings_admins.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/lakeformation/aws-lakeformation-datalakesettings_datalakeprincipal.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/lakeformation/aws-lakeformation-permissions.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/lakeformation/aws-lakeformation-permissions_columnwildcard.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/lakeformation/aws-lakeformation-permissions_databaseresource.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/lakeformation/aws-lakeformation-permissions_datalakeprincipal.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/lakeformation/aws-lakeformation-permissions_datalocationresource.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/lakeformation/aws-lakeformation-permissions_resource.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/lakeformation/aws-lakeformation-permissions_tableresource.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/lakeformation/aws-lakeformation-permissions_tablewildcard.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/lakeformation/aws-lakeformation-permissions_tablewithcolumnsresource.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/lakeformation/aws-lakeformation-resource.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/lambda/aws-lambda-alias.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/lambda/aws-lambda-alias_aliasroutingconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/lambda/aws-lambda-alias_provisionedconcurrencyconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/lambda/aws-lambda-alias_versionweight.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/lambda/aws-lambda-codesigningconfig.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/lambda/aws-lambda-codesigningconfig_allowedpublishers.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/lambda/aws-lambda-codesigningconfig_codesigningpolicies.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/lambda/aws-lambda-eventinvokeconfig.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/lambda/aws-lambda-eventinvokeconfig_destinationconfig.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/lambda/aws-lambda-eventinvokeconfig_onfailure.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/lambda/aws-lambda-eventinvokeconfig_onsuccess.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/lambda/aws-lambda-eventsourcemapping.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/lambda/aws-lambda-eventsourcemapping_destinationconfig.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/lambda/aws-lambda-eventsourcemapping_endpoints.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/lambda/aws-lambda-eventsourcemapping_onfailure.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/lambda/aws-lambda-eventsourcemapping_selfmanagedeventsource.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/lambda/aws-lambda-eventsourcemapping_sourceaccessconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/lambda/aws-lambda-function.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/lambda/aws-lambda-function_code.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/lambda/aws-lambda-function_deadletterconfig.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/lambda/aws-lambda-function_environment.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/lambda/aws-lambda-function_filesystemconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/lambda/aws-lambda-function_imageconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/lambda/aws-lambda-function_tracingconfig.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/lambda/aws-lambda-function_vpcconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/lambda/aws-lambda-layerversion.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/lambda/aws-lambda-layerversion_content.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/lambda/aws-lambda-layerversionpermission.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/lambda/aws-lambda-permission.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/lambda/aws-lambda-version.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/lambda/aws-lambda-version_provisionedconcurrencyconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/licensemanager/aws-licensemanager-grant.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/licensemanager/aws-licensemanager-license.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/licensemanager/aws-licensemanager-license_borrowconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/licensemanager/aws-licensemanager-license_consumptionconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/licensemanager/aws-licensemanager-license_entitlement.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/licensemanager/aws-licensemanager-license_issuerdata.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/licensemanager/aws-licensemanager-license_metadata.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/licensemanager/aws-licensemanager-license_provisionalconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/licensemanager/aws-licensemanager-license_validitydateformat.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/lightsail/aws-lightsail-database.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/lightsail/aws-lightsail-database_relationaldatabaseparameter.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/lightsail/aws-lightsail-disk.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/lightsail/aws-lightsail-disk_addon.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/lightsail/aws-lightsail-disk_autosnapshotaddon.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/lightsail/aws-lightsail-instance.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/lightsail/aws-lightsail-instance_addon.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/lightsail/aws-lightsail-instance_autosnapshotaddon.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/lightsail/aws-lightsail-instance_disk.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/lightsail/aws-lightsail-instance_hardware.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/lightsail/aws-lightsail-instance_location.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/lightsail/aws-lightsail-instance_monthlytransfer.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/lightsail/aws-lightsail-instance_networking.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/lightsail/aws-lightsail-instance_port.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/lightsail/aws-lightsail-instance_state.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/lightsail/aws-lightsail-staticip.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/location/aws-location-geofencecollection.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/location/aws-location-map.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/location/aws-location-map_mapconfiguration.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/location/aws-location-placeindex.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/location/aws-location-placeindex_datasourceconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/location/aws-location-routecalculator.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/location/aws-location-tracker.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/location/aws-location-trackerconsumer.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/logs/aws-logs-destination.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/logs/aws-logs-loggroup.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/logs/aws-logs-logstream.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/logs/aws-logs-metricfilter.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/logs/aws-logs-metricfilter_metrictransformation.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/logs/aws-logs-querydefinition.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/logs/aws-logs-resourcepolicy.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/logs/aws-logs-subscriptionfilter.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/lookoutequipment/aws-lookoutequipment-inferencescheduler.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_action.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_lambdaconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_snsconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_anomalydetectorconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_appflowconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_cloudwatchconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_csvformatdescriptor.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_fileformatdescriptor.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_jsonformatdescriptor.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metric.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metricset.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metricsource.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_rdssourceconfig.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_redshiftsourceconfig.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_s3sourceconfig.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_timestampcolumn.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_vpcconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/lookoutvision/aws-lookoutvision-project.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/macie/aws-macie-customdataidentifier.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/macie/aws-macie-findingsfilter.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/macie/aws-macie-findingsfilter_criterion.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/macie/aws-macie-findingsfilter_findingcriteria.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/macie/aws-macie-findingsfilter_findingsfilterlistitem.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/macie/aws-macie-session.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/managedblockchain/aws-managedblockchain-member.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/managedblockchain/aws-managedblockchain-member_approvalthresholdpolicy.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/managedblockchain/aws-managedblockchain-member_memberconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/managedblockchain/aws-managedblockchain-member_memberfabricconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/managedblockchain/aws-managedblockchain-member_memberframeworkconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/managedblockchain/aws-managedblockchain-member_networkconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/managedblockchain/aws-managedblockchain-member_networkfabricconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/managedblockchain/aws-managedblockchain-member_networkframeworkconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/managedblockchain/aws-managedblockchain-member_votingpolicy.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/managedblockchain/aws-managedblockchain-node.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/managedblockchain/aws-managedblockchain-node_nodeconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/mediaconnect/aws-mediaconnect-flow.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/mediaconnect/aws-mediaconnect-flow_encryption.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/mediaconnect/aws-mediaconnect-flow_failoverconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/mediaconnect/aws-mediaconnect-flow_source.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/mediaconnect/aws-mediaconnect-flowentitlement.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/mediaconnect/aws-mediaconnect-flowentitlement_encryption.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/mediaconnect/aws-mediaconnect-flowoutput.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_encryption.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_vpcinterfaceattachment.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/mediaconnect/aws-mediaconnect-flowsource.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/mediaconnect/aws-mediaconnect-flowsource_encryption.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/mediaconnect/aws-mediaconnect-flowvpcinterface.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate_accelerationsettings.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate_hopdestination.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/mediaconvert/aws-mediaconvert-preset.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/mediaconvert/aws-mediaconvert-queue.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_aacsettings.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_ac3settings.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_ancillarysourcesettings.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_archivecdnsettings.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_archivecontainersettings.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_archivegroupsettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_archiveoutputsettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_archives3settings.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_aribdestinationsettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_aribsourcesettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_audiochannelmapping.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_audiocodecsettings.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_audiodescription.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_audiohlsrenditionselection.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_audiolanguageselection.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_audionormalizationsettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_audioonlyhlssettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_audiopidselection.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_audioselector.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_audioselectorsettings.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_audiosilencefailoversettings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_audiotrack.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_audiotrackselection.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_audiowatermarksettings.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_automaticinputfailoversettings.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_availblanking.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_availconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_availsettings.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_blackoutslate.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_burnindestinationsettings.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_captiondescription.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_captiondestinationsettings.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_captionlanguagemapping.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_captionrectangle.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_captionselector.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_captionselectorsettings.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_cdiinputspecification.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_colorspacepassthroughsettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_dvbnitsettings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_dvbsdtsettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_dvbsubdestinationsettings.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_dvbsubsourcesettings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_dvbtdtsettings.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_eac3settings.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_ebuttddestinationsettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_embeddeddestinationsettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_embeddedplusscte20destinationsettings.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_embeddedsourcesettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_encodersettings.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_failovercondition.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_failoverconditionsettings.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_featureactivations.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_fecoutputsettings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_fmp4hlssettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_framecapturecdnsettings.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_framecapturegroupsettings.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_framecapturehlssettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_framecaptureoutputsettings.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_framecaptures3settings.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_framecapturesettings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_globalconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_h264colorspacesettings.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_h264filtersettings.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_h264settings.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_h265colorspacesettings.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_h265filtersettings.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_h265settings.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_hdr10settings.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_hlsakamaisettings.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_hlsbasicputsettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_hlscdnsettings.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_hlsgroupsettings.go (99%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_hlsinputsettings.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_hlsmediastoresettings.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_hlsoutputsettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_hlss3settings.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_hlssettings.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_hlswebdavsettings.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_htmlmotiongraphicssettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_inputattachment.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_inputchannellevel.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_inputlocation.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_inputlossbehavior.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_inputlossfailoversettings.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_inputsettings.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_inputspecification.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_keyprovidersettings.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_m2tssettings.go (99%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_m3u8settings.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_mediapackagegroupsettings.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_mediapackageoutputdestinationsettings.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_mediapackageoutputsettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_motiongraphicsconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_motiongraphicssettings.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_mp2settings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_mpeg2filtersettings.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_mpeg2settings.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_mssmoothgroupsettings.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_mssmoothoutputsettings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_multiplexgroupsettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_multiplexoutputsettings.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_multiplexprogramchanneldestinationsettings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_networkinputsettings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_nielsencbet.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_nielsenconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_nielsennaesiinw.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_nielsenwatermarkssettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_output.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_outputdestination.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_outputdestinationsettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_outputgroup.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_outputgroupsettings.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_outputlocationref.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_outputsettings.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_passthroughsettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_rawsettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_rec601settings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_rec709settings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_remixsettings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_rtmpcaptioninfodestinationsettings.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_rtmpgroupsettings.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_rtmpoutputsettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_scte20plusembeddeddestinationsettings.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_scte20sourcesettings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_scte27destinationsettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_scte27sourcesettings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_scte35spliceinsert.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_scte35timesignalapos.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_smptettdestinationsettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_standardhlssettings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_statickeysettings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_teletextdestinationsettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_teletextsourcesettings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_temporalfiltersettings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_timecodeconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_ttmldestinationsettings.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_udpcontainersettings.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_udpgroupsettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_udpoutputsettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_videoblackfailoversettings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_videocodecsettings.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_videodescription.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_videoselector.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_videoselectorcolorspacesettings.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_videoselectorpid.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_videoselectorprogramid.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_videoselectorsettings.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_vpcoutputsettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_wavsettings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-channel_webvttdestinationsettings.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-input.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-input_inputdestinationrequest.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-input_inputdevicerequest.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-input_inputdevicesettings.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-input_inputsourcerequest.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-input_inputvpcrequest.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-input_mediaconnectflowrequest.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-inputsecuritygroup.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/medialive/aws-medialive-inputsecuritygroup_inputwhitelistrulecidr.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-asset.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-asset_egressendpoint.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-channel.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-channel_hlsingest.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-channel_ingestendpoint.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-channel_logconfiguration.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-originendpoint.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-originendpoint_adtriggers.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-originendpoint_authorization.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-originendpoint_cmafencryption.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-originendpoint_cmafpackage.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-originendpoint_dashencryption.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-originendpoint_dashpackage.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlsencryption.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlsmanifest.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlspackage.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-originendpoint_mssencryption.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-originendpoint_msspackage.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-originendpoint_spekekeyprovider.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-originendpoint_streamselection.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_cmafencryption.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_cmafpackage.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashencryption.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashmanifest.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashpackage.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlsencryption.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlsmanifest.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlspackage.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_mssencryption.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_mssmanifest.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_msspackage.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_spekekeyprovider.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_streamselection.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-packaginggroup.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-packaginggroup_authorization.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/mediapackage/aws-mediapackage-packaginggroup_logconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/mediastore/aws-mediastore-container.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/mediastore/aws-mediastore-container_corsrule.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/mediastore/aws-mediastore-container_metricpolicy.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/mediastore/aws-mediastore-container_metricpolicyrule.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/memorydb/aws-memorydb-acl.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/memorydb/aws-memorydb-cluster.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/memorydb/aws-memorydb-cluster_endpoint.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/memorydb/aws-memorydb-parametergroup.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/memorydb/aws-memorydb-subnetgroup.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/memorydb/aws-memorydb-user.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/msk/aws-msk-cluster.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/msk/aws-msk-cluster_brokerlogs.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/msk/aws-msk-cluster_brokernodegroupinfo.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/msk/aws-msk-cluster_clientauthentication.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/msk/aws-msk-cluster_cloudwatchlogs.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/msk/aws-msk-cluster_configurationinfo.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/msk/aws-msk-cluster_connectivityinfo.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/msk/aws-msk-cluster_ebsstorageinfo.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/msk/aws-msk-cluster_encryptionatrest.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/msk/aws-msk-cluster_encryptioninfo.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/msk/aws-msk-cluster_encryptionintransit.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/msk/aws-msk-cluster_firehose.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/msk/aws-msk-cluster_iam.go (90%)
 rename {goformation => pkg/goformation}/cloudformation/msk/aws-msk-cluster_jmxexporter.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/msk/aws-msk-cluster_logginginfo.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/msk/aws-msk-cluster_nodeexporter.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/msk/aws-msk-cluster_openmonitoring.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/msk/aws-msk-cluster_prometheus.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/msk/aws-msk-cluster_publicaccess.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/msk/aws-msk-cluster_s3.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/msk/aws-msk-cluster_sasl.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/msk/aws-msk-cluster_scram.go (90%)
 rename {goformation => pkg/goformation}/cloudformation/msk/aws-msk-cluster_storageinfo.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/msk/aws-msk-cluster_tls.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/msk/aws-msk-cluster_unauthenticated.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/mwaa/aws-mwaa-environment.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/mwaa/aws-mwaa-environment_loggingconfiguration.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/mwaa/aws-mwaa-environment_moduleloggingconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/mwaa/aws-mwaa-environment_networkconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/neptune/aws-neptune-dbcluster.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/neptune/aws-neptune-dbcluster_dbclusterrole.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/neptune/aws-neptune-dbclusterparametergroup.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/neptune/aws-neptune-dbinstance.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/neptune/aws-neptune-dbparametergroup.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/neptune/aws-neptune-dbsubnetgroup.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-firewall.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-firewall_subnetmapping.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_actiondefinition.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_customaction.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_dimension.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_firewallpolicy.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_publishmetricaction.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statefulengineoptions.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statefulrulegroupreference.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statelessrulegroupreference.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration_logdestinationconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration_loggingconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-rulegroup.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_actiondefinition.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_address.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_customaction.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_dimension.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_header.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ipset.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_matchattributes.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_portrange.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_portset.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_publishmetricaction.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ruledefinition.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulegroup.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ruleoption.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulessource.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulessourcelist.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulevariables.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statefulrule.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statefulruleoptions.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statelessrule.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statelessrulesandcustomactions.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_tcpflagfield.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/networkmanager/aws-networkmanager-customergatewayassociation.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/networkmanager/aws-networkmanager-device.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/networkmanager/aws-networkmanager-device_location.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/networkmanager/aws-networkmanager-globalnetwork.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/networkmanager/aws-networkmanager-link.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/networkmanager/aws-networkmanager-link_bandwidth.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/networkmanager/aws-networkmanager-linkassociation.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/networkmanager/aws-networkmanager-site.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/networkmanager/aws-networkmanager-site_location.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/networkmanager/aws-networkmanager-transitgatewayregistration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/nimblestudio/aws-nimblestudio-launchprofile.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/nimblestudio/aws-nimblestudio-launchprofile_streamconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/nimblestudio/aws-nimblestudio-streamingimage.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/nimblestudio/aws-nimblestudio-studio.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/nimblestudio/aws-nimblestudio-studio_studioencryptionconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_activedirectorycomputerattribute.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_activedirectoryconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_computefarmconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_licenseserviceconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_scriptparameterkeyvalue.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_sharedfilesystemconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_studiocomponentconfiguration.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_studiocomponentinitializationscript.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/opensearchservice/aws-opensearchservice-domain.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/opensearchservice/aws-opensearchservice-domain_advancedsecurityoptionsinput.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/opensearchservice/aws-opensearchservice-domain_clusterconfig.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/opensearchservice/aws-opensearchservice-domain_cognitooptions.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/opensearchservice/aws-opensearchservice-domain_domainendpointoptions.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/opensearchservice/aws-opensearchservice-domain_ebsoptions.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/opensearchservice/aws-opensearchservice-domain_encryptionatrestoptions.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/opensearchservice/aws-opensearchservice-domain_logpublishingoption.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/opensearchservice/aws-opensearchservice-domain_masteruseroptions.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/opensearchservice/aws-opensearchservice-domain_nodetonodeencryptionoptions.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/opensearchservice/aws-opensearchservice-domain_snapshotoptions.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/opensearchservice/aws-opensearchservice-domain_vpcoptions.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/opensearchservice/aws-opensearchservice-domain_zoneawarenessconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/opsworks/aws-opsworks-app.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/opsworks/aws-opsworks-app_datasource.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/opsworks/aws-opsworks-app_environmentvariable.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/opsworks/aws-opsworks-app_source.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/opsworks/aws-opsworks-app_sslconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/opsworks/aws-opsworks-elasticloadbalancerattachment.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/opsworks/aws-opsworks-instance.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/opsworks/aws-opsworks-instance_blockdevicemapping.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/opsworks/aws-opsworks-instance_ebsblockdevice.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/opsworks/aws-opsworks-instance_timebasedautoscaling.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/opsworks/aws-opsworks-layer.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/opsworks/aws-opsworks-layer_autoscalingthresholds.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/opsworks/aws-opsworks-layer_lifecycleeventconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/opsworks/aws-opsworks-layer_loadbasedautoscaling.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/opsworks/aws-opsworks-layer_recipes.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/opsworks/aws-opsworks-layer_shutdowneventconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/opsworks/aws-opsworks-layer_volumeconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/opsworks/aws-opsworks-stack.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/opsworks/aws-opsworks-stack_chefconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/opsworks/aws-opsworks-stack_elasticip.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/opsworks/aws-opsworks-stack_rdsdbinstance.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/opsworks/aws-opsworks-stack_source.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/opsworks/aws-opsworks-stack_stackconfigurationmanager.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/opsworks/aws-opsworks-userprofile.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/opsworks/aws-opsworks-volume.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/opsworkscm/aws-opsworkscm-server.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/opsworkscm/aws-opsworkscm-server_engineattribute.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/panorama/aws-panorama-applicationinstance.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/panorama/aws-panorama-applicationinstance_manifestoverridespayload.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/panorama/aws-panorama-applicationinstance_manifestpayload.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/panorama/aws-panorama-package.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/panorama/aws-panorama-packageversion.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-admchannel.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-apnschannel.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-apnssandboxchannel.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-apnsvoipchannel.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-apnsvoipsandboxchannel.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-app.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-applicationsettings.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-applicationsettings_campaignhook.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-applicationsettings_limits.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-applicationsettings_quiettime.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-baiduchannel.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-campaign.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-campaign_attributedimension.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-campaign_campaignemailmessage.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-campaign_campaigneventfilter.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-campaign_campaignhook.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-campaign_campaigninappmessage.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-campaign_campaignsmsmessage.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-campaign_defaultbuttonconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-campaign_eventdimensions.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagebodyconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagebutton.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagecontent.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessageheaderconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-campaign_limits.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-campaign_message.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-campaign_messageconfiguration.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-campaign_metricdimension.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-campaign_overridebuttonconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-campaign_quiettime.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-campaign_schedule.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-campaign_setdimension.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-campaign_writetreatmentresource.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-emailchannel.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-emailtemplate.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-eventstream.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-gcmchannel.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-inapptemplate.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-inapptemplate_bodyconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-inapptemplate_buttonconfig.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-inapptemplate_defaultbuttonconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-inapptemplate_headerconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-inapptemplate_inappmessagecontent.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-inapptemplate_overridebuttonconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-pushtemplate.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-pushtemplate_androidpushnotificationtemplate.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-pushtemplate_apnspushnotificationtemplate.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-pushtemplate_defaultpushnotificationtemplate.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-segment.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-segment_attributedimension.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-segment_behavior.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-segment_coordinates.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-segment_demographic.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-segment_gpspoint.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-segment_groups.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-segment_location.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-segment_recency.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-segment_segmentdimensions.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-segment_segmentgroups.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-segment_setdimension.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-segment_sourcesegments.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-smschannel.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-smstemplate.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/pinpoint/aws-pinpoint-voicechannel.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/pinpointemail/aws-pinpointemail-configurationset.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/pinpointemail/aws-pinpointemail-configurationset_deliveryoptions.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/pinpointemail/aws-pinpointemail-configurationset_reputationoptions.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/pinpointemail/aws-pinpointemail-configurationset_sendingoptions.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/pinpointemail/aws-pinpointemail-configurationset_tags.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/pinpointemail/aws-pinpointemail-configurationset_trackingoptions.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_cloudwatchdestination.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_dimensionconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_eventdestination.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_kinesisfirehosedestination.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_pinpointdestination.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_snsdestination.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/pinpointemail/aws-pinpointemail-dedicatedippool.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/pinpointemail/aws-pinpointemail-dedicatedippool_tags.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/pinpointemail/aws-pinpointemail-identity.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/pinpointemail/aws-pinpointemail-identity_mailfromattributes.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/pinpointemail/aws-pinpointemail-identity_tags.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/policies/policies.go (99%)
 rename {goformation => pkg/goformation}/cloudformation/policies_test.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/qldb/aws-qldb-ledger.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/qldb/aws-qldb-stream.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/qldb/aws-qldb-stream_kinesisconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-analysis.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-analysis_analysiserror.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-analysis_analysissourceentity.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-analysis_analysissourcetemplate.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-analysis_datasetreference.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-analysis_datetimeparameter.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-analysis_decimalparameter.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-analysis_integerparameter.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-analysis_parameters.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-analysis_resourcepermission.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-analysis_sheet.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-analysis_stringparameter.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dashboard.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dashboard_adhocfilteringoption.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dashboard_dashboardpublishoptions.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dashboard_dashboardsourceentity.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dashboard_dashboardsourcetemplate.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dashboard_datasetreference.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dashboard_datetimeparameter.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dashboard_decimalparameter.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dashboard_exporttocsvoption.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dashboard_integerparameter.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dashboard_parameters.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dashboard_resourcepermission.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dashboard_sheetcontrolsoption.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dashboard_stringparameter.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dataset.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dataset_calculatedcolumn.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dataset_castcolumntypeoperation.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dataset_columndescription.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dataset_columngroup.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dataset_columnlevelpermissionrule.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dataset_columntag.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dataset_createcolumnsoperation.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dataset_customsql.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dataset_fieldfolder.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dataset_filteroperation.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dataset_geospatialcolumngroup.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dataset_ingestionwaitpolicy.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dataset_inputcolumn.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dataset_joininstruction.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dataset_joinkeyproperties.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dataset_logicaltable.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dataset_logicaltablesource.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dataset_outputcolumn.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dataset_physicaltable.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dataset_projectoperation.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dataset_relationaltable.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dataset_renamecolumnoperation.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dataset_resourcepermission.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dataset_rowlevelpermissiondataset.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dataset_s3source.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dataset_tagcolumnoperation.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dataset_transformoperation.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-dataset_uploadsettings.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-datasource.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-datasource_amazonelasticsearchparameters.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-datasource_amazonopensearchparameters.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-datasource_athenaparameters.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-datasource_auroraparameters.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-datasource_aurorapostgresqlparameters.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-datasource_credentialpair.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-datasource_datasourcecredentials.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-datasource_datasourceerrorinfo.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-datasource_datasourceparameters.go (99%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-datasource_manifestfilelocation.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-datasource_mariadbparameters.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-datasource_mysqlparameters.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-datasource_oracleparameters.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-datasource_postgresqlparameters.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-datasource_prestoparameters.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-datasource_rdsparameters.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-datasource_redshiftparameters.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-datasource_resourcepermission.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-datasource_s3parameters.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-datasource_snowflakeparameters.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-datasource_sparkparameters.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-datasource_sqlserverparameters.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-datasource_sslproperties.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-datasource_teradataparameters.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-datasource_vpcconnectionproperties.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-template.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-template_datasetreference.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-template_resourcepermission.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-template_templatesourceanalysis.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-template_templatesourceentity.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-template_templatesourcetemplate.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-theme.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-theme_borderstyle.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-theme_datacolorpalette.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-theme_font.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-theme_gutterstyle.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-theme_marginstyle.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-theme_resourcepermission.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-theme_sheetstyle.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-theme_themeconfiguration.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-theme_tilelayoutstyle.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-theme_tilestyle.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-theme_typography.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/quicksight/aws-quicksight-theme_uicolorpalette.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ram/aws-ram-resourceshare.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/rds/aws-rds-dbcluster.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/rds/aws-rds-dbcluster_dbclusterrole.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/rds/aws-rds-dbcluster_scalingconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/rds/aws-rds-dbclusterparametergroup.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/rds/aws-rds-dbinstance.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/rds/aws-rds-dbinstance_dbinstancerole.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/rds/aws-rds-dbinstance_processorfeature.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/rds/aws-rds-dbparametergroup.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/rds/aws-rds-dbproxy.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/rds/aws-rds-dbproxy_authformat.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/rds/aws-rds-dbproxy_tagformat.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/rds/aws-rds-dbproxyendpoint.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/rds/aws-rds-dbproxyendpoint_tagformat.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/rds/aws-rds-dbproxytargetgroup.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/rds/aws-rds-dbproxytargetgroup_connectionpoolconfigurationinfoformat.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/rds/aws-rds-dbsecuritygroup.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/rds/aws-rds-dbsecuritygroup_ingress.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/rds/aws-rds-dbsecuritygroupingress.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/rds/aws-rds-dbsubnetgroup.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/rds/aws-rds-eventsubscription.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/rds/aws-rds-globalcluster.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/rds/aws-rds-optiongroup.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/rds/aws-rds-optiongroup_optionconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/rds/aws-rds-optiongroup_optionsetting.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/redshift/aws-redshift-cluster.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/redshift/aws-redshift-cluster_endpoint.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/redshift/aws-redshift-cluster_loggingproperties.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/redshift/aws-redshift-clusterparametergroup.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/redshift/aws-redshift-clusterparametergroup_parameter.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/redshift/aws-redshift-clustersecuritygroup.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/redshift/aws-redshift-clustersecuritygroupingress.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/redshift/aws-redshift-clustersubnetgroup.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/redshift/aws-redshift-endpointaccess.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/redshift/aws-redshift-endpointaccess_vpcsecuritygroup.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/redshift/aws-redshift-endpointauthorization.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/redshift/aws-redshift-eventsubscription.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/redshift/aws-redshift-scheduledaction.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/redshift/aws-redshift-scheduledaction_pauseclustermessage.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/redshift/aws-redshift-scheduledaction_resizeclustermessage.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/redshift/aws-redshift-scheduledaction_resumeclustermessage.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/redshift/aws-redshift-scheduledaction_scheduledactiontype.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/refactorspaces/aws-refactorspaces-application.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/refactorspaces/aws-refactorspaces-application_apigatewayproxyinput.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/refactorspaces/aws-refactorspaces-environment.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/refactorspaces/aws-refactorspaces-route.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/refactorspaces/aws-refactorspaces-route_uripathrouteinput.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/refactorspaces/aws-refactorspaces-service.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/refactorspaces/aws-refactorspaces-service_lambdaendpointinput.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/refactorspaces/aws-refactorspaces-service_urlendpointinput.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/rekognition/aws-rekognition-project.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/resiliencehub/aws-resiliencehub-app.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/resiliencehub/aws-resiliencehub-app_physicalresourceid.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/resiliencehub/aws-resiliencehub-app_resourcemapping.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/resiliencehub/aws-resiliencehub-resiliencypolicy.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/resiliencehub/aws-resiliencehub-resiliencypolicy_failurepolicy.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/resourcegroups/aws-resourcegroups-group.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/resourcegroups/aws-resourcegroups-group_configurationitem.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/resourcegroups/aws-resourcegroups-group_configurationparameter.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/resourcegroups/aws-resourcegroups-group_query.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/resourcegroups/aws-resourcegroups-group_resourcequery.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/resourcegroups/aws-resourcegroups-group_tagfilter.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/robomaker/aws-robomaker-fleet.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/robomaker/aws-robomaker-robot.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/robomaker/aws-robomaker-robotapplication.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/robomaker/aws-robomaker-robotapplication_robotsoftwaresuite.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/robomaker/aws-robomaker-robotapplication_sourceconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/robomaker/aws-robomaker-robotapplicationversion.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/robomaker/aws-robomaker-simulationapplication.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/robomaker/aws-robomaker-simulationapplication_renderingengine.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/robomaker/aws-robomaker-simulationapplication_robotsoftwaresuite.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/robomaker/aws-robomaker-simulationapplication_simulationsoftwaresuite.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/robomaker/aws-robomaker-simulationapplication_sourceconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/robomaker/aws-robomaker-simulationapplicationversion.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/rolesanywhere/aws-rolesanywhere-crl.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/rolesanywhere/aws-rolesanywhere-profile.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_notificationsetting.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_source.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_sourcedata.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/route53/aws-route53-dnssec.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/route53/aws-route53-healthcheck.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/route53/aws-route53-healthcheck_alarmidentifier.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/route53/aws-route53-healthcheck_healthcheckconfig.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/route53/aws-route53-healthcheck_healthchecktag.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/route53/aws-route53-hostedzone.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/route53/aws-route53-hostedzone_hostedzoneconfig.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/route53/aws-route53-hostedzone_hostedzonetag.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/route53/aws-route53-hostedzone_queryloggingconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/route53/aws-route53-hostedzone_vpc.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/route53/aws-route53-keysigningkey.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/route53/aws-route53-recordset.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/route53/aws-route53-recordset_aliastarget.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/route53/aws-route53-recordset_geolocation.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/route53/aws-route53-recordsetgroup.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/route53/aws-route53-recordsetgroup_aliastarget.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/route53/aws-route53-recordsetgroup_geolocation.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/route53/aws-route53-recordsetgroup_recordset.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-cluster.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-cluster_clusterendpoint.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-controlpanel.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-routingcontrol.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_assertionrule.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_gatingrule.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_ruleconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-cell.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-readinesscheck.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-recoverygroup.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_dnstargetresource.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_nlbresource.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_r53resourcerecord.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_resource.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_targetresource.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/route53resolver/aws-route53resolver-firewalldomainlist.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/route53resolver/aws-route53resolver-firewallrulegroup.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/route53resolver/aws-route53resolver-firewallrulegroup_firewallrule.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/route53resolver/aws-route53resolver-firewallrulegroupassociation.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/route53resolver/aws-route53resolver-resolverconfig.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/route53resolver/aws-route53resolver-resolverdnssecconfig.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/route53resolver/aws-route53resolver-resolverendpoint.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/route53resolver/aws-route53resolver-resolverendpoint_ipaddressrequest.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/route53resolver/aws-route53resolver-resolverqueryloggingconfig.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/route53resolver/aws-route53resolver-resolverqueryloggingconfigassociation.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/route53resolver/aws-route53resolver-resolverrule.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/route53resolver/aws-route53resolver-resolverrule_targetaddress.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/route53resolver/aws-route53resolver-resolverruleassociation.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/rum/aws-rum-appmonitor.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/rum/aws-rum-appmonitor_appmonitorconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-accesspoint.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-accesspoint_publicaccessblockconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-accesspoint_vpcconfiguration.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_abortincompletemultipartupload.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_accelerateconfiguration.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_accesscontroltranslation.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_analyticsconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_bucketencryption.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_corsconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_corsrule.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_dataexport.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_defaultretention.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_deletemarkerreplication.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_destination.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_encryptionconfiguration.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_eventbridgeconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_filterrule.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_intelligenttieringconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_inventoryconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_lambdaconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_lifecycleconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_loggingconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_metrics.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_metricsconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_noncurrentversionexpiration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_noncurrentversiontransition.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_notificationconfiguration.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_notificationfilter.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_objectlockconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_objectlockrule.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_ownershipcontrols.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_ownershipcontrolsrule.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_publicaccessblockconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_queueconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_redirectallrequeststo.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_redirectrule.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_replicamodifications.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_replicationconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_replicationdestination.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_replicationrule.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_replicationruleandoperator.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_replicationrulefilter.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_replicationtime.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_replicationtimevalue.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_routingrule.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_routingrulecondition.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_rule.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_s3keyfilter.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_serversideencryptionbydefault.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_serversideencryptionrule.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_sourceselectioncriteria.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_ssekmsencryptedobjects.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_storageclassanalysis.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_tagfilter.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_tiering.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_topicconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_transition.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_versioningconfiguration.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucket_websiteconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-bucketpolicy.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-multiregionaccesspoint.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-multiregionaccesspoint_publicaccessblockconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-multiregionaccesspoint_region.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-multiregionaccesspointpolicy.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-storagelens.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-storagelens_accountlevel.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-storagelens_activitymetrics.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-storagelens_awsorg.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-storagelens_bucketlevel.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-storagelens_bucketsandregions.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-storagelens_cloudwatchmetrics.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-storagelens_dataexport.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-storagelens_encryption.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-storagelens_prefixlevel.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-storagelens_prefixlevelstoragemetrics.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-storagelens_s3bucketdestination.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-storagelens_selectioncriteria.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/s3/aws-s3-storagelens_storagelensconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint_objectlambdaconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint_transformationconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/s3objectlambda/aws-s3objectlambda-accesspointpolicy.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/s3outposts/aws-s3outposts-accesspoint.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/s3outposts/aws-s3outposts-accesspoint_vpcconfiguration.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/s3outposts/aws-s3outposts-bucket.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/s3outposts/aws-s3outposts-bucket_abortincompletemultipartupload.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/s3outposts/aws-s3outposts-bucket_lifecycleconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/s3outposts/aws-s3outposts-bucket_rule.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/s3outposts/aws-s3outposts-bucketpolicy.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/s3outposts/aws-s3outposts-endpoint.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/s3outposts/aws-s3outposts-endpoint_networkinterface.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-app.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-app_resourcespec.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-appimageconfig.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-appimageconfig_filesystemconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-appimageconfig_kernelgatewayimageconfig.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-appimageconfig_kernelspec.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-coderepository.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-coderepository_gitconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_clusterconfig.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_constraintsresource.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualityappspecification.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualitybaselineconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualityjobinput.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_endpointinput.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringoutput.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringoutputconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringresources.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_networkconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_s3output.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_statisticsresource.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_stoppingcondition.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_vpcconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-device.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-device_device.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-devicefleet.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-devicefleet_edgeoutputconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-domain.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-domain_customimage.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-domain_jupyterserverappsettings.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-domain_kernelgatewayappsettings.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-domain_resourcespec.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-domain_sharingsettings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-domain_usersettings.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-endpoint.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-endpoint_alarm.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-endpoint_autorollbackconfig.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-endpoint_bluegreenupdatepolicy.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-endpoint_capacitysize.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-endpoint_deploymentconfig.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-endpoint_trafficroutingconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-endpoint_variantproperty.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-endpointconfig.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceclientconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceconfig.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferencenotificationconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceoutputconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-endpointconfig_capturecontenttypeheader.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-endpointconfig_captureoption.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-endpointconfig_datacaptureconfig.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-endpointconfig_productionvariant.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-endpointconfig_serverlessconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-featuregroup.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-featuregroup_featuredefinition.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-image.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-imageversion.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-model.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-model_containerdefinition.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-model_imageconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-model_inferenceexecutionconfig.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-model_multimodelconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-model_repositoryauthconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-model_vpcconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_clusterconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_constraintsresource.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_endpointinput.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasappspecification.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasbaselineconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasjobinput.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringgroundtruths3input.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringoutput.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringoutputconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringresources.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_networkconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_s3output.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_stoppingcondition.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_vpcconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_clusterconfig.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_constraintsresource.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_endpointinput.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilityappspecification.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilitybaselineconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilityjobinput.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringoutput.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringoutputconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringresources.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_networkconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_s3output.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_stoppingcondition.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_vpcconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelpackagegroup.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_clusterconfig.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_constraintsresource.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_endpointinput.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualityappspecification.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualitybaselineconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualityjobinput.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringgroundtruths3input.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringoutput.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringoutputconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringresources.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_networkconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_s3output.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_stoppingcondition.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_vpcconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-monitoringschedule.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_baselineconfig.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_clusterconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_constraintsresource.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_endpointinput.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_environment.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringappspecification.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringexecutionsummary.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringinput.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringinputs.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringjobdefinition.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringoutput.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringoutputconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringresources.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringscheduleconfig.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_networkconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_s3output.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_scheduleconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_statisticsresource.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_stoppingcondition.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_vpcconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-notebookinstance.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-notebookinstancelifecycleconfig.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-notebookinstancelifecycleconfig_notebookinstancelifecyclehook.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-pipeline.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-project.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-userprofile.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-userprofile_customimage.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-userprofile_jupyterserverappsettings.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-userprofile_kernelgatewayappsettings.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-userprofile_resourcespec.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-userprofile_sharingsettings.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-userprofile_usersettings.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-workteam.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-workteam_cognitomemberdefinition.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-workteam_memberdefinition.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/sagemaker/aws-sagemaker-workteam_notificationconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/sdb/aws-sdb-domain.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/secretsmanager/aws-secretsmanager-resourcepolicy.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule_hostedrotationlambda.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule_rotationrules.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/secretsmanager/aws-secretsmanager-secret.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/secretsmanager/aws-secretsmanager-secret_generatesecretstring.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/secretsmanager/aws-secretsmanager-secret_replicaregion.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/secretsmanager/aws-secretsmanager-secrettargetattachment.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/securityhub/aws-securityhub-hub.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/api_cors.go (89%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/api_definitionuri.go (89%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/application_location.go (90%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-api.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-api_accesslogsetting.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-api_auth.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-api_corsconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-api_s3location.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-application.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-application_applicationlocation.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_alexaskillevent.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_apievent.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_bucketsampt.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_cloudwatcheventevent.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_cloudwatchlogsevent.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_collectionsampt.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_deadletterqueue.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_deploymentpreference.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_destinationconfig.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_domainsampt.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_dynamodbevent.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_emptysampt.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_eventbridgeruleevent.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_eventsource.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_filesystemconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_functionenvironment.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_functionsampt.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_iampolicydocument.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_identitysampt.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_iotruleevent.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_keysampt.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_kinesisevent.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_loggroupsampt.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_onfailure.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_queuesampt.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_s3event.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_s3keyfilter.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_s3keyfilterrule.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_s3location.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_s3notificationfilter.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_sampolicytemplate.go (99%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_scheduleevent.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_snsevent.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_sqsevent.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_statemachinesampt.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_streamsampt.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_tablesampt.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_tablestreamsampt.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_topicsampt.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-function_vpcconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-layerversion.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-simpletable.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-simpletable_primarykey.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-simpletable_provisionedthroughput.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-simpletable_ssespecification.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-statemachine.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-statemachine_apievent.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-statemachine_cloudwatcheventevent.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-statemachine_cloudwatchlogsloggroup.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-statemachine_eventbridgeruleevent.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-statemachine_eventsource.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-statemachine_functionsampt.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-statemachine_iampolicydocument.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-statemachine_logdestination.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-statemachine_loggingconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-statemachine_s3location.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-statemachine_sampolicytemplate.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-statemachine_scheduleevent.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/aws-serverless-statemachine_statemachinesampt.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/function_codeuri.go (89%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/function_events.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/function_policies.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/function_properties.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/statemachine_definitionuri.go (90%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/statemachine_policies.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/serverless/statemachine_properties.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/servicecatalog/aws-servicecatalog-acceptedportfolioshare.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/servicecatalog/aws-servicecatalog-cloudformationproduct.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/servicecatalog/aws-servicecatalog-cloudformationproduct_provisioningartifactproperties.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct_provisioningparameter.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct_provisioningpreferences.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/servicecatalog/aws-servicecatalog-launchnotificationconstraint.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/servicecatalog/aws-servicecatalog-launchroleconstraint.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/servicecatalog/aws-servicecatalog-launchtemplateconstraint.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/servicecatalog/aws-servicecatalog-portfolio.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/servicecatalog/aws-servicecatalog-portfolioprincipalassociation.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/servicecatalog/aws-servicecatalog-portfolioproductassociation.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/servicecatalog/aws-servicecatalog-portfolioshare.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/servicecatalog/aws-servicecatalog-resourceupdateconstraint.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/servicecatalog/aws-servicecatalog-serviceaction.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/servicecatalog/aws-servicecatalog-serviceaction_definitionparameter.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/servicecatalog/aws-servicecatalog-serviceactionassociation.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/servicecatalog/aws-servicecatalog-stacksetconstraint.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/servicecatalog/aws-servicecatalog-tagoption.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/servicecatalog/aws-servicecatalog-tagoptionassociation.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-application.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-attributegroup.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-attributegroupassociation.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-resourceassociation.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/servicediscovery/aws-servicediscovery-httpnamespace.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/servicediscovery/aws-servicediscovery-instance.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_privatednspropertiesmutable.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_properties.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_soa.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_properties.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_publicdnspropertiesmutable.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_soa.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/servicediscovery/aws-servicediscovery-service.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/servicediscovery/aws-servicediscovery-service_dnsconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/servicediscovery/aws-servicediscovery-service_dnsrecord.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/servicediscovery/aws-servicediscovery-service_healthcheckconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/servicediscovery/aws-servicediscovery-service_healthcheckcustomconfig.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ses/aws-ses-configurationset.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ses/aws-ses-configurationseteventdestination.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ses/aws-ses-configurationseteventdestination_cloudwatchdestination.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ses/aws-ses-configurationseteventdestination_dimensionconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ses/aws-ses-configurationseteventdestination_eventdestination.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ses/aws-ses-configurationseteventdestination_kinesisfirehosedestination.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ses/aws-ses-contactlist.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ses/aws-ses-contactlist_topic.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ses/aws-ses-receiptfilter.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/ses/aws-ses-receiptfilter_filter.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ses/aws-ses-receiptfilter_ipfilter.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ses/aws-ses-receiptrule.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ses/aws-ses-receiptrule_action.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ses/aws-ses-receiptrule_addheaderaction.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ses/aws-ses-receiptrule_bounceaction.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ses/aws-ses-receiptrule_lambdaaction.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ses/aws-ses-receiptrule_rule.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ses/aws-ses-receiptrule_s3action.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ses/aws-ses-receiptrule_snsaction.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ses/aws-ses-receiptrule_stopaction.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ses/aws-ses-receiptrule_workmailaction.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ses/aws-ses-receiptruleset.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ses/aws-ses-template.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/ses/aws-ses-template_template.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/signer/aws-signer-profilepermission.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/signer/aws-signer-signingprofile.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/signer/aws-signer-signingprofile_signaturevalidityperiod.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/sns/aws-sns-subscription.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/sns/aws-sns-topic.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sns/aws-sns-topic_subscription.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/sns/aws-sns-topicpolicy.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/sqs/aws-sqs-queue.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/sqs/aws-sqs-queuepolicy.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ssm/aws-ssm-association.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/ssm/aws-ssm-association_instanceassociationoutputlocation.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ssm/aws-ssm-association_parametervalues.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/ssm/aws-ssm-association_s3outputlocation.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ssm/aws-ssm-association_target.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ssm/aws-ssm-document.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ssm/aws-ssm-document_attachmentssource.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ssm/aws-ssm-document_documentrequires.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ssm/aws-ssm-maintenancewindow.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ssm/aws-ssm-maintenancewindowtarget.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ssm/aws-ssm-maintenancewindowtarget_targets.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ssm/aws-ssm-maintenancewindowtask.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/ssm/aws-ssm-maintenancewindowtask_logginginfo.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowautomationparameters.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowlambdaparameters.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowruncommandparameters.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowstepfunctionsparameters.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ssm/aws-ssm-maintenancewindowtask_notificationconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ssm/aws-ssm-maintenancewindowtask_target.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ssm/aws-ssm-maintenancewindowtask_taskinvocationparameters.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ssm/aws-ssm-parameter.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ssm/aws-ssm-patchbaseline.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ssm/aws-ssm-patchbaseline_patchfilter.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ssm/aws-ssm-patchbaseline_patchfiltergroup.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ssm/aws-ssm-patchbaseline_patchsource.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ssm/aws-ssm-patchbaseline_patchstringdate.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ssm/aws-ssm-patchbaseline_rule.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ssm/aws-ssm-patchbaseline_rulegroup.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ssm/aws-ssm-resourcedatasync.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ssm/aws-ssm-resourcedatasync_awsorganizationssource.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ssm/aws-ssm-resourcedatasync_s3destination.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ssm/aws-ssm-resourcedatasync_syncsource.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/ssmcontacts/aws-ssmcontacts-contact.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ssmcontacts/aws-ssmcontacts-contact_channeltargetinfo.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ssmcontacts/aws-ssmcontacts-contact_contacttargetinfo.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ssmcontacts/aws-ssmcontacts-contact_stage.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ssmcontacts/aws-ssmcontacts-contact_targets.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ssmcontacts/aws-ssmcontacts-contactchannel.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/ssmincidents/aws-ssmincidents-replicationset.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ssmincidents/aws-ssmincidents-replicationset_regionconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ssmincidents/aws-ssmincidents-replicationset_replicationregion.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/ssmincidents/aws-ssmincidents-responseplan.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/ssmincidents/aws-ssmincidents-responseplan_action.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ssmincidents/aws-ssmincidents-responseplan_chatchannel.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/ssmincidents/aws-ssmincidents-responseplan_incidenttemplate.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ssmincidents/aws-ssmincidents-responseplan_notificationtargetitem.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/ssmincidents/aws-ssmincidents-responseplan_ssmautomation.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/ssmincidents/aws-ssmincidents-responseplan_ssmparameter.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/sso/aws-sso-assignment.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration_accesscontrolattribute.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration_accesscontrolattributevalue.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/sso/aws-sso-permissionset.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/stepfunctions/aws-stepfunctions-activity.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/stepfunctions/aws-stepfunctions-activity_tagsentry.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/stepfunctions/aws-stepfunctions-statemachine.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/stepfunctions/aws-stepfunctions-statemachine_cloudwatchlogsloggroup.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/stepfunctions/aws-stepfunctions-statemachine_definition.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/stepfunctions/aws-stepfunctions-statemachine_definitionsubstitutions.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/stepfunctions/aws-stepfunctions-statemachine_logdestination.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/stepfunctions/aws-stepfunctions-statemachine_loggingconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/stepfunctions/aws-stepfunctions-statemachine_s3location.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/stepfunctions/aws-stepfunctions-statemachine_tagsentry.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/stepfunctions/aws-stepfunctions-statemachine_tracingconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/synthetics/aws-synthetics-canary.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/synthetics/aws-synthetics-canary_artifactconfig.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/synthetics/aws-synthetics-canary_basescreenshot.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/synthetics/aws-synthetics-canary_code.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/synthetics/aws-synthetics-canary_runconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/synthetics/aws-synthetics-canary_s3encryption.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/synthetics/aws-synthetics-canary_schedule.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/synthetics/aws-synthetics-canary_visualreference.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/synthetics/aws-synthetics-canary_vpcconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/tags/tag.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/template.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/timestream/aws-timestream-database.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/timestream/aws-timestream-scheduledquery.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/timestream/aws-timestream-scheduledquery_dimensionmapping.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/timestream/aws-timestream-scheduledquery_errorreportconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/timestream/aws-timestream-scheduledquery_mixedmeasuremapping.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/timestream/aws-timestream-scheduledquery_multimeasureattributemapping.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/timestream/aws-timestream-scheduledquery_multimeasuremappings.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/timestream/aws-timestream-scheduledquery_notificationconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/timestream/aws-timestream-scheduledquery_s3configuration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/timestream/aws-timestream-scheduledquery_scheduleconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/timestream/aws-timestream-scheduledquery_snsconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/timestream/aws-timestream-scheduledquery_targetconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/timestream/aws-timestream-scheduledquery_timestreamconfiguration.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/timestream/aws-timestream-table.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/transfer/aws-transfer-server.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/transfer/aws-transfer-server_endpointdetails.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/transfer/aws-transfer-server_identityproviderdetails.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/transfer/aws-transfer-server_protocol.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/transfer/aws-transfer-server_protocoldetails.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/transfer/aws-transfer-server_securitygroupid.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/transfer/aws-transfer-server_workflowdetail.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/transfer/aws-transfer-server_workflowdetails.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/transfer/aws-transfer-user.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/transfer/aws-transfer-user_homedirectorymapentry.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/transfer/aws-transfer-user_posixprofile.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/transfer/aws-transfer-user_sshpublickey.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/transfer/aws-transfer-workflow.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/transfer/aws-transfer-workflow_workflowstep.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/types/intrinsics.go (100%)
 rename {goformation => pkg/goformation}/cloudformation/types/types.go (100%)
 rename {goformation => pkg/goformation}/cloudformation/utils/utils.go (100%)
 rename {goformation => pkg/goformation}/cloudformation/waf/aws-waf-bytematchset.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/waf/aws-waf-bytematchset_bytematchtuple.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/waf/aws-waf-bytematchset_fieldtomatch.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/waf/aws-waf-ipset.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/waf/aws-waf-ipset_ipsetdescriptor.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/waf/aws-waf-rule.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/waf/aws-waf-rule_predicate.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/waf/aws-waf-sizeconstraintset.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/waf/aws-waf-sizeconstraintset_fieldtomatch.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/waf/aws-waf-sizeconstraintset_sizeconstraint.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/waf/aws-waf-sqlinjectionmatchset.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/waf/aws-waf-sqlinjectionmatchset_fieldtomatch.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/waf/aws-waf-sqlinjectionmatchset_sqlinjectionmatchtuple.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/waf/aws-waf-webacl.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/waf/aws-waf-webacl_activatedrule.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/waf/aws-waf-webacl_wafaction.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/waf/aws-waf-xssmatchset.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/waf/aws-waf-xssmatchset_fieldtomatch.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/waf/aws-waf-xssmatchset_xssmatchtuple.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/wafregional/aws-wafregional-bytematchset.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/wafregional/aws-wafregional-bytematchset_bytematchtuple.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/wafregional/aws-wafregional-bytematchset_fieldtomatch.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/wafregional/aws-wafregional-geomatchset.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/wafregional/aws-wafregional-geomatchset_geomatchconstraint.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/wafregional/aws-wafregional-ipset.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/wafregional/aws-wafregional-ipset_ipsetdescriptor.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/wafregional/aws-wafregional-ratebasedrule.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/wafregional/aws-wafregional-ratebasedrule_predicate.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/wafregional/aws-wafregional-regexpatternset.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/wafregional/aws-wafregional-rule.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/wafregional/aws-wafregional-rule_predicate.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/wafregional/aws-wafregional-sizeconstraintset.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/wafregional/aws-wafregional-sizeconstraintset_fieldtomatch.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/wafregional/aws-wafregional-sizeconstraintset_sizeconstraint.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset_fieldtomatch.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset_sqlinjectionmatchtuple.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/wafregional/aws-wafregional-webacl.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/wafregional/aws-wafregional-webacl_action.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/wafregional/aws-wafregional-webacl_rule.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/wafregional/aws-wafregional-webaclassociation.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/wafregional/aws-wafregional-xssmatchset.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/wafregional/aws-wafregional-xssmatchset_fieldtomatch.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/wafregional/aws-wafregional-xssmatchset_xssmatchtuple.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-ipset.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-loggingconfiguration.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-loggingconfiguration_fieldtomatch.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-regexpatternset.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_andstatement.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_andstatementone.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_andstatementtwo.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_bytematchstatement.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_customresponsebody.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_fieldtomatch.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_forwardedipconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_geomatchstatement.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_ipsetforwardedipconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_ipsetreferencestatement.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_jsonbody.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_jsonmatchpattern.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_label.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_labelmatchstatement.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_labelsummary.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_notstatement.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_notstatementone.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_notstatementtwo.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_orstatement.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_orstatementone.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_orstatementtwo.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatement.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatementone.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatementtwo.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_regexpatternsetreferencestatement.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_rule.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_ruleaction.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_sizeconstraintstatement.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_sqlimatchstatement.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_statement.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_statementone.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_statementthree.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_statementtwo.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_texttransformation.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_visibilityconfig.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-rulegroup_xssmatchstatement.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_allowaction.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_andstatement.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_andstatementone.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_andstatementtwo.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_blockaction.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_bytematchstatement.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_countaction.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_customhttpheader.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_customrequesthandling.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_customresponse.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_customresponsebody.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_defaultaction.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_excludedrule.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_fieldtomatch.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_forwardedipconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_geomatchstatement.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_ipsetforwardedipconfiguration.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_ipsetreferencestatement.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_jsonbody.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_jsonmatchpattern.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_label.go (91%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_labelmatchstatement.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_managedrulegroupstatement.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_notstatement.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_notstatementone.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_notstatementtwo.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_orstatement.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_orstatementone.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_orstatementtwo.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_overrideaction.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatement.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatementone.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatementtwo.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_regexpatternsetreferencestatement.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_rule.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_ruleaction.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_rulegroupreferencestatement.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_sizeconstraintstatement.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_sqlimatchstatement.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_statement.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_statementone.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_statementthree.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_statementtwo.go (98%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_texttransformation.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_visibilityconfig.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webacl_xssmatchstatement.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/wafv2/aws-wafv2-webaclassociation.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/wisdom/aws-wisdom-assistant.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/wisdom/aws-wisdom-assistant_serversideencryptionconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/wisdom/aws-wisdom-assistantassociation.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/wisdom/aws-wisdom-assistantassociation_associationdata.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/wisdom/aws-wisdom-knowledgebase.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/wisdom/aws-wisdom-knowledgebase_appintegrationsconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/wisdom/aws-wisdom-knowledgebase_renderingconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/wisdom/aws-wisdom-knowledgebase_serversideencryptionconfiguration.go (92%)
 rename {goformation => pkg/goformation}/cloudformation/wisdom/aws-wisdom-knowledgebase_sourceconfiguration.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/workspaces/aws-workspaces-connectionalias.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/workspaces/aws-workspaces-connectionalias_connectionaliasassociation.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/workspaces/aws-workspaces-workspace.go (96%)
 rename {goformation => pkg/goformation}/cloudformation/workspaces/aws-workspaces-workspace_workspaceproperties.go (95%)
 rename {goformation => pkg/goformation}/cloudformation/xray/aws-xray-group.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/xray/aws-xray-group_insightsconfiguration.go (93%)
 rename {goformation => pkg/goformation}/cloudformation/xray/aws-xray-samplingrule.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/xray/aws-xray-samplingrule_samplingrule.go (97%)
 rename {goformation => pkg/goformation}/cloudformation/xray/aws-xray-samplingrule_samplingrulerecord.go (94%)
 rename {goformation => pkg/goformation}/cloudformation/xray/aws-xray-samplingrule_samplingruleupdate.go (97%)
 rename {goformation => pkg/goformation}/example/go-to-yaml/main.go (83%)
 rename {goformation => pkg/goformation}/example/yaml-to-go/main.go (95%)
 rename {goformation => pkg/goformation}/example/yaml-to-go/template.yaml (100%)
 rename {goformation => pkg/goformation}/generate/create-pull-request.sh (100%)
 rename {goformation => pkg/goformation}/generate/generate.go (100%)
 rename {goformation => pkg/goformation}/generate/generate.sh (100%)
 rename {goformation => pkg/goformation}/generate/generate_suite_test.go (100%)
 rename {goformation => pkg/goformation}/generate/main.go (100%)
 rename {goformation => pkg/goformation}/generate/naming.go (100%)
 rename {goformation => pkg/goformation}/generate/property.go (100%)
 rename {goformation => pkg/goformation}/generate/property_test.go (97%)
 rename {goformation => pkg/goformation}/generate/resource.go (100%)
 rename {goformation => pkg/goformation}/generate/resource_test.go (94%)
 rename {goformation => pkg/goformation}/generate/sam-2016-10-31.json (100%)
 rename {goformation => pkg/goformation}/generate/spec.go (100%)
 rename {goformation => pkg/goformation}/generate/templates/all.template (100%)
 rename {goformation => pkg/goformation}/generate/templates/polymorphic-property.template (100%)
 rename {goformation => pkg/goformation}/generate/templates/resource.template (100%)
 rename {goformation => pkg/goformation}/generate/templates/schema-property.template (100%)
 rename {goformation => pkg/goformation}/generate/templates/schema-resource.template (100%)
 rename {goformation => pkg/goformation}/generate/templates/schema.template (100%)
 rename {goformation => pkg/goformation}/goformation.go (94%)
 rename {goformation => pkg/goformation}/goformation_schema_test.go (100%)
 rename {goformation => pkg/goformation}/goformation_suite_test.go (100%)
 rename {goformation => pkg/goformation}/goformation_test.go (98%)
 rename {goformation => pkg/goformation}/intrinsics/intrinsics.go (100%)
 rename {goformation => pkg/goformation}/intrinsics/intrinsics_suite_test.go (100%)
 rename {goformation => pkg/goformation}/intrinsics/tags.go (100%)
 rename {goformation => pkg/goformation}/schema/README.md (100%)
 rename {goformation => pkg/goformation}/schema/cloudformation.go (100%)
 rename {goformation => pkg/goformation}/schema/cloudformation.schema.json (100%)
 rename {goformation => pkg/goformation}/schema/sam.go (100%)
 rename {goformation => pkg/goformation}/schema/sam.schema.json (100%)
 rename {goformation => pkg/goformation}/static/logo.png (100%)
 rename {goformation => pkg/goformation}/test.go (100%)
 rename {goformation => pkg/goformation}/test/json/invalid-sam-template-no-transform.json (100%)
 rename {goformation => pkg/goformation}/test/json/invalid-sam-template-wrong-transform.json (100%)
 rename {goformation => pkg/goformation}/test/json/invalid-template-additional-property.json (100%)
 rename {goformation => pkg/goformation}/test/json/invalid-template-additional-resource-property.json (100%)
 rename {goformation => pkg/goformation}/test/json/invalid-template-empty-resource-properties.json (100%)
 rename {goformation => pkg/goformation}/test/json/invalid-template-invalid-resource-name.json (100%)
 rename {goformation => pkg/goformation}/test/json/invalid-template-invalid-resource-subproperty.json (100%)
 rename {goformation => pkg/goformation}/test/json/invalid-template-missing-resource-properties.json (100%)
 rename {goformation => pkg/goformation}/test/json/invalid-template-missing-resource-type.json (100%)
 rename {goformation => pkg/goformation}/test/json/invalid-template-missing-resources.json (100%)
 rename {goformation => pkg/goformation}/test/json/invalid-template-subproperty-missing-property.json (100%)
 rename {goformation => pkg/goformation}/test/json/invalid-template-unknown-resource-type.json (100%)
 rename {goformation => pkg/goformation}/test/json/invalid-template-unknown-subproperty-property.json (100%)
 rename {goformation => pkg/goformation}/test/json/resource-with-tags.json (100%)
 rename {goformation => pkg/goformation}/test/json/valid-sam-template.json (100%)
 rename {goformation => pkg/goformation}/test/json/valid-template-resource-attributes.json (100%)
 rename {goformation => pkg/goformation}/test/json/valid-template-with-fns.json (100%)
 rename {goformation => pkg/goformation}/test/json/valid-template.json (100%)
 rename {goformation => pkg/goformation}/test/yaml/api-swagger-plain.yaml (100%)
 rename {goformation => pkg/goformation}/test/yaml/aws-serverless-api-string-or-cors-configuration.yaml (100%)
 rename {goformation => pkg/goformation}/test/yaml/aws-serverless-api-swagger.yaml (100%)
 rename {goformation => pkg/goformation}/test/yaml/aws-serverless-api.yaml (100%)
 rename {goformation => pkg/goformation}/test/yaml/aws-serverless-function-2016-10-31.yaml (100%)
 rename {goformation => pkg/goformation}/test/yaml/aws-serverless-function-api-event.yaml (100%)
 rename {goformation => pkg/goformation}/test/yaml/aws-serverless-function-env-vars.yaml (100%)
 rename {goformation => pkg/goformation}/test/yaml/aws-serverless-function-string-or-s3-location.yaml (100%)
 rename {goformation => pkg/goformation}/test/yaml/aws-serverless-simpletable.yaml (100%)
 rename {goformation => pkg/goformation}/test/yaml/codestar/java.yml (100%)
 rename {goformation => pkg/goformation}/test/yaml/codestar/nodejs.yml (100%)
 rename {goformation => pkg/goformation}/test/yaml/codestar/python.yml (100%)
 rename {goformation => pkg/goformation}/test/yaml/custom-resource.yaml (100%)
 rename {goformation => pkg/goformation}/test/yaml/output_section.yaml (100%)
 rename {goformation => pkg/goformation}/test/yaml/sam-official-samples/alexa_skill/index.js (100%)
 rename {goformation => pkg/goformation}/test/yaml/sam-official-samples/alexa_skill/template.yaml (100%)
 rename {goformation => pkg/goformation}/test/yaml/sam-official-samples/api-swagger-intrinsic.yaml (100%)
 rename {goformation => pkg/goformation}/test/yaml/sam-official-samples/api-swagger-plain.yaml (100%)
 rename {goformation => pkg/goformation}/test/yaml/sam-official-samples/api_backend/index.js (100%)
 rename {goformation => pkg/goformation}/test/yaml/sam-official-samples/api_backend/template.yaml (100%)
 rename {goformation => pkg/goformation}/test/yaml/sam-official-samples/api_swagger_cors/index.js (100%)
 rename {goformation => pkg/goformation}/test/yaml/sam-official-samples/api_swagger_cors/swagger.yaml (100%)
 rename {goformation => pkg/goformation}/test/yaml/sam-official-samples/api_swagger_cors/template.yaml (100%)
 rename {goformation => pkg/goformation}/test/yaml/sam-official-samples/codestar-node4.3.yaml (100%)
 rename {goformation => pkg/goformation}/test/yaml/sam-official-samples/encryption_proxy/README.MD (100%)
 rename {goformation => pkg/goformation}/test/yaml/sam-official-samples/encryption_proxy/decryption.py (100%)
 rename {goformation => pkg/goformation}/test/yaml/sam-official-samples/encryption_proxy/encryption.py (100%)
 rename {goformation => pkg/goformation}/test/yaml/sam-official-samples/encryption_proxy/template.yaml (100%)
 rename {goformation => pkg/goformation}/test/yaml/sam-official-samples/function.yaml (100%)
 rename {goformation => pkg/goformation}/test/yaml/sam-official-samples/hello_world/index.js (100%)
 rename {goformation => pkg/goformation}/test/yaml/sam-official-samples/hello_world/template.yaml (100%)
 rename {goformation => pkg/goformation}/test/yaml/sam-official-samples/inline_swagger/index.js (100%)
 rename {goformation => pkg/goformation}/test/yaml/sam-official-samples/inline_swagger/template.yaml (100%)
 rename {goformation => pkg/goformation}/test/yaml/sam-official-samples/iot_backend/index.js (100%)
 rename {goformation => pkg/goformation}/test/yaml/sam-official-samples/iot_backend/template.yaml (100%)
 rename {goformation => pkg/goformation}/test/yaml/sam-official-samples/s3_processor/index.js (100%)
 rename {goformation => pkg/goformation}/test/yaml/sam-official-samples/s3_processor/template.yaml (100%)
 rename {goformation => pkg/goformation}/test/yaml/sam-official-samples/schedule/index.js (100%)
 rename {goformation => pkg/goformation}/test/yaml/sam-official-samples/schedule/template.yaml (100%)
 rename {goformation => pkg/goformation}/test/yaml/sam-official-samples/stream_processor/index.js (100%)
 rename {goformation => pkg/goformation}/test/yaml/sam-official-samples/stream_processor/template.yaml (100%)
 rename {goformation => pkg/goformation}/test/yaml/sam-official-samples/templates/basic.yaml (100%)
 rename {goformation => pkg/goformation}/test/yaml/sam-official-samples/templates/intrinsic.yaml (100%)
 rename {goformation => pkg/goformation}/test/yaml/sam-official-samples/templates/wrong.yaml (100%)
 rename {goformation => pkg/goformation}/test/yaml/transform-multiple.yaml (100%)
 rename {goformation => pkg/goformation}/test/yaml/transform-single.yaml (100%)
 rename {goformation => pkg/goformation}/test/yaml/validation-errors/no-resources-section.yaml (100%)
 rename {goformation => pkg/goformation}/test/yaml/yaml-intrinsic-tags.yaml (100%)

diff --git a/.github/workflows/link-checker.yaml b/.github/workflows/link-checker.yaml
index d73c7d8d75..d97e6eb4a4 100644
--- a/.github/workflows/link-checker.yaml
+++ b/.github/workflows/link-checker.yaml
@@ -21,7 +21,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a #v5.2.0
         with:
-          go-version: 1.21.x
+          go-version: 1.22.x
           cache: false
 
       - name: Install doc dependencies
@@ -33,4 +33,4 @@ jobs:
       - name: Link Checker
         uses: lycheeverse/lychee-action@f796c8b7d468feb9b8c0a46da3fac0af6874d374 #v2.2.0
         with:
-          args: --exclude-all-private --exclude-mail --exclude-file .github/workflows/exclude-file.txt --exclude-path goformation --verbose --no-progress './**/*.md' './**/*.html'
+          args: --exclude-all-private --exclude-mail --exclude-file .github/workflows/exclude-file.txt --exclude-path pkg/goformation --verbose --no-progress './**/*.md' './**/*.html'
diff --git a/.golangci.yml b/.golangci.yml
index 9e2bfe4cb1..0181140613 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -19,34 +19,7 @@ run:
         - release
         - integration
 
-# output configuration options
 output:
-    # The formats used to render issues.
-    # Formats:
-    # - `colored-line-number`
-    # - `line-number`
-    # - `json`
-    # - `colored-tab`
-    # - `tab`
-    # - `html`
-    # - `checkstyle`
-    # - `code-climate`
-    # - `junit-xml`
-    # - `junit-xml-extended`
-    # - `github-actions`
-    # - `teamcity`
-    # - `sarif`
-    # Output path can be either `stdout`, `stderr` or path to the file to write to.
-    #
-    # For the CLI flag (`--out-format`), multiple formats can be specified by separating them by comma.
-    # The output can be specified for each of them by separating format name and path by colon symbol.
-    # Example: "--out-format=checkstyle:report.xml,json:stdout,colored-line-number"
-    # The CLI flag (`--out-format`) override the configuration file.
-    #
-    # Default:
-    #   formats:
-    #     - format: colored-line-number
-    #       path: stdout
     formats:
     - format: tab
 
@@ -181,7 +154,7 @@ issues:
         - ^vendor$
         - ^build$
         - ^pkg\/eks\/mocks$
-        - ^goformation$
+        - ^pkg\/goformation*
 
     # Which files to exclude: they will be analyzed, but issues from them won't be reported.
     # There is no need to include all autogenerated files,
diff --git a/go.mod b/go.mod
index b53efcd24b..eb9fc02b2e 100644
--- a/go.mod
+++ b/go.mod
@@ -30,7 +30,6 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/sts v1.33.5
 	github.com/aws/smithy-go v1.22.1
 	github.com/awslabs/amazon-eks-ami/nodeadm v0.0.0-20240508073157-fbfa1bc129f5
-	github.com/awslabs/goformation/v4 v4.15.5
 	github.com/benjamintf1/unmarshalledmatchers v1.0.0
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/bxcodec/faker v2.0.1+incompatible
@@ -53,12 +52,15 @@ require (
 	github.com/kubicorn/kubicorn v0.0.0-20180829191017-06f6bce92acc
 	github.com/lithammer/dedent v1.1.0
 	github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1
+	github.com/onsi/ginkgo v1.16.4
 	github.com/onsi/ginkgo/v2 v2.17.1
 	github.com/onsi/gomega v1.31.1
 	github.com/orcaman/concurrent-map v1.0.0
 	github.com/otiai10/copy v1.14.0
 	github.com/pelletier/go-toml v1.9.5
 	github.com/pkg/errors v0.9.1
+	github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b
+	github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522
 	github.com/sethvargo/go-password v0.2.0
 	github.com/spf13/afero v1.11.0
 	github.com/spf13/cobra v1.8.0
@@ -70,6 +72,7 @@ require (
 	github.com/vburenin/ifacemaker v1.2.1
 	github.com/vektra/mockery/v2 v2.38.0
 	github.com/weaveworks/schemer v0.0.0-20230525114451-47139fe25848
+	github.com/xeipuuv/gojsonschema v1.2.0
 	github.com/xgfone/netaddr v0.5.1
 	golang.org/x/crypto v0.32.0
 	golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc
@@ -308,6 +311,7 @@ require (
 	github.com/nishanths/exhaustive v0.12.0 // indirect
 	github.com/nishanths/predeclared v0.2.2 // indirect
 	github.com/nunnatsa/ginkgolinter v0.16.2 // indirect
+	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/oliveagle/jsonpath v0.0.0-20180606110733-2e52cf6e6852 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
@@ -335,8 +339,6 @@ require (
 	github.com/sagikazarmark/locafero v0.3.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/sahilm/fuzzy v0.1.0 // indirect
-	github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b // indirect
-	github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522 // indirect
 	github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect
 	github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
 	github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
@@ -375,7 +377,6 @@ require (
 	github.com/voxelbrain/goptions v0.0.0-20180630082107-58cddc247ea2 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
-	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
 	github.com/xen0n/gosmopolitan v1.2.2 // indirect
 	github.com/xlab/treeprint v1.2.0 // indirect
 	github.com/yagipy/maintidx v1.0.0 // indirect
@@ -408,6 +409,7 @@ require (
 	gopkg.in/gcfg.v1 v1.2.3 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	honnef.co/go/tools v0.4.7 // indirect
@@ -464,6 +466,3 @@ replace (
 
 // Ensure k8s dependencies are also pinned accordingly
 replace github.com/acomagu/bufpipe => github.com/acomagu/bufpipe v1.0.4
-
-// Use a local fork of goformation
-replace github.com/awslabs/goformation/v4 => ./goformation
diff --git a/go.sum b/go.sum
index e5724e97e0..88c32279a7 100644
--- a/go.sum
+++ b/go.sum
@@ -734,40 +734,24 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.28 h1:1mOW9zAUMhTSrMDssE
 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.28/go.mod h1:kGlXVIWDfvt2Ox5zEaNglmq0hXPHgQFNMix33Tw22jA=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvKgqdiXoTxAF4HQcQ=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc=
-github.com/aws/aws-sdk-go-v2/service/autoscaling v1.51.6 h1:LGJBolNFEECBP7545NfeNIr6LxCIgYDli4n8vCs/eFI=
-github.com/aws/aws-sdk-go-v2/service/autoscaling v1.51.6/go.mod h1:Zgti4LZawMEhtIBBwY1YijZJncgUOmeZoTO05uP9tIw=
 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.51.7 h1:LDQ3goASec/ylee0tYuHLnvaXej3TkEpGRpRxwSwXhc=
 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.51.7/go.mod h1:Zgti4LZawMEhtIBBwY1YijZJncgUOmeZoTO05uP9tIw=
-github.com/aws/aws-sdk-go-v2/service/cloudformation v1.56.6 h1:YUShdqZUnWDyqygH57oW53E2qFDD+o/AW8nb8QZhBpk=
-github.com/aws/aws-sdk-go-v2/service/cloudformation v1.56.6/go.mod h1:pBGwFeRfyDeLx29/IM6a2SLWpJsyhHARi+WIgXRe3uo=
 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.56.7 h1:TSZ9VocRtgrtZyaAM9BDoCpM/4mbm5BDC7QPXnNQTy8=
 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.56.7/go.mod h1:pBGwFeRfyDeLx29/IM6a2SLWpJsyhHARi+WIgXRe3uo=
-github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.46.8 h1:RRK9pbImmTqX1y1d33Jtrw1n2R3B2e3o1LtfUG5QXI8=
-github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.46.8/go.mod h1:a94+UYpsBLThABCmb23CFqY8FglQzUgMNIfOJHn/seo=
 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.46.9 h1:5Gf6dTLBxEQ3fDIXDNaKwrJNJX3eS/Aq/umADz5q+w0=
 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.46.9/go.mod h1:a94+UYpsBLThABCmb23CFqY8FglQzUgMNIfOJHn/seo=
-github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.45.5 h1:slYEzDnAoEsSIX7XN6tkXkGsEUbpY6J0K/aAfv/qKdc=
-github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.45.5/go.mod h1:zZeYjS1D+qvIOiDrCT89Rrm6vSn4m8DNhi0kb3wwzYM=
 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.45.6 h1:2oLCi90fh8JYysC+7mk7g6Zlg/lDvB5wNMC2mGbrhiA=
 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.45.6/go.mod h1:zZeYjS1D+qvIOiDrCT89Rrm6vSn4m8DNhi0kb3wwzYM=
 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.48.4 h1:78+PSLTY1QcbesyoPKAnYRG+jFhcuZr17pGAQVxDTWw=
 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.48.4/go.mod h1:vPpQlrSaeqEX2s/iM5eqaSFUxVtBrpZFP9SOd25AZuY=
 github.com/aws/aws-sdk-go-v2/service/ec2 v1.166.0 h1:FDZVMxzXB13cRmHs3t3tH9gme8GhvmjsQXeXFI37OHU=
 github.com/aws/aws-sdk-go-v2/service/ec2 v1.166.0/go.mod h1:Wv7N3iFOKVsZNIaw9MOBUmwCkX6VMmQQRFhMrHtNGno=
-github.com/aws/aws-sdk-go-v2/service/eks v1.56.4 h1:dYl8n3WbUEBKLGFCoqukvnJcFNXb3VSUL5iTMtPmsV8=
-github.com/aws/aws-sdk-go-v2/service/eks v1.56.4/go.mod h1:6gWwo7rT4qfYVHwJnj0nUM4DP+XuURcTO+89H8dCvrM=
 github.com/aws/aws-sdk-go-v2/service/eks v1.56.5 h1:AoVtICtIPSSgRJzNhT5A6IAP9kNbah2jJu1MAnBkHtM=
 github.com/aws/aws-sdk-go-v2/service/eks v1.56.5/go.mod h1:6gWwo7rT4qfYVHwJnj0nUM4DP+XuURcTO+89H8dCvrM=
-github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.28.11 h1:vgp7a4NxxLZcT2lASEielbgqcEWVnwoyFvYgWmXI1B0=
-github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.28.11/go.mod h1:c7uVynXvirEGGCp4ITMF2JvPH7J3v2zomTvOoEdsPLg=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.28.12 h1:wwN9089a0gBqBa3DZUuN3zkPXRH+AolDeXSVACmHf1E=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.28.12/go.mod h1:c7uVynXvirEGGCp4ITMF2JvPH7J3v2zomTvOoEdsPLg=
-github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.43.6 h1:1vXGKSmuXZvfiYoVXK/9oYB9Xyw1ic9p59dbRRgGzVM=
-github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.43.6/go.mod h1:6QynTIHgeX3wwdpwlDhCovlJTwJ3Mb+Km2kVOCh26BA=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.43.7 h1:5zMWovjTaEb1efvvFfoRkftUWA+xfEdognn/JZC1/Hg=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.43.7/go.mod h1:6QynTIHgeX3wwdpwlDhCovlJTwJ3Mb+Km2kVOCh26BA=
-github.com/aws/aws-sdk-go-v2/service/iam v1.38.6 h1:AXwKkfCZEqUr1QuNb0UN44CIg5YN4jqfYwUpkv+dsSk=
-github.com/aws/aws-sdk-go-v2/service/iam v1.38.6/go.mod h1:dgsc0h/uKL5OjfHSZz6z7WhkX83BbRQ2ZxYoWYg5LbA=
 github.com/aws/aws-sdk-go-v2/service/iam v1.38.7 h1:MLW6hgPcmbg73uoSFPXBcVhn/E6bW1CpSBmZJoLeF4E=
 github.com/aws/aws-sdk-go-v2/service/iam v1.38.7/go.mod h1:dgsc0h/uKL5OjfHSZz6z7WhkX83BbRQ2ZxYoWYg5LbA=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 h1:iXtILhvDxB6kPvEXgsDhGaZCSC6LQET5ZHSdJozeI0Y=
@@ -776,14 +760,10 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.8 h1:cWno7lefS
 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.8/go.mod h1:tPD+VjU3ABTBoEJ3nctu5Nyg4P4yjqSH5bJGGkY4+XE=
 github.com/aws/aws-sdk-go-v2/service/kms v1.27.5 h1:7lKTr8zJ2nVaVgyII+7hUayTi7xWedMuANiNVXiD2S8=
 github.com/aws/aws-sdk-go-v2/service/kms v1.27.5/go.mod h1:D9FVDkZjkZnnFHymJ3fPVz0zOUlNSd0xcIIVmmrAac8=
-github.com/aws/aws-sdk-go-v2/service/outposts v1.48.2 h1:ZB/pxaacdQNXlYSMEi8M89IZ5Uy2d49NBKJgN+ubuH8=
-github.com/aws/aws-sdk-go-v2/service/outposts v1.48.2/go.mod h1:zd3BLQ8bJ3q0Hfvq6lfPQ7ZgbJi/jMDKTHuognrvl4Q=
 github.com/aws/aws-sdk-go-v2/service/outposts v1.48.3 h1:6fT4sNBD7VeLUwCVjitfBfzTTeUkjxGP+SOmU7va0/w=
 github.com/aws/aws-sdk-go-v2/service/outposts v1.48.3/go.mod h1:zd3BLQ8bJ3q0Hfvq6lfPQ7ZgbJi/jMDKTHuognrvl4Q=
 github.com/aws/aws-sdk-go-v2/service/pricing v1.17.0 h1:RQOMvPwte2H4ZqsiZmrla1crhBWDFnW8bZynkec5cGU=
 github.com/aws/aws-sdk-go-v2/service/pricing v1.17.0/go.mod h1:LJyh9figH3ZpSiVjR5umzbl6V3EpQdZR4Se1ayoUtfI=
-github.com/aws/aws-sdk-go-v2/service/ssm v1.56.6 h1:MVtHLOXm24FJxqyXg4Jq9Ca/tBIK/pHuCkpGHvhOyVA=
-github.com/aws/aws-sdk-go-v2/service/ssm v1.56.6/go.mod h1:8HjMkoX1B6HEsxGMPLu6hnx3135hwxpi6eI9aErNTAg=
 github.com/aws/aws-sdk-go-v2/service/ssm v1.56.7 h1:vv7lah/6QrqHry4gcYPCcy7ByAmBAtGNjPfTf4HTH/s=
 github.com/aws/aws-sdk-go-v2/service/ssm v1.56.7/go.mod h1:8HjMkoX1B6HEsxGMPLu6hnx3135hwxpi6eI9aErNTAg=
 github.com/aws/aws-sdk-go-v2/service/sso v1.24.9 h1:YqtxripbjWb2QLyzRK9pByfEDvgg95gpC2AyDq4hFE8=
diff --git a/goformation/go.mod b/goformation/go.mod
deleted file mode 100644
index 3081fedf82..0000000000
--- a/goformation/go.mod
+++ /dev/null
@@ -1,25 +0,0 @@
-module github.com/awslabs/goformation/v4
-
-go 1.22
-
-toolchain go1.22.10
-
-require (
-	github.com/onsi/ginkgo v1.16.2
-	github.com/onsi/gomega v1.12.0
-	github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b
-	github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522
-	github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56
-)
-
-require (
-	github.com/fsnotify/fsnotify v1.4.9 // indirect
-	github.com/nxadm/tail v1.4.8 // indirect
-	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
-	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
-	golang.org/x/net v0.34.0 // indirect
-	golang.org/x/sys v0.29.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
-	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-)
diff --git a/goformation/go.sum b/goformation/go.sum
deleted file mode 100644
index d5b678ac86..0000000000
--- a/goformation/go.sum
+++ /dev/null
@@ -1,109 +0,0 @@
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
-github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
-github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
-github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
-github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
-github.com/onsi/ginkgo v1.16.2 h1:HFB2fbVIlhIfCfOW81bZFbiC/RvnpXSdhbF2/DJr134=
-github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E=
-github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
-github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/onsi/gomega v1.12.0 h1:p4oGGk2M2UJc0wWN4lHFvIB71lxsh0T/UiKCCgFADY8=
-github.com/onsi/gomega v1.12.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b h1:jUK33OXuZP/l6babJtnLo1qsGvq6G9so9KMflGAm4YA=
-github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b/go.mod h1:8458kAagoME2+LN5//WxE71ysZ3B7r22fdgb7qVmXSY=
-github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522 h1:fOCp11H0yuyAt2wqlbJtbyPzSgaxHTv8uN1pMpkG1t8=
-github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522/go.mod h1:tQTYKOQgxoH3v6dEmdHiz4JG+nbxWwM5fgPQUpSZqVQ=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo=
-github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
-github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
-github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
-github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56 h1:yhqBHs09SmmUoNOHc9jgK4a60T3XFRtPAkYxVnqgY50=
-github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
-golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
-golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
diff --git a/pkg/actions/nodegroup/upgrade.go b/pkg/actions/nodegroup/upgrade.go
index 409156557d..16610853ef 100644
--- a/pkg/actions/nodegroup/upgrade.go
+++ b/pkg/actions/nodegroup/upgrade.go
@@ -18,11 +18,11 @@ import (
 	"github.com/kris-nova/logger"
 	"github.com/pkg/errors"
 
-	"github.com/awslabs/goformation/v4"
-	"github.com/awslabs/goformation/v4/cloudformation"
-	gfnec2 "github.com/awslabs/goformation/v4/cloudformation/ec2"
-	gfneks "github.com/awslabs/goformation/v4/cloudformation/eks"
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation"
+	gfnec2 "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/ec2"
+	gfneks "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/eks"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	"github.com/weaveworks/eksctl/pkg/ami"
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
diff --git a/pkg/automode/cluster_role_manager.go b/pkg/automode/cluster_role_manager.go
index 67e976d14d..f521b61e04 100644
--- a/pkg/automode/cluster_role_manager.go
+++ b/pkg/automode/cluster_role_manager.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/kris-nova/logger"
 
-	"github.com/awslabs/goformation/v4"
+	"github.com/weaveworks/eksctl/pkg/goformation"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/awsapi"
diff --git a/pkg/cfn/builder/access_entry.go b/pkg/cfn/builder/access_entry.go
index 7011d634ef..ee0bc171d5 100644
--- a/pkg/cfn/builder/access_entry.go
+++ b/pkg/cfn/builder/access_entry.go
@@ -1,8 +1,8 @@
 package builder
 
 import (
-	gfneks "github.com/awslabs/goformation/v4/cloudformation/eks"
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	gfneks "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/eks"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 )
diff --git a/pkg/cfn/builder/api.go b/pkg/cfn/builder/api.go
index d8e0e66fca..a1f65161d1 100644
--- a/pkg/cfn/builder/api.go
+++ b/pkg/cfn/builder/api.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"reflect"
 
-	gfn "github.com/awslabs/goformation/v4/cloudformation"
-	gfncfn "github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	gfn "github.com/weaveworks/eksctl/pkg/goformation/cloudformation"
+	gfncfn "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	"github.com/aws/aws-sdk-go-v2/service/cloudformation/types"
 
diff --git a/pkg/cfn/builder/auto_mode.go b/pkg/cfn/builder/auto_mode.go
index 810e7ebf80..e7a7d526f4 100644
--- a/pkg/cfn/builder/auto_mode.go
+++ b/pkg/cfn/builder/auto_mode.go
@@ -6,9 +6,9 @@ import (
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 
-	"github.com/awslabs/goformation/v4"
-	gfn "github.com/awslabs/goformation/v4/cloudformation"
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation"
+	gfn "github.com/weaveworks/eksctl/pkg/goformation/cloudformation"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	cfntypes "github.com/aws/aws-sdk-go-v2/service/cloudformation/types"
 )
diff --git a/pkg/cfn/builder/block_device_mapping.go b/pkg/cfn/builder/block_device_mapping.go
index 5358213cb3..31507dfd95 100644
--- a/pkg/cfn/builder/block_device_mapping.go
+++ b/pkg/cfn/builder/block_device_mapping.go
@@ -1,8 +1,8 @@
 package builder
 
 import (
-	gfnec2 "github.com/awslabs/goformation/v4/cloudformation/ec2"
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	gfnec2 "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/ec2"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 )
diff --git a/pkg/cfn/builder/builder_suite_test.go b/pkg/cfn/builder/builder_suite_test.go
index bc2fb96500..0d59456803 100644
--- a/pkg/cfn/builder/builder_suite_test.go
+++ b/pkg/cfn/builder/builder_suite_test.go
@@ -6,7 +6,7 @@ import (
 
 	. "github.com/onsi/gomega"
 
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/testutils"
diff --git a/pkg/cfn/builder/cloudwatch_logging.go b/pkg/cfn/builder/cloudwatch_logging.go
index 8540e6a24d..518f7522e9 100644
--- a/pkg/cfn/builder/cloudwatch_logging.go
+++ b/pkg/cfn/builder/cloudwatch_logging.go
@@ -1,8 +1,8 @@
 package builder
 
 import (
-	gfneks "github.com/awslabs/goformation/v4/cloudformation/eks"
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	gfneks "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/eks"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 )
diff --git a/pkg/cfn/builder/cluster.go b/pkg/cfn/builder/cluster.go
index 601ddb1aca..3df2cd44fe 100644
--- a/pkg/cfn/builder/cluster.go
+++ b/pkg/cfn/builder/cluster.go
@@ -10,11 +10,11 @@ import (
 
 	"github.com/tidwall/gjson"
 
-	gfn "github.com/awslabs/goformation/v4/cloudformation"
-	gfncfn "github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	gfnec2 "github.com/awslabs/goformation/v4/cloudformation/ec2"
-	gfneks "github.com/awslabs/goformation/v4/cloudformation/eks"
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	gfn "github.com/weaveworks/eksctl/pkg/goformation/cloudformation"
+	gfncfn "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	gfnec2 "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/ec2"
+	gfneks "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/eks"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/awsapi"
diff --git a/pkg/cfn/builder/export_test.go b/pkg/cfn/builder/export_test.go
index 2b3fef2853..396ce160e0 100644
--- a/pkg/cfn/builder/export_test.go
+++ b/pkg/cfn/builder/export_test.go
@@ -1,7 +1,7 @@
 package builder
 
 import (
-	gfn "github.com/awslabs/goformation/v4/cloudformation"
+	gfn "github.com/weaveworks/eksctl/pkg/goformation/cloudformation"
 )
 
 func NewRS() *resourceSet {
diff --git a/pkg/cfn/builder/fargate.go b/pkg/cfn/builder/fargate.go
index 996d59b1cc..d6cf07b49c 100644
--- a/pkg/cfn/builder/fargate.go
+++ b/pkg/cfn/builder/fargate.go
@@ -3,8 +3,8 @@ package builder
 import (
 	"fmt"
 
-	gfniam "github.com/awslabs/goformation/v4/cloudformation/iam"
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	gfniam "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/iam"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	"github.com/aws/aws-sdk-go-v2/aws/arn"
 	"github.com/aws/aws-sdk-go-v2/service/cloudformation/types"
diff --git a/pkg/cfn/builder/iam.go b/pkg/cfn/builder/iam.go
index 7f9df48a3a..32bf9c3133 100644
--- a/pkg/cfn/builder/iam.go
+++ b/pkg/cfn/builder/iam.go
@@ -8,9 +8,9 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/cloudformation/types"
 	"github.com/kris-nova/logger"
 
-	gfniam "github.com/awslabs/goformation/v4/cloudformation/iam"
-	gfnrolesanywhere "github.com/awslabs/goformation/v4/cloudformation/rolesanywhere"
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	gfniam "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/iam"
+	gfnrolesanywhere "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/rolesanywhere"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/cfn/outputs"
diff --git a/pkg/cfn/builder/iam_helper.go b/pkg/cfn/builder/iam_helper.go
index baa086d0a0..20dba554de 100644
--- a/pkg/cfn/builder/iam_helper.go
+++ b/pkg/cfn/builder/iam_helper.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"strings"
 
-	gfn "github.com/awslabs/goformation/v4/cloudformation"
-	gfniam "github.com/awslabs/goformation/v4/cloudformation/iam"
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	gfn "github.com/weaveworks/eksctl/pkg/goformation/cloudformation"
+	gfniam "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/iam"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	"github.com/aws/aws-sdk-go-v2/aws/arn"
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
diff --git a/pkg/cfn/builder/karpenter.go b/pkg/cfn/builder/karpenter.go
index 4942e3079b..01f0b2ad87 100644
--- a/pkg/cfn/builder/karpenter.go
+++ b/pkg/cfn/builder/karpenter.go
@@ -3,11 +3,11 @@ package builder
 import (
 	"fmt"
 
-	gfn "github.com/awslabs/goformation/v4/cloudformation"
-	gfnevents "github.com/awslabs/goformation/v4/cloudformation/events"
-	gfniam "github.com/awslabs/goformation/v4/cloudformation/iam"
-	gfnsqs "github.com/awslabs/goformation/v4/cloudformation/sqs"
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	gfn "github.com/weaveworks/eksctl/pkg/goformation/cloudformation"
+	gfnevents "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/events"
+	gfniam "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/iam"
+	gfnsqs "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/sqs"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	"github.com/aws/aws-sdk-go-v2/service/cloudformation/types"
 	"k8s.io/apimachinery/pkg/util/sets"
diff --git a/pkg/cfn/builder/managed_launch_template.go b/pkg/cfn/builder/managed_launch_template.go
index 697641cad8..c7d8ec81aa 100644
--- a/pkg/cfn/builder/managed_launch_template.go
+++ b/pkg/cfn/builder/managed_launch_template.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	gfnec2 "github.com/awslabs/goformation/v4/cloudformation/ec2"
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	gfnec2 "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/ec2"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 )
diff --git a/pkg/cfn/builder/managed_launch_template_test.go b/pkg/cfn/builder/managed_launch_template_test.go
index e6746a5c1d..179bb2b347 100644
--- a/pkg/cfn/builder/managed_launch_template_test.go
+++ b/pkg/cfn/builder/managed_launch_template_test.go
@@ -20,8 +20,8 @@ import (
 
 	"github.com/weaveworks/eksctl/pkg/cfn/builder"
 
-	"github.com/awslabs/goformation/v4"
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/nodebootstrap/fakes"
diff --git a/pkg/cfn/builder/managed_nodegroup.go b/pkg/cfn/builder/managed_nodegroup.go
index da0f270925..b4b5eb0712 100644
--- a/pkg/cfn/builder/managed_nodegroup.go
+++ b/pkg/cfn/builder/managed_nodegroup.go
@@ -5,9 +5,9 @@ import (
 	"errors"
 	"fmt"
 
-	gfnec2 "github.com/awslabs/goformation/v4/cloudformation/ec2"
-	gfneks "github.com/awslabs/goformation/v4/cloudformation/eks"
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	gfnec2 "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/ec2"
+	gfneks "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/eks"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
 	ekstypes "github.com/aws/aws-sdk-go-v2/service/eks/types"
diff --git a/pkg/cfn/builder/managed_nodegroup_ami_type_test.go b/pkg/cfn/builder/managed_nodegroup_ami_type_test.go
index 8de4983d11..4274a5e11f 100644
--- a/pkg/cfn/builder/managed_nodegroup_ami_type_test.go
+++ b/pkg/cfn/builder/managed_nodegroup_ami_type_test.go
@@ -14,8 +14,8 @@ import (
 
 	"github.com/weaveworks/eksctl/pkg/cfn/builder"
 
-	"github.com/awslabs/goformation/v4"
-	gfneks "github.com/awslabs/goformation/v4/cloudformation/eks"
+	"github.com/weaveworks/eksctl/pkg/goformation"
+	gfneks "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/eks"
 )
 
 type amiTypeEntry struct {
diff --git a/pkg/cfn/builder/managed_nodegroup_test.go b/pkg/cfn/builder/managed_nodegroup_test.go
index e2ad29ea47..6058657fad 100644
--- a/pkg/cfn/builder/managed_nodegroup_test.go
+++ b/pkg/cfn/builder/managed_nodegroup_test.go
@@ -6,9 +6,9 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/awslabs/goformation/v4"
-	gfneks "github.com/awslabs/goformation/v4/cloudformation/eks"
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation"
+	gfneks "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/eks"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
 	"github.com/stretchr/testify/require"
diff --git a/pkg/cfn/builder/network_interfaces.go b/pkg/cfn/builder/network_interfaces.go
index bb4e56c780..21805511da 100644
--- a/pkg/cfn/builder/network_interfaces.go
+++ b/pkg/cfn/builder/network_interfaces.go
@@ -9,8 +9,8 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/ec2"
 	ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
 
-	gfnec2 "github.com/awslabs/goformation/v4/cloudformation/ec2"
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	gfnec2 "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/ec2"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	"github.com/weaveworks/eksctl/pkg/awsapi"
 )
diff --git a/pkg/cfn/builder/nodegroup.go b/pkg/cfn/builder/nodegroup.go
index 25852ca217..ef28f144e7 100644
--- a/pkg/cfn/builder/nodegroup.go
+++ b/pkg/cfn/builder/nodegroup.go
@@ -10,11 +10,11 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/service/cloudformation/types"
 
-	gfn "github.com/awslabs/goformation/v4/cloudformation"
-	gfncfn "github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	gfnec2 "github.com/awslabs/goformation/v4/cloudformation/ec2"
-	gfneks "github.com/awslabs/goformation/v4/cloudformation/eks"
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	gfn "github.com/weaveworks/eksctl/pkg/goformation/cloudformation"
+	gfncfn "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	gfnec2 "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/ec2"
+	gfneks "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/eks"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	"github.com/kris-nova/logger"
 
diff --git a/pkg/cfn/builder/nodegroup_subnets_test.go b/pkg/cfn/builder/nodegroup_subnets_test.go
index 6dabb16546..adb78daab8 100644
--- a/pkg/cfn/builder/nodegroup_subnets_test.go
+++ b/pkg/cfn/builder/nodegroup_subnets_test.go
@@ -17,7 +17,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/cfn/builder"
diff --git a/pkg/cfn/builder/nodegroup_test.go b/pkg/cfn/builder/nodegroup_test.go
index c5f19c599d..33923f6303 100644
--- a/pkg/cfn/builder/nodegroup_test.go
+++ b/pkg/cfn/builder/nodegroup_test.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/weaveworks/eksctl/pkg/testutils/mockprovider"
 
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
diff --git a/pkg/cfn/builder/outputs.go b/pkg/cfn/builder/outputs.go
index ed46c73d5f..0021c16a13 100644
--- a/pkg/cfn/builder/outputs.go
+++ b/pkg/cfn/builder/outputs.go
@@ -1,7 +1,7 @@
 package builder
 
 import (
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	"github.com/aws/aws-sdk-go-v2/service/cloudformation/types"
 	"github.com/kris-nova/logger"
diff --git a/pkg/cfn/builder/partition.go b/pkg/cfn/builder/partition.go
index 6182b61110..ba6eacf478 100644
--- a/pkg/cfn/builder/partition.go
+++ b/pkg/cfn/builder/partition.go
@@ -3,7 +3,7 @@ package builder
 import (
 	"fmt"
 
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 )
 
 const servicePrincipalPartitionMapName = "ServicePrincipalPartitionMap"
diff --git a/pkg/cfn/builder/statement.go b/pkg/cfn/builder/statement.go
index b636fe9bf1..ed064cefba 100644
--- a/pkg/cfn/builder/statement.go
+++ b/pkg/cfn/builder/statement.go
@@ -1,7 +1,7 @@
 package builder
 
 import (
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	cft "github.com/weaveworks/eksctl/pkg/cfn/template"
 )
diff --git a/pkg/cfn/builder/vpc.go b/pkg/cfn/builder/vpc.go
index ef3899a8b7..a8195b9759 100644
--- a/pkg/cfn/builder/vpc.go
+++ b/pkg/cfn/builder/vpc.go
@@ -5,9 +5,9 @@ import (
 	"math"
 	"strings"
 
-	gfncfn "github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	gfnec2 "github.com/awslabs/goformation/v4/cloudformation/ec2"
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	gfncfn "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	gfnec2 "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/ec2"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	"github.com/weaveworks/eksctl/pkg/utils/ipnet"
 )
diff --git a/pkg/cfn/builder/vpc_endpoint.go b/pkg/cfn/builder/vpc_endpoint.go
index 648ba11e19..d9e4df67ae 100644
--- a/pkg/cfn/builder/vpc_endpoint.go
+++ b/pkg/cfn/builder/vpc_endpoint.go
@@ -15,8 +15,8 @@ import (
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/awsapi"
 
-	gfnec2 "github.com/awslabs/goformation/v4/cloudformation/ec2"
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	gfnec2 "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/ec2"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 )
 
 // A VPCEndpointResourceSet holds the resources required for VPC endpoints.
diff --git a/pkg/cfn/builder/vpc_endpoint_test.go b/pkg/cfn/builder/vpc_endpoint_test.go
index 9c880df04e..1d5666145f 100644
--- a/pkg/cfn/builder/vpc_endpoint_test.go
+++ b/pkg/cfn/builder/vpc_endpoint_test.go
@@ -18,8 +18,8 @@ import (
 	. "github.com/onsi/gomega"
 	"github.com/stretchr/testify/mock"
 
-	gfnec2 "github.com/awslabs/goformation/v4/cloudformation/ec2"
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	gfnec2 "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/ec2"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	"github.com/weaveworks/eksctl/pkg/cfn/builder"
 
diff --git a/pkg/cfn/builder/vpc_existing.go b/pkg/cfn/builder/vpc_existing.go
index c43e1dfb0b..4152508239 100644
--- a/pkg/cfn/builder/vpc_existing.go
+++ b/pkg/cfn/builder/vpc_existing.go
@@ -9,7 +9,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/ec2"
 	ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
 
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 
diff --git a/pkg/cfn/builder/vpc_existing_test.go b/pkg/cfn/builder/vpc_existing_test.go
index 87b3c81607..412ac380f0 100644
--- a/pkg/cfn/builder/vpc_existing_test.go
+++ b/pkg/cfn/builder/vpc_existing_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/ec2"
 	ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
 
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
diff --git a/pkg/cfn/builder/vpc_ipv4.go b/pkg/cfn/builder/vpc_ipv4.go
index dbe912a80f..9ea5d1a21b 100644
--- a/pkg/cfn/builder/vpc_ipv4.go
+++ b/pkg/cfn/builder/vpc_ipv4.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/weaveworks/eksctl/pkg/awsapi"
 
-	gfncfn "github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	gfnec2 "github.com/awslabs/goformation/v4/cloudformation/ec2"
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	gfncfn "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	gfnec2 "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/ec2"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/cfn/outputs"
diff --git a/pkg/cfn/builder/vpc_ipv4_test.go b/pkg/cfn/builder/vpc_ipv4_test.go
index 60fe7f0ca3..a1a7e1acfd 100644
--- a/pkg/cfn/builder/vpc_ipv4_test.go
+++ b/pkg/cfn/builder/vpc_ipv4_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/ec2"
 	ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
 
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
diff --git a/pkg/cfn/builder/vpc_ipv6.go b/pkg/cfn/builder/vpc_ipv6.go
index df41ec83aa..5ee668badd 100644
--- a/pkg/cfn/builder/vpc_ipv6.go
+++ b/pkg/cfn/builder/vpc_ipv6.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/weaveworks/eksctl/pkg/awsapi"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	gfnec2 "github.com/awslabs/goformation/v4/cloudformation/ec2"
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	gfnec2 "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/ec2"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/cfn/outputs"
diff --git a/pkg/cfn/manager/compat.go b/pkg/cfn/manager/compat.go
index cfd2eb08e7..992d82b303 100644
--- a/pkg/cfn/manager/compat.go
+++ b/pkg/cfn/manager/compat.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	"github.com/kris-nova/logger"
 	"github.com/tidwall/gjson"
diff --git a/pkg/cfn/manager/template.go b/pkg/cfn/manager/template.go
index f901aa10f1..6ed601be94 100644
--- a/pkg/cfn/manager/template.go
+++ b/pkg/cfn/manager/template.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4"
+	"github.com/weaveworks/eksctl/pkg/goformation"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/cloudformation"
diff --git a/pkg/cfn/outputs/api.go b/pkg/cfn/outputs/api.go
index dd7626cfca..f3a883ca11 100644
--- a/pkg/cfn/outputs/api.go
+++ b/pkg/cfn/outputs/api.go
@@ -3,8 +3,8 @@ package outputs
 import (
 	"fmt"
 
-	gfn "github.com/awslabs/goformation/v4/cloudformation"
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	gfn "github.com/weaveworks/eksctl/pkg/goformation/cloudformation"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	"github.com/aws/aws-sdk-go-v2/service/cloudformation/types"
 
diff --git a/pkg/cfn/template/iam_helpers.go b/pkg/cfn/template/iam_helpers.go
index 211617319e..9be7d2c3f9 100644
--- a/pkg/cfn/template/iam_helpers.go
+++ b/pkg/cfn/template/iam_helpers.go
@@ -1,7 +1,7 @@
 package template
 
 import (
-	gfn "github.com/awslabs/goformation/v4/cloudformation/types"
+	gfn "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 )
diff --git a/goformation/.gitignore b/pkg/goformation/.gitignore
similarity index 100%
rename from goformation/.gitignore
rename to pkg/goformation/.gitignore
diff --git a/goformation/AUTHORS.md b/pkg/goformation/AUTHORS.md
similarity index 100%
rename from goformation/AUTHORS.md
rename to pkg/goformation/AUTHORS.md
diff --git a/goformation/CHANGELOG.md b/pkg/goformation/CHANGELOG.md
similarity index 100%
rename from goformation/CHANGELOG.md
rename to pkg/goformation/CHANGELOG.md
diff --git a/goformation/CODE_OF_CONDUCT.md b/pkg/goformation/CODE_OF_CONDUCT.md
similarity index 100%
rename from goformation/CODE_OF_CONDUCT.md
rename to pkg/goformation/CODE_OF_CONDUCT.md
diff --git a/goformation/CONTRIBUTING.md b/pkg/goformation/CONTRIBUTING.md
similarity index 100%
rename from goformation/CONTRIBUTING.md
rename to pkg/goformation/CONTRIBUTING.md
diff --git a/goformation/LICENSE b/pkg/goformation/LICENSE
similarity index 100%
rename from goformation/LICENSE
rename to pkg/goformation/LICENSE
diff --git a/goformation/LOGO.md b/pkg/goformation/LOGO.md
similarity index 100%
rename from goformation/LOGO.md
rename to pkg/goformation/LOGO.md
diff --git a/goformation/NOTICE b/pkg/goformation/NOTICE
similarity index 100%
rename from goformation/NOTICE
rename to pkg/goformation/NOTICE
diff --git a/goformation/README.md b/pkg/goformation/README.md
similarity index 100%
rename from goformation/README.md
rename to pkg/goformation/README.md
diff --git a/goformation/cloudformation/README.md b/pkg/goformation/cloudformation/README.md
similarity index 100%
rename from goformation/cloudformation/README.md
rename to pkg/goformation/cloudformation/README.md
diff --git a/goformation/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer.go b/pkg/goformation/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer.go
similarity index 95%
rename from goformation/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer.go
rename to pkg/goformation/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer.go
index aa3f32ec8d..5149146b0c 100644
--- a/goformation/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer.go
+++ b/pkg/goformation/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Analyzer AWS CloudFormation Resource (AWS::AccessAnalyzer::Analyzer)
diff --git a/goformation/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer_archiverule.go b/pkg/goformation/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer_archiverule.go
similarity index 92%
rename from goformation/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer_archiverule.go
rename to pkg/goformation/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer_archiverule.go
index 012b46032e..3728653a85 100644
--- a/goformation/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer_archiverule.go
+++ b/pkg/goformation/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer_archiverule.go
@@ -1,9 +1,9 @@
 package accessanalyzer
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Analyzer_ArchiveRule AWS CloudFormation Resource (AWS::AccessAnalyzer::Analyzer.ArchiveRule)
diff --git a/goformation/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer_filter.go b/pkg/goformation/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer_filter.go
similarity index 94%
rename from goformation/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer_filter.go
rename to pkg/goformation/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer_filter.go
index e4913be5bb..659a748c2f 100644
--- a/goformation/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer_filter.go
+++ b/pkg/goformation/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer_filter.go
@@ -1,9 +1,9 @@
 package accessanalyzer
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Analyzer_Filter AWS CloudFormation Resource (AWS::AccessAnalyzer::Analyzer.Filter)
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificate.go b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate.go
similarity index 97%
rename from goformation/cloudformation/acmpca/aws-acmpca-certificate.go
rename to pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate.go
index c4d167a89a..f7dd751f8e 100644
--- a/goformation/cloudformation/acmpca/aws-acmpca-certificate.go
+++ b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Certificate AWS CloudFormation Resource (AWS::ACMPCA::Certificate)
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificate_apipassthrough.go b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_apipassthrough.go
similarity index 96%
rename from goformation/cloudformation/acmpca/aws-acmpca-certificate_apipassthrough.go
rename to pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_apipassthrough.go
index 92ae282a63..a5bc76bf7f 100644
--- a/goformation/cloudformation/acmpca/aws-acmpca-certificate_apipassthrough.go
+++ b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_apipassthrough.go
@@ -1,7 +1,7 @@
 package acmpca
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Certificate_ApiPassthrough AWS CloudFormation Resource (AWS::ACMPCA::Certificate.ApiPassthrough)
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificate_edipartyname.go b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_edipartyname.go
similarity index 92%
rename from goformation/cloudformation/acmpca/aws-acmpca-certificate_edipartyname.go
rename to pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_edipartyname.go
index dd04383025..4615e798b4 100644
--- a/goformation/cloudformation/acmpca/aws-acmpca-certificate_edipartyname.go
+++ b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_edipartyname.go
@@ -1,9 +1,9 @@
 package acmpca
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Certificate_EdiPartyName AWS CloudFormation Resource (AWS::ACMPCA::Certificate.EdiPartyName)
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificate_extendedkeyusage.go b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_extendedkeyusage.go
similarity index 93%
rename from goformation/cloudformation/acmpca/aws-acmpca-certificate_extendedkeyusage.go
rename to pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_extendedkeyusage.go
index 1bc8106887..78777921fb 100644
--- a/goformation/cloudformation/acmpca/aws-acmpca-certificate_extendedkeyusage.go
+++ b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_extendedkeyusage.go
@@ -1,9 +1,9 @@
 package acmpca
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Certificate_ExtendedKeyUsage AWS CloudFormation Resource (AWS::ACMPCA::Certificate.ExtendedKeyUsage)
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificate_extensions.go b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_extensions.go
similarity index 97%
rename from goformation/cloudformation/acmpca/aws-acmpca-certificate_extensions.go
rename to pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_extensions.go
index 45ea49ec08..83d7ccdc42 100644
--- a/goformation/cloudformation/acmpca/aws-acmpca-certificate_extensions.go
+++ b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_extensions.go
@@ -1,7 +1,7 @@
 package acmpca
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Certificate_Extensions AWS CloudFormation Resource (AWS::ACMPCA::Certificate.Extensions)
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificate_generalname.go b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_generalname.go
similarity index 96%
rename from goformation/cloudformation/acmpca/aws-acmpca-certificate_generalname.go
rename to pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_generalname.go
index 0701840cb6..48c88c5803 100644
--- a/goformation/cloudformation/acmpca/aws-acmpca-certificate_generalname.go
+++ b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_generalname.go
@@ -1,9 +1,9 @@
 package acmpca
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Certificate_GeneralName AWS CloudFormation Resource (AWS::ACMPCA::Certificate.GeneralName)
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificate_keyusage.go b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_keyusage.go
similarity index 96%
rename from goformation/cloudformation/acmpca/aws-acmpca-certificate_keyusage.go
rename to pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_keyusage.go
index 59bf304aeb..73b554603d 100644
--- a/goformation/cloudformation/acmpca/aws-acmpca-certificate_keyusage.go
+++ b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_keyusage.go
@@ -1,9 +1,9 @@
 package acmpca
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Certificate_KeyUsage AWS CloudFormation Resource (AWS::ACMPCA::Certificate.KeyUsage)
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificate_othername.go b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_othername.go
similarity index 92%
rename from goformation/cloudformation/acmpca/aws-acmpca-certificate_othername.go
rename to pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_othername.go
index 7832c0e067..ed3d52045b 100644
--- a/goformation/cloudformation/acmpca/aws-acmpca-certificate_othername.go
+++ b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_othername.go
@@ -1,9 +1,9 @@
 package acmpca
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Certificate_OtherName AWS CloudFormation Resource (AWS::ACMPCA::Certificate.OtherName)
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificate_policyinformation.go b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_policyinformation.go
similarity index 93%
rename from goformation/cloudformation/acmpca/aws-acmpca-certificate_policyinformation.go
rename to pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_policyinformation.go
index 86096f9aa4..38c3be4503 100644
--- a/goformation/cloudformation/acmpca/aws-acmpca-certificate_policyinformation.go
+++ b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_policyinformation.go
@@ -1,9 +1,9 @@
 package acmpca
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Certificate_PolicyInformation AWS CloudFormation Resource (AWS::ACMPCA::Certificate.PolicyInformation)
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificate_policyqualifierinfo.go b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_policyqualifierinfo.go
similarity index 93%
rename from goformation/cloudformation/acmpca/aws-acmpca-certificate_policyqualifierinfo.go
rename to pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_policyqualifierinfo.go
index 863e8ba6d7..505ac0dd33 100644
--- a/goformation/cloudformation/acmpca/aws-acmpca-certificate_policyqualifierinfo.go
+++ b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_policyqualifierinfo.go
@@ -1,9 +1,9 @@
 package acmpca
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Certificate_PolicyQualifierInfo AWS CloudFormation Resource (AWS::ACMPCA::Certificate.PolicyQualifierInfo)
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificate_qualifier.go b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_qualifier.go
similarity index 91%
rename from goformation/cloudformation/acmpca/aws-acmpca-certificate_qualifier.go
rename to pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_qualifier.go
index d4e283f1c0..28073e775c 100644
--- a/goformation/cloudformation/acmpca/aws-acmpca-certificate_qualifier.go
+++ b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_qualifier.go
@@ -1,9 +1,9 @@
 package acmpca
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Certificate_Qualifier AWS CloudFormation Resource (AWS::ACMPCA::Certificate.Qualifier)
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificate_subject.go b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_subject.go
similarity index 97%
rename from goformation/cloudformation/acmpca/aws-acmpca-certificate_subject.go
rename to pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_subject.go
index 2e683eff3e..0d8533ec50 100644
--- a/goformation/cloudformation/acmpca/aws-acmpca-certificate_subject.go
+++ b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_subject.go
@@ -1,9 +1,9 @@
 package acmpca
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Certificate_Subject AWS CloudFormation Resource (AWS::ACMPCA::Certificate.Subject)
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificate_validity.go b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_validity.go
similarity index 92%
rename from goformation/cloudformation/acmpca/aws-acmpca-certificate_validity.go
rename to pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_validity.go
index 39473e09b6..d6d3af364b 100644
--- a/goformation/cloudformation/acmpca/aws-acmpca-certificate_validity.go
+++ b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificate_validity.go
@@ -1,9 +1,9 @@
 package acmpca
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Certificate_Validity AWS CloudFormation Resource (AWS::ACMPCA::Certificate.Validity)
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority.go b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority.go
similarity index 96%
rename from goformation/cloudformation/acmpca/aws-acmpca-certificateauthority.go
rename to pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority.go
index 67ca3e946b..5ac3f832f8 100644
--- a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority.go
+++ b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CertificateAuthority AWS CloudFormation Resource (AWS::ACMPCA::CertificateAuthority)
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_accessdescription.go b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_accessdescription.go
similarity index 96%
rename from goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_accessdescription.go
rename to pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_accessdescription.go
index c763a6f1a9..182ec0456f 100644
--- a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_accessdescription.go
+++ b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_accessdescription.go
@@ -1,7 +1,7 @@
 package acmpca
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CertificateAuthority_AccessDescription AWS CloudFormation Resource (AWS::ACMPCA::CertificateAuthority.AccessDescription)
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_accessmethod.go b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_accessmethod.go
similarity index 93%
rename from goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_accessmethod.go
rename to pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_accessmethod.go
index 2ff5267e0c..4fa604fd20 100644
--- a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_accessmethod.go
+++ b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_accessmethod.go
@@ -1,9 +1,9 @@
 package acmpca
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CertificateAuthority_AccessMethod AWS CloudFormation Resource (AWS::ACMPCA::CertificateAuthority.AccessMethod)
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_crlconfiguration.go b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_crlconfiguration.go
similarity index 95%
rename from goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_crlconfiguration.go
rename to pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_crlconfiguration.go
index 47a14be508..503ad948dc 100644
--- a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_crlconfiguration.go
+++ b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_crlconfiguration.go
@@ -1,9 +1,9 @@
 package acmpca
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CertificateAuthority_CrlConfiguration AWS CloudFormation Resource (AWS::ACMPCA::CertificateAuthority.CrlConfiguration)
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_csrextensions.go b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_csrextensions.go
similarity index 96%
rename from goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_csrextensions.go
rename to pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_csrextensions.go
index a0482fab2e..d94e74f032 100644
--- a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_csrextensions.go
+++ b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_csrextensions.go
@@ -1,7 +1,7 @@
 package acmpca
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CertificateAuthority_CsrExtensions AWS CloudFormation Resource (AWS::ACMPCA::CertificateAuthority.CsrExtensions)
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_edipartyname.go b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_edipartyname.go
similarity index 93%
rename from goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_edipartyname.go
rename to pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_edipartyname.go
index 21c162bbc8..fd2e9b2b65 100644
--- a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_edipartyname.go
+++ b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_edipartyname.go
@@ -1,9 +1,9 @@
 package acmpca
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CertificateAuthority_EdiPartyName AWS CloudFormation Resource (AWS::ACMPCA::CertificateAuthority.EdiPartyName)
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_generalname.go b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_generalname.go
similarity index 96%
rename from goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_generalname.go
rename to pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_generalname.go
index 7e2cf832c8..d36d82bf6f 100644
--- a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_generalname.go
+++ b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_generalname.go
@@ -1,9 +1,9 @@
 package acmpca
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CertificateAuthority_GeneralName AWS CloudFormation Resource (AWS::ACMPCA::CertificateAuthority.GeneralName)
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_keyusage.go b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_keyusage.go
similarity index 96%
rename from goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_keyusage.go
rename to pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_keyusage.go
index a7b6b8baba..9a642b825d 100644
--- a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_keyusage.go
+++ b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_keyusage.go
@@ -1,9 +1,9 @@
 package acmpca
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CertificateAuthority_KeyUsage AWS CloudFormation Resource (AWS::ACMPCA::CertificateAuthority.KeyUsage)
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_ocspconfiguration.go b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_ocspconfiguration.go
similarity index 93%
rename from goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_ocspconfiguration.go
rename to pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_ocspconfiguration.go
index 05155de955..2dbce251d8 100644
--- a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_ocspconfiguration.go
+++ b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_ocspconfiguration.go
@@ -1,9 +1,9 @@
 package acmpca
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CertificateAuthority_OcspConfiguration AWS CloudFormation Resource (AWS::ACMPCA::CertificateAuthority.OcspConfiguration)
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_othername.go b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_othername.go
similarity index 92%
rename from goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_othername.go
rename to pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_othername.go
index a3eee3a8e7..a2691f3fca 100644
--- a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_othername.go
+++ b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_othername.go
@@ -1,9 +1,9 @@
 package acmpca
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CertificateAuthority_OtherName AWS CloudFormation Resource (AWS::ACMPCA::CertificateAuthority.OtherName)
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_revocationconfiguration.go b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_revocationconfiguration.go
similarity index 96%
rename from goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_revocationconfiguration.go
rename to pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_revocationconfiguration.go
index f24270da00..abb442c678 100644
--- a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_revocationconfiguration.go
+++ b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_revocationconfiguration.go
@@ -1,7 +1,7 @@
 package acmpca
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CertificateAuthority_RevocationConfiguration AWS CloudFormation Resource (AWS::ACMPCA::CertificateAuthority.RevocationConfiguration)
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_subject.go b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_subject.go
similarity index 97%
rename from goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_subject.go
rename to pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_subject.go
index 9d5a97e7fa..c9db61d02c 100644
--- a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_subject.go
+++ b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_subject.go
@@ -1,9 +1,9 @@
 package acmpca
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CertificateAuthority_Subject AWS CloudFormation Resource (AWS::ACMPCA::CertificateAuthority.Subject)
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthorityactivation.go b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthorityactivation.go
similarity index 97%
rename from goformation/cloudformation/acmpca/aws-acmpca-certificateauthorityactivation.go
rename to pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthorityactivation.go
index 4f990b7231..2795d312b1 100644
--- a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthorityactivation.go
+++ b/pkg/goformation/cloudformation/acmpca/aws-acmpca-certificateauthorityactivation.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CertificateAuthorityActivation AWS CloudFormation Resource (AWS::ACMPCA::CertificateAuthorityActivation)
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-permission.go b/pkg/goformation/cloudformation/acmpca/aws-acmpca-permission.go
similarity index 97%
rename from goformation/cloudformation/acmpca/aws-acmpca-permission.go
rename to pkg/goformation/cloudformation/acmpca/aws-acmpca-permission.go
index df12a5f7cd..1d5cfab565 100644
--- a/goformation/cloudformation/acmpca/aws-acmpca-permission.go
+++ b/pkg/goformation/cloudformation/acmpca/aws-acmpca-permission.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Permission AWS CloudFormation Resource (AWS::ACMPCA::Permission)
diff --git a/goformation/cloudformation/all.go b/pkg/goformation/cloudformation/all.go
similarity index 98%
rename from goformation/cloudformation/all.go
rename to pkg/goformation/cloudformation/all.go
index 66b82838d2..3bcf7677f3 100644
--- a/goformation/cloudformation/all.go
+++ b/pkg/goformation/cloudformation/all.go
@@ -3,186 +3,186 @@ package cloudformation
 import (
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/accessanalyzer"
-	"github.com/awslabs/goformation/v4/cloudformation/acmpca"
-	"github.com/awslabs/goformation/v4/cloudformation/amazonmq"
-	"github.com/awslabs/goformation/v4/cloudformation/amplify"
-	"github.com/awslabs/goformation/v4/cloudformation/amplifyuibuilder"
-	"github.com/awslabs/goformation/v4/cloudformation/apigateway"
-	"github.com/awslabs/goformation/v4/cloudformation/apigatewayv2"
-	"github.com/awslabs/goformation/v4/cloudformation/appconfig"
-	"github.com/awslabs/goformation/v4/cloudformation/appflow"
-	"github.com/awslabs/goformation/v4/cloudformation/appintegrations"
-	"github.com/awslabs/goformation/v4/cloudformation/applicationautoscaling"
-	"github.com/awslabs/goformation/v4/cloudformation/applicationinsights"
-	"github.com/awslabs/goformation/v4/cloudformation/appmesh"
-	"github.com/awslabs/goformation/v4/cloudformation/apprunner"
-	"github.com/awslabs/goformation/v4/cloudformation/appstream"
-	"github.com/awslabs/goformation/v4/cloudformation/appsync"
-	"github.com/awslabs/goformation/v4/cloudformation/aps"
-	"github.com/awslabs/goformation/v4/cloudformation/ask"
-	"github.com/awslabs/goformation/v4/cloudformation/athena"
-	"github.com/awslabs/goformation/v4/cloudformation/auditmanager"
-	"github.com/awslabs/goformation/v4/cloudformation/autoscaling"
-	"github.com/awslabs/goformation/v4/cloudformation/autoscalingplans"
-	"github.com/awslabs/goformation/v4/cloudformation/backup"
-	"github.com/awslabs/goformation/v4/cloudformation/batch"
-	"github.com/awslabs/goformation/v4/cloudformation/budgets"
-	"github.com/awslabs/goformation/v4/cloudformation/cassandra"
-	"github.com/awslabs/goformation/v4/cloudformation/ce"
-	"github.com/awslabs/goformation/v4/cloudformation/certificatemanager"
-	"github.com/awslabs/goformation/v4/cloudformation/chatbot"
-	"github.com/awslabs/goformation/v4/cloudformation/cloud9"
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/cloudfront"
-	"github.com/awslabs/goformation/v4/cloudformation/cloudtrail"
-	"github.com/awslabs/goformation/v4/cloudformation/cloudwatch"
-	"github.com/awslabs/goformation/v4/cloudformation/codeartifact"
-	"github.com/awslabs/goformation/v4/cloudformation/codebuild"
-	"github.com/awslabs/goformation/v4/cloudformation/codecommit"
-	"github.com/awslabs/goformation/v4/cloudformation/codedeploy"
-	"github.com/awslabs/goformation/v4/cloudformation/codeguruprofiler"
-	"github.com/awslabs/goformation/v4/cloudformation/codegurureviewer"
-	"github.com/awslabs/goformation/v4/cloudformation/codepipeline"
-	"github.com/awslabs/goformation/v4/cloudformation/codestar"
-	"github.com/awslabs/goformation/v4/cloudformation/codestarconnections"
-	"github.com/awslabs/goformation/v4/cloudformation/codestarnotifications"
-	"github.com/awslabs/goformation/v4/cloudformation/cognito"
-	"github.com/awslabs/goformation/v4/cloudformation/config"
-	"github.com/awslabs/goformation/v4/cloudformation/connect"
-	"github.com/awslabs/goformation/v4/cloudformation/cur"
-	"github.com/awslabs/goformation/v4/cloudformation/customerprofiles"
-	"github.com/awslabs/goformation/v4/cloudformation/databrew"
-	"github.com/awslabs/goformation/v4/cloudformation/datapipeline"
-	"github.com/awslabs/goformation/v4/cloudformation/datasync"
-	"github.com/awslabs/goformation/v4/cloudformation/dax"
-	"github.com/awslabs/goformation/v4/cloudformation/detective"
-	"github.com/awslabs/goformation/v4/cloudformation/devopsguru"
-	"github.com/awslabs/goformation/v4/cloudformation/directoryservice"
-	"github.com/awslabs/goformation/v4/cloudformation/dlm"
-	"github.com/awslabs/goformation/v4/cloudformation/dms"
-	"github.com/awslabs/goformation/v4/cloudformation/docdb"
-	"github.com/awslabs/goformation/v4/cloudformation/dynamodb"
-	"github.com/awslabs/goformation/v4/cloudformation/ec2"
-	"github.com/awslabs/goformation/v4/cloudformation/ecr"
-	"github.com/awslabs/goformation/v4/cloudformation/ecs"
-	"github.com/awslabs/goformation/v4/cloudformation/efs"
-	"github.com/awslabs/goformation/v4/cloudformation/eks"
-	"github.com/awslabs/goformation/v4/cloudformation/elasticache"
-	"github.com/awslabs/goformation/v4/cloudformation/elasticbeanstalk"
-	"github.com/awslabs/goformation/v4/cloudformation/elasticloadbalancing"
-	"github.com/awslabs/goformation/v4/cloudformation/elasticloadbalancingv2"
-	"github.com/awslabs/goformation/v4/cloudformation/elasticsearch"
-	"github.com/awslabs/goformation/v4/cloudformation/emr"
-	"github.com/awslabs/goformation/v4/cloudformation/emrcontainers"
-	"github.com/awslabs/goformation/v4/cloudformation/events"
-	"github.com/awslabs/goformation/v4/cloudformation/eventschemas"
-	"github.com/awslabs/goformation/v4/cloudformation/evidently"
-	"github.com/awslabs/goformation/v4/cloudformation/finspace"
-	"github.com/awslabs/goformation/v4/cloudformation/fis"
-	"github.com/awslabs/goformation/v4/cloudformation/fms"
-	"github.com/awslabs/goformation/v4/cloudformation/frauddetector"
-	"github.com/awslabs/goformation/v4/cloudformation/fsx"
-	"github.com/awslabs/goformation/v4/cloudformation/gamelift"
-	"github.com/awslabs/goformation/v4/cloudformation/globalaccelerator"
-	"github.com/awslabs/goformation/v4/cloudformation/glue"
-	"github.com/awslabs/goformation/v4/cloudformation/greengrass"
-	"github.com/awslabs/goformation/v4/cloudformation/greengrassv2"
-	"github.com/awslabs/goformation/v4/cloudformation/groundstation"
-	"github.com/awslabs/goformation/v4/cloudformation/guardduty"
-	"github.com/awslabs/goformation/v4/cloudformation/healthlake"
-	"github.com/awslabs/goformation/v4/cloudformation/iam"
-	"github.com/awslabs/goformation/v4/cloudformation/imagebuilder"
-	"github.com/awslabs/goformation/v4/cloudformation/inspector"
-	"github.com/awslabs/goformation/v4/cloudformation/iot"
-	"github.com/awslabs/goformation/v4/cloudformation/iot1click"
-	"github.com/awslabs/goformation/v4/cloudformation/iotanalytics"
-	"github.com/awslabs/goformation/v4/cloudformation/iotcoredeviceadvisor"
-	"github.com/awslabs/goformation/v4/cloudformation/iotevents"
-	"github.com/awslabs/goformation/v4/cloudformation/iotfleethub"
-	"github.com/awslabs/goformation/v4/cloudformation/iotsitewise"
-	"github.com/awslabs/goformation/v4/cloudformation/iotthingsgraph"
-	"github.com/awslabs/goformation/v4/cloudformation/iotwireless"
-	"github.com/awslabs/goformation/v4/cloudformation/ivs"
-	"github.com/awslabs/goformation/v4/cloudformation/kendra"
-	"github.com/awslabs/goformation/v4/cloudformation/kinesis"
-	"github.com/awslabs/goformation/v4/cloudformation/kinesisanalytics"
-	"github.com/awslabs/goformation/v4/cloudformation/kinesisanalyticsv2"
-	"github.com/awslabs/goformation/v4/cloudformation/kinesisfirehose"
-	"github.com/awslabs/goformation/v4/cloudformation/kms"
-	"github.com/awslabs/goformation/v4/cloudformation/lakeformation"
-	"github.com/awslabs/goformation/v4/cloudformation/lambda"
-	"github.com/awslabs/goformation/v4/cloudformation/licensemanager"
-	"github.com/awslabs/goformation/v4/cloudformation/lightsail"
-	"github.com/awslabs/goformation/v4/cloudformation/location"
-	"github.com/awslabs/goformation/v4/cloudformation/logs"
-	"github.com/awslabs/goformation/v4/cloudformation/lookoutequipment"
-	"github.com/awslabs/goformation/v4/cloudformation/lookoutmetrics"
-	"github.com/awslabs/goformation/v4/cloudformation/lookoutvision"
-	"github.com/awslabs/goformation/v4/cloudformation/macie"
-	"github.com/awslabs/goformation/v4/cloudformation/managedblockchain"
-	"github.com/awslabs/goformation/v4/cloudformation/mediaconnect"
-	"github.com/awslabs/goformation/v4/cloudformation/mediaconvert"
-	"github.com/awslabs/goformation/v4/cloudformation/medialive"
-	"github.com/awslabs/goformation/v4/cloudformation/mediapackage"
-	"github.com/awslabs/goformation/v4/cloudformation/mediastore"
-	"github.com/awslabs/goformation/v4/cloudformation/memorydb"
-	"github.com/awslabs/goformation/v4/cloudformation/msk"
-	"github.com/awslabs/goformation/v4/cloudformation/mwaa"
-	"github.com/awslabs/goformation/v4/cloudformation/neptune"
-	"github.com/awslabs/goformation/v4/cloudformation/networkfirewall"
-	"github.com/awslabs/goformation/v4/cloudformation/networkmanager"
-	"github.com/awslabs/goformation/v4/cloudformation/nimblestudio"
-	"github.com/awslabs/goformation/v4/cloudformation/opensearchservice"
-	"github.com/awslabs/goformation/v4/cloudformation/opsworks"
-	"github.com/awslabs/goformation/v4/cloudformation/opsworkscm"
-	"github.com/awslabs/goformation/v4/cloudformation/panorama"
-	"github.com/awslabs/goformation/v4/cloudformation/pinpoint"
-	"github.com/awslabs/goformation/v4/cloudformation/pinpointemail"
-	"github.com/awslabs/goformation/v4/cloudformation/qldb"
-	"github.com/awslabs/goformation/v4/cloudformation/quicksight"
-	"github.com/awslabs/goformation/v4/cloudformation/ram"
-	"github.com/awslabs/goformation/v4/cloudformation/rds"
-	"github.com/awslabs/goformation/v4/cloudformation/redshift"
-	"github.com/awslabs/goformation/v4/cloudformation/refactorspaces"
-	"github.com/awslabs/goformation/v4/cloudformation/rekognition"
-	"github.com/awslabs/goformation/v4/cloudformation/resiliencehub"
-	"github.com/awslabs/goformation/v4/cloudformation/resourcegroups"
-	"github.com/awslabs/goformation/v4/cloudformation/robomaker"
-	"github.com/awslabs/goformation/v4/cloudformation/route53"
-	"github.com/awslabs/goformation/v4/cloudformation/route53recoverycontrol"
-	"github.com/awslabs/goformation/v4/cloudformation/route53recoveryreadiness"
-	"github.com/awslabs/goformation/v4/cloudformation/route53resolver"
-	"github.com/awslabs/goformation/v4/cloudformation/rum"
-	"github.com/awslabs/goformation/v4/cloudformation/s3"
-	"github.com/awslabs/goformation/v4/cloudformation/s3objectlambda"
-	"github.com/awslabs/goformation/v4/cloudformation/s3outposts"
-	"github.com/awslabs/goformation/v4/cloudformation/sagemaker"
-	"github.com/awslabs/goformation/v4/cloudformation/sdb"
-	"github.com/awslabs/goformation/v4/cloudformation/secretsmanager"
-	"github.com/awslabs/goformation/v4/cloudformation/securityhub"
-	"github.com/awslabs/goformation/v4/cloudformation/serverless"
-	"github.com/awslabs/goformation/v4/cloudformation/servicecatalog"
-	"github.com/awslabs/goformation/v4/cloudformation/servicecatalogappregistry"
-	"github.com/awslabs/goformation/v4/cloudformation/servicediscovery"
-	"github.com/awslabs/goformation/v4/cloudformation/ses"
-	"github.com/awslabs/goformation/v4/cloudformation/signer"
-	"github.com/awslabs/goformation/v4/cloudformation/sns"
-	"github.com/awslabs/goformation/v4/cloudformation/sqs"
-	"github.com/awslabs/goformation/v4/cloudformation/ssm"
-	"github.com/awslabs/goformation/v4/cloudformation/ssmcontacts"
-	"github.com/awslabs/goformation/v4/cloudformation/ssmincidents"
-	"github.com/awslabs/goformation/v4/cloudformation/sso"
-	"github.com/awslabs/goformation/v4/cloudformation/stepfunctions"
-	"github.com/awslabs/goformation/v4/cloudformation/synthetics"
-	"github.com/awslabs/goformation/v4/cloudformation/timestream"
-	"github.com/awslabs/goformation/v4/cloudformation/transfer"
-	"github.com/awslabs/goformation/v4/cloudformation/waf"
-	"github.com/awslabs/goformation/v4/cloudformation/wafregional"
-	"github.com/awslabs/goformation/v4/cloudformation/wafv2"
-	"github.com/awslabs/goformation/v4/cloudformation/wisdom"
-	"github.com/awslabs/goformation/v4/cloudformation/workspaces"
-	"github.com/awslabs/goformation/v4/cloudformation/xray"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/accessanalyzer"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/acmpca"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/amazonmq"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/amplify"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/amplifyuibuilder"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/apigateway"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/apigatewayv2"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/appconfig"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/appflow"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/appintegrations"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/applicationautoscaling"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/applicationinsights"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/appmesh"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/apprunner"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/appstream"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/appsync"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/aps"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/ask"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/athena"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/auditmanager"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/autoscaling"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/autoscalingplans"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/backup"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/batch"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/budgets"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cassandra"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/ce"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/certificatemanager"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/chatbot"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloud9"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudfront"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudtrail"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudwatch"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/codeartifact"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/codebuild"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/codecommit"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/codedeploy"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/codeguruprofiler"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/codegurureviewer"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/codepipeline"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/codestar"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/codestarconnections"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/codestarnotifications"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cognito"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/config"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/connect"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cur"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/customerprofiles"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/databrew"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/datapipeline"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/datasync"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/dax"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/detective"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/devopsguru"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/directoryservice"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/dlm"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/dms"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/docdb"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/dynamodb"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/ec2"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/ecr"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/ecs"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/efs"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/eks"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/elasticache"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/elasticbeanstalk"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/elasticloadbalancing"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/elasticloadbalancingv2"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/elasticsearch"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/emr"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/emrcontainers"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/events"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/eventschemas"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/evidently"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/finspace"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/fis"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/fms"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/frauddetector"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/fsx"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/gamelift"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/globalaccelerator"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/glue"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/greengrass"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/greengrassv2"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/groundstation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/guardduty"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/healthlake"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/iam"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/imagebuilder"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/inspector"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/iot"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/iot1click"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/iotanalytics"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/iotcoredeviceadvisor"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/iotevents"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/iotfleethub"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/iotsitewise"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/iotthingsgraph"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/iotwireless"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/ivs"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/kendra"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/kinesis"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/kinesisanalytics"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/kinesisanalyticsv2"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/kinesisfirehose"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/kms"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/lakeformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/lambda"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/licensemanager"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/lightsail"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/location"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/logs"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/lookoutequipment"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/lookoutmetrics"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/lookoutvision"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/macie"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/managedblockchain"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/mediaconnect"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/mediaconvert"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/medialive"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/mediapackage"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/mediastore"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/memorydb"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/msk"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/mwaa"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/neptune"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/networkfirewall"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/networkmanager"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/nimblestudio"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/opensearchservice"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/opsworks"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/opsworkscm"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/panorama"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/pinpoint"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/pinpointemail"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/qldb"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/quicksight"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/ram"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/rds"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/redshift"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/refactorspaces"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/rekognition"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/resiliencehub"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/resourcegroups"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/robomaker"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/route53"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/route53recoverycontrol"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/route53recoveryreadiness"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/route53resolver"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/rum"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/s3"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/s3objectlambda"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/s3outposts"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/sagemaker"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/sdb"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/secretsmanager"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/securityhub"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/serverless"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/servicecatalog"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/servicecatalogappregistry"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/servicediscovery"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/ses"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/signer"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/sns"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/sqs"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/ssm"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/ssmcontacts"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/ssmincidents"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/sso"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/stepfunctions"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/synthetics"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/timestream"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/transfer"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/waf"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/wafregional"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/wafv2"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/wisdom"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/workspaces"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/xray"
 )
 
 // AllResources fetches an iterable map all CloudFormation and SAM resources
diff --git a/goformation/cloudformation/amazonmq/aws-amazonmq-broker.go b/pkg/goformation/cloudformation/amazonmq/aws-amazonmq-broker.go
similarity index 98%
rename from goformation/cloudformation/amazonmq/aws-amazonmq-broker.go
rename to pkg/goformation/cloudformation/amazonmq/aws-amazonmq-broker.go
index 3eef198154..b86afd1329 100644
--- a/goformation/cloudformation/amazonmq/aws-amazonmq-broker.go
+++ b/pkg/goformation/cloudformation/amazonmq/aws-amazonmq-broker.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Broker AWS CloudFormation Resource (AWS::AmazonMQ::Broker)
diff --git a/goformation/cloudformation/amazonmq/aws-amazonmq-broker_configurationid.go b/pkg/goformation/cloudformation/amazonmq/aws-amazonmq-broker_configurationid.go
similarity index 92%
rename from goformation/cloudformation/amazonmq/aws-amazonmq-broker_configurationid.go
rename to pkg/goformation/cloudformation/amazonmq/aws-amazonmq-broker_configurationid.go
index 2e67962c42..dcd8d88eb8 100644
--- a/goformation/cloudformation/amazonmq/aws-amazonmq-broker_configurationid.go
+++ b/pkg/goformation/cloudformation/amazonmq/aws-amazonmq-broker_configurationid.go
@@ -1,9 +1,9 @@
 package amazonmq
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Broker_ConfigurationId AWS CloudFormation Resource (AWS::AmazonMQ::Broker.ConfigurationId)
diff --git a/goformation/cloudformation/amazonmq/aws-amazonmq-broker_encryptionoptions.go b/pkg/goformation/cloudformation/amazonmq/aws-amazonmq-broker_encryptionoptions.go
similarity index 92%
rename from goformation/cloudformation/amazonmq/aws-amazonmq-broker_encryptionoptions.go
rename to pkg/goformation/cloudformation/amazonmq/aws-amazonmq-broker_encryptionoptions.go
index 8053420392..17ecf06017 100644
--- a/goformation/cloudformation/amazonmq/aws-amazonmq-broker_encryptionoptions.go
+++ b/pkg/goformation/cloudformation/amazonmq/aws-amazonmq-broker_encryptionoptions.go
@@ -1,9 +1,9 @@
 package amazonmq
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Broker_EncryptionOptions AWS CloudFormation Resource (AWS::AmazonMQ::Broker.EncryptionOptions)
diff --git a/goformation/cloudformation/amazonmq/aws-amazonmq-broker_ldapservermetadata.go b/pkg/goformation/cloudformation/amazonmq/aws-amazonmq-broker_ldapservermetadata.go
similarity index 97%
rename from goformation/cloudformation/amazonmq/aws-amazonmq-broker_ldapservermetadata.go
rename to pkg/goformation/cloudformation/amazonmq/aws-amazonmq-broker_ldapservermetadata.go
index 882ab7c848..c212f9e441 100644
--- a/goformation/cloudformation/amazonmq/aws-amazonmq-broker_ldapservermetadata.go
+++ b/pkg/goformation/cloudformation/amazonmq/aws-amazonmq-broker_ldapservermetadata.go
@@ -1,9 +1,9 @@
 package amazonmq
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Broker_LdapServerMetadata AWS CloudFormation Resource (AWS::AmazonMQ::Broker.LdapServerMetadata)
diff --git a/goformation/cloudformation/amazonmq/aws-amazonmq-broker_loglist.go b/pkg/goformation/cloudformation/amazonmq/aws-amazonmq-broker_loglist.go
similarity index 92%
rename from goformation/cloudformation/amazonmq/aws-amazonmq-broker_loglist.go
rename to pkg/goformation/cloudformation/amazonmq/aws-amazonmq-broker_loglist.go
index 13d6e27b43..e011480838 100644
--- a/goformation/cloudformation/amazonmq/aws-amazonmq-broker_loglist.go
+++ b/pkg/goformation/cloudformation/amazonmq/aws-amazonmq-broker_loglist.go
@@ -1,9 +1,9 @@
 package amazonmq
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Broker_LogList AWS CloudFormation Resource (AWS::AmazonMQ::Broker.LogList)
diff --git a/goformation/cloudformation/amazonmq/aws-amazonmq-broker_maintenancewindow.go b/pkg/goformation/cloudformation/amazonmq/aws-amazonmq-broker_maintenancewindow.go
similarity index 93%
rename from goformation/cloudformation/amazonmq/aws-amazonmq-broker_maintenancewindow.go
rename to pkg/goformation/cloudformation/amazonmq/aws-amazonmq-broker_maintenancewindow.go
index 392dc1635a..4c7500dc47 100644
--- a/goformation/cloudformation/amazonmq/aws-amazonmq-broker_maintenancewindow.go
+++ b/pkg/goformation/cloudformation/amazonmq/aws-amazonmq-broker_maintenancewindow.go
@@ -1,9 +1,9 @@
 package amazonmq
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Broker_MaintenanceWindow AWS CloudFormation Resource (AWS::AmazonMQ::Broker.MaintenanceWindow)
diff --git a/goformation/cloudformation/amazonmq/aws-amazonmq-broker_tagsentry.go b/pkg/goformation/cloudformation/amazonmq/aws-amazonmq-broker_tagsentry.go
similarity index 92%
rename from goformation/cloudformation/amazonmq/aws-amazonmq-broker_tagsentry.go
rename to pkg/goformation/cloudformation/amazonmq/aws-amazonmq-broker_tagsentry.go
index f0fd92b49f..08ed3e731d 100644
--- a/goformation/cloudformation/amazonmq/aws-amazonmq-broker_tagsentry.go
+++ b/pkg/goformation/cloudformation/amazonmq/aws-amazonmq-broker_tagsentry.go
@@ -1,9 +1,9 @@
 package amazonmq
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Broker_TagsEntry AWS CloudFormation Resource (AWS::AmazonMQ::Broker.TagsEntry)
diff --git a/goformation/cloudformation/amazonmq/aws-amazonmq-broker_user.go b/pkg/goformation/cloudformation/amazonmq/aws-amazonmq-broker_user.go
similarity index 94%
rename from goformation/cloudformation/amazonmq/aws-amazonmq-broker_user.go
rename to pkg/goformation/cloudformation/amazonmq/aws-amazonmq-broker_user.go
index 95941ec0ff..9dfa63f4fe 100644
--- a/goformation/cloudformation/amazonmq/aws-amazonmq-broker_user.go
+++ b/pkg/goformation/cloudformation/amazonmq/aws-amazonmq-broker_user.go
@@ -1,9 +1,9 @@
 package amazonmq
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Broker_User AWS CloudFormation Resource (AWS::AmazonMQ::Broker.User)
diff --git a/goformation/cloudformation/amazonmq/aws-amazonmq-configuration.go b/pkg/goformation/cloudformation/amazonmq/aws-amazonmq-configuration.go
similarity index 97%
rename from goformation/cloudformation/amazonmq/aws-amazonmq-configuration.go
rename to pkg/goformation/cloudformation/amazonmq/aws-amazonmq-configuration.go
index 0ec6fdf028..791f61cfef 100644
--- a/goformation/cloudformation/amazonmq/aws-amazonmq-configuration.go
+++ b/pkg/goformation/cloudformation/amazonmq/aws-amazonmq-configuration.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Configuration AWS CloudFormation Resource (AWS::AmazonMQ::Configuration)
diff --git a/goformation/cloudformation/amazonmq/aws-amazonmq-configuration_tagsentry.go b/pkg/goformation/cloudformation/amazonmq/aws-amazonmq-configuration_tagsentry.go
similarity index 92%
rename from goformation/cloudformation/amazonmq/aws-amazonmq-configuration_tagsentry.go
rename to pkg/goformation/cloudformation/amazonmq/aws-amazonmq-configuration_tagsentry.go
index 939bbe6955..f718f37bb3 100644
--- a/goformation/cloudformation/amazonmq/aws-amazonmq-configuration_tagsentry.go
+++ b/pkg/goformation/cloudformation/amazonmq/aws-amazonmq-configuration_tagsentry.go
@@ -1,9 +1,9 @@
 package amazonmq
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Configuration_TagsEntry AWS CloudFormation Resource (AWS::AmazonMQ::Configuration.TagsEntry)
diff --git a/goformation/cloudformation/amazonmq/aws-amazonmq-configurationassociation.go b/pkg/goformation/cloudformation/amazonmq/aws-amazonmq-configurationassociation.go
similarity index 96%
rename from goformation/cloudformation/amazonmq/aws-amazonmq-configurationassociation.go
rename to pkg/goformation/cloudformation/amazonmq/aws-amazonmq-configurationassociation.go
index c10237e4dd..c51b00fb7c 100644
--- a/goformation/cloudformation/amazonmq/aws-amazonmq-configurationassociation.go
+++ b/pkg/goformation/cloudformation/amazonmq/aws-amazonmq-configurationassociation.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigurationAssociation AWS CloudFormation Resource (AWS::AmazonMQ::ConfigurationAssociation)
diff --git a/goformation/cloudformation/amazonmq/aws-amazonmq-configurationassociation_configurationid.go b/pkg/goformation/cloudformation/amazonmq/aws-amazonmq-configurationassociation_configurationid.go
similarity index 93%
rename from goformation/cloudformation/amazonmq/aws-amazonmq-configurationassociation_configurationid.go
rename to pkg/goformation/cloudformation/amazonmq/aws-amazonmq-configurationassociation_configurationid.go
index aadac05abd..f1c52d6cb2 100644
--- a/goformation/cloudformation/amazonmq/aws-amazonmq-configurationassociation_configurationid.go
+++ b/pkg/goformation/cloudformation/amazonmq/aws-amazonmq-configurationassociation_configurationid.go
@@ -1,9 +1,9 @@
 package amazonmq
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigurationAssociation_ConfigurationId AWS CloudFormation Resource (AWS::AmazonMQ::ConfigurationAssociation.ConfigurationId)
diff --git a/goformation/cloudformation/amplify/aws-amplify-app.go b/pkg/goformation/cloudformation/amplify/aws-amplify-app.go
similarity index 97%
rename from goformation/cloudformation/amplify/aws-amplify-app.go
rename to pkg/goformation/cloudformation/amplify/aws-amplify-app.go
index d661e02321..fdbd7cf3c9 100644
--- a/goformation/cloudformation/amplify/aws-amplify-app.go
+++ b/pkg/goformation/cloudformation/amplify/aws-amplify-app.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // App AWS CloudFormation Resource (AWS::Amplify::App)
diff --git a/goformation/cloudformation/amplify/aws-amplify-app_autobranchcreationconfig.go b/pkg/goformation/cloudformation/amplify/aws-amplify-app_autobranchcreationconfig.go
similarity index 97%
rename from goformation/cloudformation/amplify/aws-amplify-app_autobranchcreationconfig.go
rename to pkg/goformation/cloudformation/amplify/aws-amplify-app_autobranchcreationconfig.go
index c370bad4e5..5da2eae544 100644
--- a/goformation/cloudformation/amplify/aws-amplify-app_autobranchcreationconfig.go
+++ b/pkg/goformation/cloudformation/amplify/aws-amplify-app_autobranchcreationconfig.go
@@ -1,9 +1,9 @@
 package amplify
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // App_AutoBranchCreationConfig AWS CloudFormation Resource (AWS::Amplify::App.AutoBranchCreationConfig)
diff --git a/goformation/cloudformation/amplify/aws-amplify-app_basicauthconfig.go b/pkg/goformation/cloudformation/amplify/aws-amplify-app_basicauthconfig.go
similarity index 93%
rename from goformation/cloudformation/amplify/aws-amplify-app_basicauthconfig.go
rename to pkg/goformation/cloudformation/amplify/aws-amplify-app_basicauthconfig.go
index 8c5b93f555..fe456efa68 100644
--- a/goformation/cloudformation/amplify/aws-amplify-app_basicauthconfig.go
+++ b/pkg/goformation/cloudformation/amplify/aws-amplify-app_basicauthconfig.go
@@ -1,9 +1,9 @@
 package amplify
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // App_BasicAuthConfig AWS CloudFormation Resource (AWS::Amplify::App.BasicAuthConfig)
diff --git a/goformation/cloudformation/amplify/aws-amplify-app_customrule.go b/pkg/goformation/cloudformation/amplify/aws-amplify-app_customrule.go
similarity index 94%
rename from goformation/cloudformation/amplify/aws-amplify-app_customrule.go
rename to pkg/goformation/cloudformation/amplify/aws-amplify-app_customrule.go
index ef61239a60..89b5d7bf91 100644
--- a/goformation/cloudformation/amplify/aws-amplify-app_customrule.go
+++ b/pkg/goformation/cloudformation/amplify/aws-amplify-app_customrule.go
@@ -1,9 +1,9 @@
 package amplify
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // App_CustomRule AWS CloudFormation Resource (AWS::Amplify::App.CustomRule)
diff --git a/goformation/cloudformation/amplify/aws-amplify-app_environmentvariable.go b/pkg/goformation/cloudformation/amplify/aws-amplify-app_environmentvariable.go
similarity index 92%
rename from goformation/cloudformation/amplify/aws-amplify-app_environmentvariable.go
rename to pkg/goformation/cloudformation/amplify/aws-amplify-app_environmentvariable.go
index 8d901640b8..83327f08b5 100644
--- a/goformation/cloudformation/amplify/aws-amplify-app_environmentvariable.go
+++ b/pkg/goformation/cloudformation/amplify/aws-amplify-app_environmentvariable.go
@@ -1,9 +1,9 @@
 package amplify
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // App_EnvironmentVariable AWS CloudFormation Resource (AWS::Amplify::App.EnvironmentVariable)
diff --git a/goformation/cloudformation/amplify/aws-amplify-branch.go b/pkg/goformation/cloudformation/amplify/aws-amplify-branch.go
similarity index 96%
rename from goformation/cloudformation/amplify/aws-amplify-branch.go
rename to pkg/goformation/cloudformation/amplify/aws-amplify-branch.go
index 245cd0f594..0ef9ea0d9d 100644
--- a/goformation/cloudformation/amplify/aws-amplify-branch.go
+++ b/pkg/goformation/cloudformation/amplify/aws-amplify-branch.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Branch AWS CloudFormation Resource (AWS::Amplify::Branch)
diff --git a/goformation/cloudformation/amplify/aws-amplify-branch_basicauthconfig.go b/pkg/goformation/cloudformation/amplify/aws-amplify-branch_basicauthconfig.go
similarity index 93%
rename from goformation/cloudformation/amplify/aws-amplify-branch_basicauthconfig.go
rename to pkg/goformation/cloudformation/amplify/aws-amplify-branch_basicauthconfig.go
index 1f317a44d2..0ef944edc5 100644
--- a/goformation/cloudformation/amplify/aws-amplify-branch_basicauthconfig.go
+++ b/pkg/goformation/cloudformation/amplify/aws-amplify-branch_basicauthconfig.go
@@ -1,9 +1,9 @@
 package amplify
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Branch_BasicAuthConfig AWS CloudFormation Resource (AWS::Amplify::Branch.BasicAuthConfig)
diff --git a/goformation/cloudformation/amplify/aws-amplify-branch_environmentvariable.go b/pkg/goformation/cloudformation/amplify/aws-amplify-branch_environmentvariable.go
similarity index 92%
rename from goformation/cloudformation/amplify/aws-amplify-branch_environmentvariable.go
rename to pkg/goformation/cloudformation/amplify/aws-amplify-branch_environmentvariable.go
index 2425cbe15c..32c278b123 100644
--- a/goformation/cloudformation/amplify/aws-amplify-branch_environmentvariable.go
+++ b/pkg/goformation/cloudformation/amplify/aws-amplify-branch_environmentvariable.go
@@ -1,9 +1,9 @@
 package amplify
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Branch_EnvironmentVariable AWS CloudFormation Resource (AWS::Amplify::Branch.EnvironmentVariable)
diff --git a/goformation/cloudformation/amplify/aws-amplify-domain.go b/pkg/goformation/cloudformation/amplify/aws-amplify-domain.go
similarity index 97%
rename from goformation/cloudformation/amplify/aws-amplify-domain.go
rename to pkg/goformation/cloudformation/amplify/aws-amplify-domain.go
index 49ca4e0b9d..7122736158 100644
--- a/goformation/cloudformation/amplify/aws-amplify-domain.go
+++ b/pkg/goformation/cloudformation/amplify/aws-amplify-domain.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain AWS CloudFormation Resource (AWS::Amplify::Domain)
diff --git a/goformation/cloudformation/amplify/aws-amplify-domain_subdomainsetting.go b/pkg/goformation/cloudformation/amplify/aws-amplify-domain_subdomainsetting.go
similarity index 92%
rename from goformation/cloudformation/amplify/aws-amplify-domain_subdomainsetting.go
rename to pkg/goformation/cloudformation/amplify/aws-amplify-domain_subdomainsetting.go
index 84d9c19688..aed69234f3 100644
--- a/goformation/cloudformation/amplify/aws-amplify-domain_subdomainsetting.go
+++ b/pkg/goformation/cloudformation/amplify/aws-amplify-domain_subdomainsetting.go
@@ -1,9 +1,9 @@
 package amplify
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain_SubDomainSetting AWS CloudFormation Resource (AWS::Amplify::Domain.SubDomainSetting)
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component.go b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component.go
similarity index 97%
rename from goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component.go
rename to pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component.go
index 1db8ca61cf..f0d5e985f1 100644
--- a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component.go
+++ b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Component AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Component)
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentbindingpropertiesvalue.go b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentbindingpropertiesvalue.go
similarity index 94%
rename from goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentbindingpropertiesvalue.go
rename to pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentbindingpropertiesvalue.go
index 23db502b77..aea42f4620 100644
--- a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentbindingpropertiesvalue.go
+++ b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentbindingpropertiesvalue.go
@@ -1,9 +1,9 @@
 package amplifyuibuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Component_ComponentBindingPropertiesValue AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Component.ComponentBindingPropertiesValue)
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentbindingpropertiesvalueproperties.go b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentbindingpropertiesvalueproperties.go
similarity index 96%
rename from goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentbindingpropertiesvalueproperties.go
rename to pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentbindingpropertiesvalueproperties.go
index 6c1c0881ef..dadd05025d 100644
--- a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentbindingpropertiesvalueproperties.go
+++ b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentbindingpropertiesvalueproperties.go
@@ -1,9 +1,9 @@
 package amplifyuibuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Component_ComponentBindingPropertiesValueProperties AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Component.ComponentBindingPropertiesValueProperties)
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentchild.go b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentchild.go
similarity index 94%
rename from goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentchild.go
rename to pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentchild.go
index ba0348fe02..f8fe76d92a 100644
--- a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentchild.go
+++ b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentchild.go
@@ -1,9 +1,9 @@
 package amplifyuibuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Component_ComponentChild AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Component.ComponentChild)
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentconditionproperty.go b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentconditionproperty.go
similarity index 95%
rename from goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentconditionproperty.go
rename to pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentconditionproperty.go
index f46c37ea00..8990ff2809 100644
--- a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentconditionproperty.go
+++ b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentconditionproperty.go
@@ -1,9 +1,9 @@
 package amplifyuibuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Component_ComponentConditionProperty AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Component.ComponentConditionProperty)
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentdataconfiguration.go b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentdataconfiguration.go
similarity index 95%
rename from goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentdataconfiguration.go
rename to pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentdataconfiguration.go
index 7c0a07a5a8..18f60665ac 100644
--- a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentdataconfiguration.go
+++ b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentdataconfiguration.go
@@ -1,9 +1,9 @@
 package amplifyuibuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Component_ComponentDataConfiguration AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Component.ComponentDataConfiguration)
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentoverrides.go b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentoverrides.go
similarity index 94%
rename from goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentoverrides.go
rename to pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentoverrides.go
index 52da470d4d..070f054413 100644
--- a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentoverrides.go
+++ b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentoverrides.go
@@ -1,7 +1,7 @@
 package amplifyuibuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Component_ComponentOverrides AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Component.ComponentOverrides)
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentoverridesvalue.go b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentoverridesvalue.go
similarity index 94%
rename from goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentoverridesvalue.go
rename to pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentoverridesvalue.go
index 1fd5f9b5cb..a14510daab 100644
--- a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentoverridesvalue.go
+++ b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentoverridesvalue.go
@@ -1,7 +1,7 @@
 package amplifyuibuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Component_ComponentOverridesValue AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Component.ComponentOverridesValue)
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentproperties.go b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentproperties.go
similarity index 94%
rename from goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentproperties.go
rename to pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentproperties.go
index ce6e7ac82f..4d5dad54e0 100644
--- a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentproperties.go
+++ b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentproperties.go
@@ -1,7 +1,7 @@
 package amplifyuibuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Component_ComponentProperties AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Component.ComponentProperties)
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentproperty.go b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentproperty.go
similarity index 97%
rename from goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentproperty.go
rename to pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentproperty.go
index 834a104340..f06370d444 100644
--- a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentproperty.go
+++ b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentproperty.go
@@ -1,9 +1,9 @@
 package amplifyuibuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Component_ComponentProperty AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Component.ComponentProperty)
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentpropertybindingproperties.go b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentpropertybindingproperties.go
similarity index 93%
rename from goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentpropertybindingproperties.go
rename to pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentpropertybindingproperties.go
index 15c0a7ae78..9abe36b729 100644
--- a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentpropertybindingproperties.go
+++ b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentpropertybindingproperties.go
@@ -1,9 +1,9 @@
 package amplifyuibuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Component_ComponentPropertyBindingProperties AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Component.ComponentPropertyBindingProperties)
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentvariant.go b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentvariant.go
similarity index 96%
rename from goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentvariant.go
rename to pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentvariant.go
index 10f5b929de..f09d288200 100644
--- a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentvariant.go
+++ b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentvariant.go
@@ -1,7 +1,7 @@
 package amplifyuibuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Component_ComponentVariant AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Component.ComponentVariant)
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentvariantvalues.go b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentvariantvalues.go
similarity index 94%
rename from goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentvariantvalues.go
rename to pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentvariantvalues.go
index adaf3b9875..29ec58f219 100644
--- a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentvariantvalues.go
+++ b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentvariantvalues.go
@@ -1,7 +1,7 @@
 package amplifyuibuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Component_ComponentVariantValues AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Component.ComponentVariantValues)
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_formbindings.go b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_formbindings.go
similarity index 94%
rename from goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_formbindings.go
rename to pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_formbindings.go
index b6605b89d5..05e14bc194 100644
--- a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_formbindings.go
+++ b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_formbindings.go
@@ -1,7 +1,7 @@
 package amplifyuibuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Component_FormBindings AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Component.FormBindings)
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_predicate.go b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_predicate.go
similarity index 95%
rename from goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_predicate.go
rename to pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_predicate.go
index 82ce1f1242..9ab984f928 100644
--- a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_predicate.go
+++ b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_predicate.go
@@ -1,9 +1,9 @@
 package amplifyuibuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Component_Predicate AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Component.Predicate)
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_sortproperty.go b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_sortproperty.go
similarity index 93%
rename from goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_sortproperty.go
rename to pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_sortproperty.go
index 7ba1939876..01b42de86e 100644
--- a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_sortproperty.go
+++ b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_sortproperty.go
@@ -1,9 +1,9 @@
 package amplifyuibuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Component_SortProperty AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Component.SortProperty)
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme.go b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme.go
similarity index 97%
rename from goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme.go
rename to pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme.go
index 071c30aa2f..05db532569 100644
--- a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme.go
+++ b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Theme AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Theme)
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme_themevalue.go b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme_themevalue.go
similarity index 92%
rename from goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme_themevalue.go
rename to pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme_themevalue.go
index 943dedc4cd..be087a55d6 100644
--- a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme_themevalue.go
+++ b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme_themevalue.go
@@ -1,9 +1,9 @@
 package amplifyuibuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Theme_ThemeValue AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Theme.ThemeValue)
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme_themevalues.go b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme_themevalues.go
similarity index 92%
rename from goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme_themevalues.go
rename to pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme_themevalues.go
index 063296c645..604d763e2a 100644
--- a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme_themevalues.go
+++ b/pkg/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme_themevalues.go
@@ -1,9 +1,9 @@
 package amplifyuibuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Theme_ThemeValues AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Theme.ThemeValues)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-account.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-account.go
similarity index 96%
rename from goformation/cloudformation/apigateway/aws-apigateway-account.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-account.go
index bf00a46700..e986163050 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-account.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-account.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Account AWS CloudFormation Resource (AWS::ApiGateway::Account)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-apikey.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-apikey.go
similarity index 96%
rename from goformation/cloudformation/apigateway/aws-apigateway-apikey.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-apikey.go
index f6ea895939..bf35ed5e13 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-apikey.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-apikey.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApiKey AWS CloudFormation Resource (AWS::ApiGateway::ApiKey)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-apikey_stagekey.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-apikey_stagekey.go
similarity index 92%
rename from goformation/cloudformation/apigateway/aws-apigateway-apikey_stagekey.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-apikey_stagekey.go
index 52197f3580..9cd6fed890 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-apikey_stagekey.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-apikey_stagekey.go
@@ -1,9 +1,9 @@
 package apigateway
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApiKey_StageKey AWS CloudFormation Resource (AWS::ApiGateway::ApiKey.StageKey)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-authorizer.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-authorizer.go
similarity index 97%
rename from goformation/cloudformation/apigateway/aws-apigateway-authorizer.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-authorizer.go
index 5ef6f1c201..c7017eb086 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-authorizer.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-authorizer.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Authorizer AWS CloudFormation Resource (AWS::ApiGateway::Authorizer)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-basepathmapping.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-basepathmapping.go
similarity index 97%
rename from goformation/cloudformation/apigateway/aws-apigateway-basepathmapping.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-basepathmapping.go
index 339d6d01cc..e12d44590b 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-basepathmapping.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-basepathmapping.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // BasePathMapping AWS CloudFormation Resource (AWS::ApiGateway::BasePathMapping)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-clientcertificate.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-clientcertificate.go
similarity index 95%
rename from goformation/cloudformation/apigateway/aws-apigateway-clientcertificate.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-clientcertificate.go
index 0cf9b093ab..8328877892 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-clientcertificate.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-clientcertificate.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ClientCertificate AWS CloudFormation Resource (AWS::ApiGateway::ClientCertificate)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-deployment.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-deployment.go
similarity index 97%
rename from goformation/cloudformation/apigateway/aws-apigateway-deployment.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-deployment.go
index 8f96b0c869..5b290f3622 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-deployment.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-deployment.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Deployment AWS CloudFormation Resource (AWS::ApiGateway::Deployment)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-deployment_accesslogsetting.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-deployment_accesslogsetting.go
similarity index 93%
rename from goformation/cloudformation/apigateway/aws-apigateway-deployment_accesslogsetting.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-deployment_accesslogsetting.go
index 83f9c4ec28..4a3b6c1cd9 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-deployment_accesslogsetting.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-deployment_accesslogsetting.go
@@ -1,9 +1,9 @@
 package apigateway
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Deployment_AccessLogSetting AWS CloudFormation Resource (AWS::ApiGateway::Deployment.AccessLogSetting)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-deployment_canarysetting.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-deployment_canarysetting.go
similarity index 94%
rename from goformation/cloudformation/apigateway/aws-apigateway-deployment_canarysetting.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-deployment_canarysetting.go
index 114da97aef..100cd46032 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-deployment_canarysetting.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-deployment_canarysetting.go
@@ -1,9 +1,9 @@
 package apigateway
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Deployment_CanarySetting AWS CloudFormation Resource (AWS::ApiGateway::Deployment.CanarySetting)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-deployment_deploymentcanarysettings.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-deployment_deploymentcanarysettings.go
similarity index 94%
rename from goformation/cloudformation/apigateway/aws-apigateway-deployment_deploymentcanarysettings.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-deployment_deploymentcanarysettings.go
index 513d963754..b9bb4e3d80 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-deployment_deploymentcanarysettings.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-deployment_deploymentcanarysettings.go
@@ -1,9 +1,9 @@
 package apigateway
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Deployment_DeploymentCanarySettings AWS CloudFormation Resource (AWS::ApiGateway::Deployment.DeploymentCanarySettings)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-deployment_methodsetting.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-deployment_methodsetting.go
similarity index 97%
rename from goformation/cloudformation/apigateway/aws-apigateway-deployment_methodsetting.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-deployment_methodsetting.go
index 6fd621a8c1..e349e527a1 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-deployment_methodsetting.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-deployment_methodsetting.go
@@ -1,9 +1,9 @@
 package apigateway
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Deployment_MethodSetting AWS CloudFormation Resource (AWS::ApiGateway::Deployment.MethodSetting)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-deployment_stagedescription.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-deployment_stagedescription.go
similarity index 97%
rename from goformation/cloudformation/apigateway/aws-apigateway-deployment_stagedescription.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-deployment_stagedescription.go
index cacc5c1e58..11ef918f32 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-deployment_stagedescription.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-deployment_stagedescription.go
@@ -1,10 +1,10 @@
 package apigateway
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Deployment_StageDescription AWS CloudFormation Resource (AWS::ApiGateway::Deployment.StageDescription)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-documentationpart.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-documentationpart.go
similarity index 97%
rename from goformation/cloudformation/apigateway/aws-apigateway-documentationpart.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-documentationpart.go
index 1f9ddf877b..c462658ad8 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-documentationpart.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-documentationpart.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DocumentationPart AWS CloudFormation Resource (AWS::ApiGateway::DocumentationPart)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-documentationpart_location.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-documentationpart_location.go
similarity index 95%
rename from goformation/cloudformation/apigateway/aws-apigateway-documentationpart_location.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-documentationpart_location.go
index 8195813cac..061380ee61 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-documentationpart_location.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-documentationpart_location.go
@@ -1,9 +1,9 @@
 package apigateway
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DocumentationPart_Location AWS CloudFormation Resource (AWS::ApiGateway::DocumentationPart.Location)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-documentationversion.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-documentationversion.go
similarity index 97%
rename from goformation/cloudformation/apigateway/aws-apigateway-documentationversion.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-documentationversion.go
index 09493adda5..29f76da6e4 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-documentationversion.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-documentationversion.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DocumentationVersion AWS CloudFormation Resource (AWS::ApiGateway::DocumentationVersion)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-domainname.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-domainname.go
similarity index 96%
rename from goformation/cloudformation/apigateway/aws-apigateway-domainname.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-domainname.go
index d4089adadb..651b40de5f 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-domainname.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-domainname.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DomainName AWS CloudFormation Resource (AWS::ApiGateway::DomainName)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-domainname_endpointconfiguration.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-domainname_endpointconfiguration.go
similarity index 91%
rename from goformation/cloudformation/apigateway/aws-apigateway-domainname_endpointconfiguration.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-domainname_endpointconfiguration.go
index 17d5fb8026..663c59e219 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-domainname_endpointconfiguration.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-domainname_endpointconfiguration.go
@@ -1,9 +1,9 @@
 package apigateway
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DomainName_EndpointConfiguration AWS CloudFormation Resource (AWS::ApiGateway::DomainName.EndpointConfiguration)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-domainname_mutualtlsauthentication.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-domainname_mutualtlsauthentication.go
similarity index 93%
rename from goformation/cloudformation/apigateway/aws-apigateway-domainname_mutualtlsauthentication.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-domainname_mutualtlsauthentication.go
index 754e9dbc30..2f0eb7ef8a 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-domainname_mutualtlsauthentication.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-domainname_mutualtlsauthentication.go
@@ -1,9 +1,9 @@
 package apigateway
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DomainName_MutualTlsAuthentication AWS CloudFormation Resource (AWS::ApiGateway::DomainName.MutualTlsAuthentication)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-gatewayresponse.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-gatewayresponse.go
similarity index 97%
rename from goformation/cloudformation/apigateway/aws-apigateway-gatewayresponse.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-gatewayresponse.go
index 393743f7e3..c11e6fa4bd 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-gatewayresponse.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-gatewayresponse.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GatewayResponse AWS CloudFormation Resource (AWS::ApiGateway::GatewayResponse)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-method.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-method.go
similarity index 98%
rename from goformation/cloudformation/apigateway/aws-apigateway-method.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-method.go
index 5b7e0e79ec..5e3805d445 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-method.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-method.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Method AWS CloudFormation Resource (AWS::ApiGateway::Method)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-method_integration.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-method_integration.go
similarity index 97%
rename from goformation/cloudformation/apigateway/aws-apigateway-method_integration.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-method_integration.go
index 5018f480c6..67545ae298 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-method_integration.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-method_integration.go
@@ -1,9 +1,9 @@
 package apigateway
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Method_Integration AWS CloudFormation Resource (AWS::ApiGateway::Method.Integration)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-method_integrationresponse.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-method_integrationresponse.go
similarity index 95%
rename from goformation/cloudformation/apigateway/aws-apigateway-method_integrationresponse.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-method_integrationresponse.go
index 27cb10a3e7..3116dd4d7a 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-method_integrationresponse.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-method_integrationresponse.go
@@ -1,9 +1,9 @@
 package apigateway
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Method_IntegrationResponse AWS CloudFormation Resource (AWS::ApiGateway::Method.IntegrationResponse)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-method_methodresponse.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-method_methodresponse.go
similarity index 93%
rename from goformation/cloudformation/apigateway/aws-apigateway-method_methodresponse.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-method_methodresponse.go
index 647f4385b9..c7b2092aed 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-method_methodresponse.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-method_methodresponse.go
@@ -1,9 +1,9 @@
 package apigateway
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Method_MethodResponse AWS CloudFormation Resource (AWS::ApiGateway::Method.MethodResponse)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-model.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-model.go
similarity index 97%
rename from goformation/cloudformation/apigateway/aws-apigateway-model.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-model.go
index cc97a4fb44..4732426262 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-model.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-model.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Model AWS CloudFormation Resource (AWS::ApiGateway::Model)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-requestvalidator.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-requestvalidator.go
similarity index 97%
rename from goformation/cloudformation/apigateway/aws-apigateway-requestvalidator.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-requestvalidator.go
index 341993e2db..2b7c644f4f 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-requestvalidator.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-requestvalidator.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RequestValidator AWS CloudFormation Resource (AWS::ApiGateway::RequestValidator)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-resource.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-resource.go
similarity index 96%
rename from goformation/cloudformation/apigateway/aws-apigateway-resource.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-resource.go
index 199418040c..9599819653 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-resource.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-resource.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Resource AWS CloudFormation Resource (AWS::ApiGateway::Resource)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-restapi.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-restapi.go
similarity index 97%
rename from goformation/cloudformation/apigateway/aws-apigateway-restapi.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-restapi.go
index 4882be143b..d9fabad110 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-restapi.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-restapi.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RestApi AWS CloudFormation Resource (AWS::ApiGateway::RestApi)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-restapi_endpointconfiguration.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-restapi_endpointconfiguration.go
similarity index 93%
rename from goformation/cloudformation/apigateway/aws-apigateway-restapi_endpointconfiguration.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-restapi_endpointconfiguration.go
index 6d4c3a5e60..90a7902448 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-restapi_endpointconfiguration.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-restapi_endpointconfiguration.go
@@ -1,9 +1,9 @@
 package apigateway
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RestApi_EndpointConfiguration AWS CloudFormation Resource (AWS::ApiGateway::RestApi.EndpointConfiguration)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-restapi_s3location.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-restapi_s3location.go
similarity index 94%
rename from goformation/cloudformation/apigateway/aws-apigateway-restapi_s3location.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-restapi_s3location.go
index 591e0bd6e2..091858df83 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-restapi_s3location.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-restapi_s3location.go
@@ -1,9 +1,9 @@
 package apigateway
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RestApi_S3Location AWS CloudFormation Resource (AWS::ApiGateway::RestApi.S3Location)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-stage.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-stage.go
similarity index 97%
rename from goformation/cloudformation/apigateway/aws-apigateway-stage.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-stage.go
index 9af5b3e928..126aa78599 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-stage.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-stage.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Stage AWS CloudFormation Resource (AWS::ApiGateway::Stage)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-stage_accesslogsetting.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-stage_accesslogsetting.go
similarity index 92%
rename from goformation/cloudformation/apigateway/aws-apigateway-stage_accesslogsetting.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-stage_accesslogsetting.go
index a98768a6aa..bedca0ad71 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-stage_accesslogsetting.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-stage_accesslogsetting.go
@@ -1,9 +1,9 @@
 package apigateway
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Stage_AccessLogSetting AWS CloudFormation Resource (AWS::ApiGateway::Stage.AccessLogSetting)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-stage_canarysetting.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-stage_canarysetting.go
similarity index 94%
rename from goformation/cloudformation/apigateway/aws-apigateway-stage_canarysetting.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-stage_canarysetting.go
index 92ac4d039f..24c8aa4318 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-stage_canarysetting.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-stage_canarysetting.go
@@ -1,9 +1,9 @@
 package apigateway
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Stage_CanarySetting AWS CloudFormation Resource (AWS::ApiGateway::Stage.CanarySetting)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-stage_methodsetting.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-stage_methodsetting.go
similarity index 96%
rename from goformation/cloudformation/apigateway/aws-apigateway-stage_methodsetting.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-stage_methodsetting.go
index 184c0ccee1..2159be6a4d 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-stage_methodsetting.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-stage_methodsetting.go
@@ -1,9 +1,9 @@
 package apigateway
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Stage_MethodSetting AWS CloudFormation Resource (AWS::ApiGateway::Stage.MethodSetting)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-usageplan.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-usageplan.go
similarity index 95%
rename from goformation/cloudformation/apigateway/aws-apigateway-usageplan.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-usageplan.go
index 5f6d39a07d..cd4be1bf54 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-usageplan.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-usageplan.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UsagePlan AWS CloudFormation Resource (AWS::ApiGateway::UsagePlan)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-usageplan_apistage.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-usageplan_apistage.go
similarity index 93%
rename from goformation/cloudformation/apigateway/aws-apigateway-usageplan_apistage.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-usageplan_apistage.go
index 06dbb55a93..c5625d8a20 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-usageplan_apistage.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-usageplan_apistage.go
@@ -1,9 +1,9 @@
 package apigateway
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UsagePlan_ApiStage AWS CloudFormation Resource (AWS::ApiGateway::UsagePlan.ApiStage)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-usageplan_quotasettings.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-usageplan_quotasettings.go
similarity index 93%
rename from goformation/cloudformation/apigateway/aws-apigateway-usageplan_quotasettings.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-usageplan_quotasettings.go
index dae0482fd1..cae3b43c3c 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-usageplan_quotasettings.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-usageplan_quotasettings.go
@@ -1,9 +1,9 @@
 package apigateway
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UsagePlan_QuotaSettings AWS CloudFormation Resource (AWS::ApiGateway::UsagePlan.QuotaSettings)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-usageplan_throttlesettings.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-usageplan_throttlesettings.go
similarity index 93%
rename from goformation/cloudformation/apigateway/aws-apigateway-usageplan_throttlesettings.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-usageplan_throttlesettings.go
index 58e447669d..11a78b3e79 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-usageplan_throttlesettings.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-usageplan_throttlesettings.go
@@ -1,9 +1,9 @@
 package apigateway
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UsagePlan_ThrottleSettings AWS CloudFormation Resource (AWS::ApiGateway::UsagePlan.ThrottleSettings)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-usageplankey.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-usageplankey.go
similarity index 96%
rename from goformation/cloudformation/apigateway/aws-apigateway-usageplankey.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-usageplankey.go
index 1e86b63372..3c5fc764ed 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-usageplankey.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-usageplankey.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UsagePlanKey AWS CloudFormation Resource (AWS::ApiGateway::UsagePlanKey)
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-vpclink.go b/pkg/goformation/cloudformation/apigateway/aws-apigateway-vpclink.go
similarity index 95%
rename from goformation/cloudformation/apigateway/aws-apigateway-vpclink.go
rename to pkg/goformation/cloudformation/apigateway/aws-apigateway-vpclink.go
index f779b0c962..8c469967b3 100644
--- a/goformation/cloudformation/apigateway/aws-apigateway-vpclink.go
+++ b/pkg/goformation/cloudformation/apigateway/aws-apigateway-vpclink.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VpcLink AWS CloudFormation Resource (AWS::ApiGateway::VpcLink)
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-api.go b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-api.go
similarity index 98%
rename from goformation/cloudformation/apigatewayv2/aws-apigatewayv2-api.go
rename to pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-api.go
index 455e11e8c5..190a4e8362 100644
--- a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-api.go
+++ b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-api.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Api AWS CloudFormation Resource (AWS::ApiGatewayV2::Api)
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-api_bodys3location.go b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-api_bodys3location.go
similarity index 94%
rename from goformation/cloudformation/apigatewayv2/aws-apigatewayv2-api_bodys3location.go
rename to pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-api_bodys3location.go
index 239da4256c..a2f5f211ef 100644
--- a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-api_bodys3location.go
+++ b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-api_bodys3location.go
@@ -1,9 +1,9 @@
 package apigatewayv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Api_BodyS3Location AWS CloudFormation Resource (AWS::ApiGatewayV2::Api.BodyS3Location)
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-api_cors.go b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-api_cors.go
similarity index 95%
rename from goformation/cloudformation/apigatewayv2/aws-apigatewayv2-api_cors.go
rename to pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-api_cors.go
index 3e0d3df267..f6aeb99ad6 100644
--- a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-api_cors.go
+++ b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-api_cors.go
@@ -1,9 +1,9 @@
 package apigatewayv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Api_Cors AWS CloudFormation Resource (AWS::ApiGatewayV2::Api.Cors)
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides.go b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides.go
similarity index 97%
rename from goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides.go
rename to pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides.go
index be82df4842..a7933427a5 100644
--- a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides.go
+++ b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApiGatewayManagedOverrides AWS CloudFormation Resource (AWS::ApiGatewayV2::ApiGatewayManagedOverrides)
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_accesslogsettings.go b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_accesslogsettings.go
similarity index 93%
rename from goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_accesslogsettings.go
rename to pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_accesslogsettings.go
index e2a6ac0dbd..613873da04 100644
--- a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_accesslogsettings.go
+++ b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_accesslogsettings.go
@@ -1,9 +1,9 @@
 package apigatewayv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApiGatewayManagedOverrides_AccessLogSettings AWS CloudFormation Resource (AWS::ApiGatewayV2::ApiGatewayManagedOverrides.AccessLogSettings)
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_integrationoverrides.go b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_integrationoverrides.go
similarity index 95%
rename from goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_integrationoverrides.go
rename to pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_integrationoverrides.go
index f1a33445f4..556aa2a3b4 100644
--- a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_integrationoverrides.go
+++ b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_integrationoverrides.go
@@ -1,9 +1,9 @@
 package apigatewayv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApiGatewayManagedOverrides_IntegrationOverrides AWS CloudFormation Resource (AWS::ApiGatewayV2::ApiGatewayManagedOverrides.IntegrationOverrides)
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_routeoverrides.go b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_routeoverrides.go
similarity index 95%
rename from goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_routeoverrides.go
rename to pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_routeoverrides.go
index 80258ac1e7..21a2b5fd32 100644
--- a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_routeoverrides.go
+++ b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_routeoverrides.go
@@ -1,9 +1,9 @@
 package apigatewayv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApiGatewayManagedOverrides_RouteOverrides AWS CloudFormation Resource (AWS::ApiGatewayV2::ApiGatewayManagedOverrides.RouteOverrides)
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_routesettings.go b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_routesettings.go
similarity index 95%
rename from goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_routesettings.go
rename to pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_routesettings.go
index 24625643c5..2d5de01887 100644
--- a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_routesettings.go
+++ b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_routesettings.go
@@ -1,9 +1,9 @@
 package apigatewayv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApiGatewayManagedOverrides_RouteSettings AWS CloudFormation Resource (AWS::ApiGatewayV2::ApiGatewayManagedOverrides.RouteSettings)
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_stageoverrides.go b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_stageoverrides.go
similarity index 96%
rename from goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_stageoverrides.go
rename to pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_stageoverrides.go
index 32abcb9dfd..a44220ebce 100644
--- a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_stageoverrides.go
+++ b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_stageoverrides.go
@@ -1,9 +1,9 @@
 package apigatewayv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApiGatewayManagedOverrides_StageOverrides AWS CloudFormation Resource (AWS::ApiGatewayV2::ApiGatewayManagedOverrides.StageOverrides)
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apimapping.go b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apimapping.go
similarity index 97%
rename from goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apimapping.go
rename to pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apimapping.go
index 8588cadd3a..5423395c4e 100644
--- a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apimapping.go
+++ b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apimapping.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApiMapping AWS CloudFormation Resource (AWS::ApiGatewayV2::ApiMapping)
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-authorizer.go b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-authorizer.go
similarity index 98%
rename from goformation/cloudformation/apigatewayv2/aws-apigatewayv2-authorizer.go
rename to pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-authorizer.go
index 20c2921026..8661dc0228 100644
--- a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-authorizer.go
+++ b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-authorizer.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Authorizer AWS CloudFormation Resource (AWS::ApiGatewayV2::Authorizer)
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-authorizer_jwtconfiguration.go b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-authorizer_jwtconfiguration.go
similarity index 93%
rename from goformation/cloudformation/apigatewayv2/aws-apigatewayv2-authorizer_jwtconfiguration.go
rename to pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-authorizer_jwtconfiguration.go
index 01eea93e98..57c98bd6a6 100644
--- a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-authorizer_jwtconfiguration.go
+++ b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-authorizer_jwtconfiguration.go
@@ -1,9 +1,9 @@
 package apigatewayv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Authorizer_JWTConfiguration AWS CloudFormation Resource (AWS::ApiGatewayV2::Authorizer.JWTConfiguration)
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-deployment.go b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-deployment.go
similarity index 96%
rename from goformation/cloudformation/apigatewayv2/aws-apigatewayv2-deployment.go
rename to pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-deployment.go
index 96ac513cce..f6bb954009 100644
--- a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-deployment.go
+++ b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-deployment.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Deployment AWS CloudFormation Resource (AWS::ApiGatewayV2::Deployment)
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-domainname.go b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-domainname.go
similarity index 97%
rename from goformation/cloudformation/apigatewayv2/aws-apigatewayv2-domainname.go
rename to pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-domainname.go
index 1881d7868c..0e4ea225b9 100644
--- a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-domainname.go
+++ b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-domainname.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DomainName AWS CloudFormation Resource (AWS::ApiGatewayV2::DomainName)
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-domainname_domainnameconfiguration.go b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-domainname_domainnameconfiguration.go
similarity index 95%
rename from goformation/cloudformation/apigatewayv2/aws-apigatewayv2-domainname_domainnameconfiguration.go
rename to pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-domainname_domainnameconfiguration.go
index b2c5140578..e2ee6117e4 100644
--- a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-domainname_domainnameconfiguration.go
+++ b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-domainname_domainnameconfiguration.go
@@ -1,9 +1,9 @@
 package apigatewayv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DomainName_DomainNameConfiguration AWS CloudFormation Resource (AWS::ApiGatewayV2::DomainName.DomainNameConfiguration)
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-domainname_mutualtlsauthentication.go b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-domainname_mutualtlsauthentication.go
similarity index 93%
rename from goformation/cloudformation/apigatewayv2/aws-apigatewayv2-domainname_mutualtlsauthentication.go
rename to pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-domainname_mutualtlsauthentication.go
index b7cbb8044d..0c11191506 100644
--- a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-domainname_mutualtlsauthentication.go
+++ b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-domainname_mutualtlsauthentication.go
@@ -1,9 +1,9 @@
 package apigatewayv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DomainName_MutualTlsAuthentication AWS CloudFormation Resource (AWS::ApiGatewayV2::DomainName.MutualTlsAuthentication)
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration.go b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration.go
similarity index 98%
rename from goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration.go
rename to pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration.go
index 4aecd4b491..a52b45aa7b 100644
--- a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration.go
+++ b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Integration AWS CloudFormation Resource (AWS::ApiGatewayV2::Integration)
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration_responseparameter.go b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration_responseparameter.go
similarity index 93%
rename from goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration_responseparameter.go
rename to pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration_responseparameter.go
index fd2c99dd7a..2ba64d80f2 100644
--- a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration_responseparameter.go
+++ b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration_responseparameter.go
@@ -1,9 +1,9 @@
 package apigatewayv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Integration_ResponseParameter AWS CloudFormation Resource (AWS::ApiGatewayV2::Integration.ResponseParameter)
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration_responseparameterlist.go b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration_responseparameterlist.go
similarity index 95%
rename from goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration_responseparameterlist.go
rename to pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration_responseparameterlist.go
index 95bf5cf9fb..b8987dac1e 100644
--- a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration_responseparameterlist.go
+++ b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration_responseparameterlist.go
@@ -1,7 +1,7 @@
 package apigatewayv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Integration_ResponseParameterList AWS CloudFormation Resource (AWS::ApiGatewayV2::Integration.ResponseParameterList)
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration_tlsconfig.go b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration_tlsconfig.go
similarity index 91%
rename from goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration_tlsconfig.go
rename to pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration_tlsconfig.go
index dcf317c995..afbb46b96d 100644
--- a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration_tlsconfig.go
+++ b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration_tlsconfig.go
@@ -1,9 +1,9 @@
 package apigatewayv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Integration_TlsConfig AWS CloudFormation Resource (AWS::ApiGatewayV2::Integration.TlsConfig)
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integrationresponse.go b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integrationresponse.go
similarity index 97%
rename from goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integrationresponse.go
rename to pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integrationresponse.go
index e069730012..df20655b01 100644
--- a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integrationresponse.go
+++ b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integrationresponse.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // IntegrationResponse AWS CloudFormation Resource (AWS::ApiGatewayV2::IntegrationResponse)
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-model.go b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-model.go
similarity index 97%
rename from goformation/cloudformation/apigatewayv2/aws-apigatewayv2-model.go
rename to pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-model.go
index d5d41ccca3..70e41c58e7 100644
--- a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-model.go
+++ b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-model.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Model AWS CloudFormation Resource (AWS::ApiGatewayV2::Model)
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-route.go b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-route.go
similarity index 98%
rename from goformation/cloudformation/apigatewayv2/aws-apigatewayv2-route.go
rename to pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-route.go
index 52c73cbdfb..ee6706f1a2 100644
--- a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-route.go
+++ b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-route.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Route AWS CloudFormation Resource (AWS::ApiGatewayV2::Route)
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-route_parameterconstraints.go b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-route_parameterconstraints.go
similarity index 91%
rename from goformation/cloudformation/apigatewayv2/aws-apigatewayv2-route_parameterconstraints.go
rename to pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-route_parameterconstraints.go
index 8701b4ec2b..a218f7247e 100644
--- a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-route_parameterconstraints.go
+++ b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-route_parameterconstraints.go
@@ -1,9 +1,9 @@
 package apigatewayv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Route_ParameterConstraints AWS CloudFormation Resource (AWS::ApiGatewayV2::Route.ParameterConstraints)
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-routeresponse.go b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-routeresponse.go
similarity index 97%
rename from goformation/cloudformation/apigatewayv2/aws-apigatewayv2-routeresponse.go
rename to pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-routeresponse.go
index bf92fa5932..ea293a9c99 100644
--- a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-routeresponse.go
+++ b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-routeresponse.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RouteResponse AWS CloudFormation Resource (AWS::ApiGatewayV2::RouteResponse)
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-routeresponse_parameterconstraints.go b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-routeresponse_parameterconstraints.go
similarity index 92%
rename from goformation/cloudformation/apigatewayv2/aws-apigatewayv2-routeresponse_parameterconstraints.go
rename to pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-routeresponse_parameterconstraints.go
index f23597f38f..c3129dd349 100644
--- a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-routeresponse_parameterconstraints.go
+++ b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-routeresponse_parameterconstraints.go
@@ -1,9 +1,9 @@
 package apigatewayv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RouteResponse_ParameterConstraints AWS CloudFormation Resource (AWS::ApiGatewayV2::RouteResponse.ParameterConstraints)
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-stage.go b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-stage.go
similarity index 97%
rename from goformation/cloudformation/apigatewayv2/aws-apigatewayv2-stage.go
rename to pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-stage.go
index 80685c8254..b67b8db399 100644
--- a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-stage.go
+++ b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-stage.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Stage AWS CloudFormation Resource (AWS::ApiGatewayV2::Stage)
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-stage_accesslogsettings.go b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-stage_accesslogsettings.go
similarity index 93%
rename from goformation/cloudformation/apigatewayv2/aws-apigatewayv2-stage_accesslogsettings.go
rename to pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-stage_accesslogsettings.go
index a966ad7bcf..c28b29a69e 100644
--- a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-stage_accesslogsettings.go
+++ b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-stage_accesslogsettings.go
@@ -1,9 +1,9 @@
 package apigatewayv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Stage_AccessLogSettings AWS CloudFormation Resource (AWS::ApiGatewayV2::Stage.AccessLogSettings)
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-stage_routesettings.go b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-stage_routesettings.go
similarity index 95%
rename from goformation/cloudformation/apigatewayv2/aws-apigatewayv2-stage_routesettings.go
rename to pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-stage_routesettings.go
index 0436cc69dd..20d31c4064 100644
--- a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-stage_routesettings.go
+++ b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-stage_routesettings.go
@@ -1,9 +1,9 @@
 package apigatewayv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Stage_RouteSettings AWS CloudFormation Resource (AWS::ApiGatewayV2::Stage.RouteSettings)
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-vpclink.go b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-vpclink.go
similarity index 97%
rename from goformation/cloudformation/apigatewayv2/aws-apigatewayv2-vpclink.go
rename to pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-vpclink.go
index d685db7bf4..f0d9e8f6af 100644
--- a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-vpclink.go
+++ b/pkg/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-vpclink.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VpcLink AWS CloudFormation Resource (AWS::ApiGatewayV2::VpcLink)
diff --git a/goformation/cloudformation/appconfig/aws-appconfig-application.go b/pkg/goformation/cloudformation/appconfig/aws-appconfig-application.go
similarity index 96%
rename from goformation/cloudformation/appconfig/aws-appconfig-application.go
rename to pkg/goformation/cloudformation/appconfig/aws-appconfig-application.go
index f872c32d04..84fe6adf31 100644
--- a/goformation/cloudformation/appconfig/aws-appconfig-application.go
+++ b/pkg/goformation/cloudformation/appconfig/aws-appconfig-application.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application AWS CloudFormation Resource (AWS::AppConfig::Application)
diff --git a/goformation/cloudformation/appconfig/aws-appconfig-application_tags.go b/pkg/goformation/cloudformation/appconfig/aws-appconfig-application_tags.go
similarity index 92%
rename from goformation/cloudformation/appconfig/aws-appconfig-application_tags.go
rename to pkg/goformation/cloudformation/appconfig/aws-appconfig-application_tags.go
index 3d18977461..e407a55b3a 100644
--- a/goformation/cloudformation/appconfig/aws-appconfig-application_tags.go
+++ b/pkg/goformation/cloudformation/appconfig/aws-appconfig-application_tags.go
@@ -1,9 +1,9 @@
 package appconfig
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_Tags AWS CloudFormation Resource (AWS::AppConfig::Application.Tags)
diff --git a/goformation/cloudformation/appconfig/aws-appconfig-configurationprofile.go b/pkg/goformation/cloudformation/appconfig/aws-appconfig-configurationprofile.go
similarity index 97%
rename from goformation/cloudformation/appconfig/aws-appconfig-configurationprofile.go
rename to pkg/goformation/cloudformation/appconfig/aws-appconfig-configurationprofile.go
index 47c79f9d04..51f14d2440 100644
--- a/goformation/cloudformation/appconfig/aws-appconfig-configurationprofile.go
+++ b/pkg/goformation/cloudformation/appconfig/aws-appconfig-configurationprofile.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigurationProfile AWS CloudFormation Resource (AWS::AppConfig::ConfigurationProfile)
diff --git a/goformation/cloudformation/appconfig/aws-appconfig-configurationprofile_tags.go b/pkg/goformation/cloudformation/appconfig/aws-appconfig-configurationprofile_tags.go
similarity index 92%
rename from goformation/cloudformation/appconfig/aws-appconfig-configurationprofile_tags.go
rename to pkg/goformation/cloudformation/appconfig/aws-appconfig-configurationprofile_tags.go
index edc5555b23..41c7edf12e 100644
--- a/goformation/cloudformation/appconfig/aws-appconfig-configurationprofile_tags.go
+++ b/pkg/goformation/cloudformation/appconfig/aws-appconfig-configurationprofile_tags.go
@@ -1,9 +1,9 @@
 package appconfig
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigurationProfile_Tags AWS CloudFormation Resource (AWS::AppConfig::ConfigurationProfile.Tags)
diff --git a/goformation/cloudformation/appconfig/aws-appconfig-configurationprofile_validators.go b/pkg/goformation/cloudformation/appconfig/aws-appconfig-configurationprofile_validators.go
similarity index 93%
rename from goformation/cloudformation/appconfig/aws-appconfig-configurationprofile_validators.go
rename to pkg/goformation/cloudformation/appconfig/aws-appconfig-configurationprofile_validators.go
index 907c672c49..0d257f2889 100644
--- a/goformation/cloudformation/appconfig/aws-appconfig-configurationprofile_validators.go
+++ b/pkg/goformation/cloudformation/appconfig/aws-appconfig-configurationprofile_validators.go
@@ -1,9 +1,9 @@
 package appconfig
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigurationProfile_Validators AWS CloudFormation Resource (AWS::AppConfig::ConfigurationProfile.Validators)
diff --git a/goformation/cloudformation/appconfig/aws-appconfig-deployment.go b/pkg/goformation/cloudformation/appconfig/aws-appconfig-deployment.go
similarity index 97%
rename from goformation/cloudformation/appconfig/aws-appconfig-deployment.go
rename to pkg/goformation/cloudformation/appconfig/aws-appconfig-deployment.go
index e95d5420af..e83c0ebdf6 100644
--- a/goformation/cloudformation/appconfig/aws-appconfig-deployment.go
+++ b/pkg/goformation/cloudformation/appconfig/aws-appconfig-deployment.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Deployment AWS CloudFormation Resource (AWS::AppConfig::Deployment)
diff --git a/goformation/cloudformation/appconfig/aws-appconfig-deployment_tags.go b/pkg/goformation/cloudformation/appconfig/aws-appconfig-deployment_tags.go
similarity index 92%
rename from goformation/cloudformation/appconfig/aws-appconfig-deployment_tags.go
rename to pkg/goformation/cloudformation/appconfig/aws-appconfig-deployment_tags.go
index 70083606de..b90113a2fc 100644
--- a/goformation/cloudformation/appconfig/aws-appconfig-deployment_tags.go
+++ b/pkg/goformation/cloudformation/appconfig/aws-appconfig-deployment_tags.go
@@ -1,9 +1,9 @@
 package appconfig
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Deployment_Tags AWS CloudFormation Resource (AWS::AppConfig::Deployment.Tags)
diff --git a/goformation/cloudformation/appconfig/aws-appconfig-deploymentstrategy.go b/pkg/goformation/cloudformation/appconfig/aws-appconfig-deploymentstrategy.go
similarity index 97%
rename from goformation/cloudformation/appconfig/aws-appconfig-deploymentstrategy.go
rename to pkg/goformation/cloudformation/appconfig/aws-appconfig-deploymentstrategy.go
index fdca1f7f5c..3a24708d64 100644
--- a/goformation/cloudformation/appconfig/aws-appconfig-deploymentstrategy.go
+++ b/pkg/goformation/cloudformation/appconfig/aws-appconfig-deploymentstrategy.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeploymentStrategy AWS CloudFormation Resource (AWS::AppConfig::DeploymentStrategy)
diff --git a/goformation/cloudformation/appconfig/aws-appconfig-deploymentstrategy_tags.go b/pkg/goformation/cloudformation/appconfig/aws-appconfig-deploymentstrategy_tags.go
similarity index 92%
rename from goformation/cloudformation/appconfig/aws-appconfig-deploymentstrategy_tags.go
rename to pkg/goformation/cloudformation/appconfig/aws-appconfig-deploymentstrategy_tags.go
index fdff178268..f2270c5440 100644
--- a/goformation/cloudformation/appconfig/aws-appconfig-deploymentstrategy_tags.go
+++ b/pkg/goformation/cloudformation/appconfig/aws-appconfig-deploymentstrategy_tags.go
@@ -1,9 +1,9 @@
 package appconfig
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeploymentStrategy_Tags AWS CloudFormation Resource (AWS::AppConfig::DeploymentStrategy.Tags)
diff --git a/goformation/cloudformation/appconfig/aws-appconfig-environment.go b/pkg/goformation/cloudformation/appconfig/aws-appconfig-environment.go
similarity index 97%
rename from goformation/cloudformation/appconfig/aws-appconfig-environment.go
rename to pkg/goformation/cloudformation/appconfig/aws-appconfig-environment.go
index 5b227e1557..de23098094 100644
--- a/goformation/cloudformation/appconfig/aws-appconfig-environment.go
+++ b/pkg/goformation/cloudformation/appconfig/aws-appconfig-environment.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Environment AWS CloudFormation Resource (AWS::AppConfig::Environment)
diff --git a/goformation/cloudformation/appconfig/aws-appconfig-environment_monitors.go b/pkg/goformation/cloudformation/appconfig/aws-appconfig-environment_monitors.go
similarity index 92%
rename from goformation/cloudformation/appconfig/aws-appconfig-environment_monitors.go
rename to pkg/goformation/cloudformation/appconfig/aws-appconfig-environment_monitors.go
index 66ab14e28e..12d2a577af 100644
--- a/goformation/cloudformation/appconfig/aws-appconfig-environment_monitors.go
+++ b/pkg/goformation/cloudformation/appconfig/aws-appconfig-environment_monitors.go
@@ -1,9 +1,9 @@
 package appconfig
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Environment_Monitors AWS CloudFormation Resource (AWS::AppConfig::Environment.Monitors)
diff --git a/goformation/cloudformation/appconfig/aws-appconfig-environment_tags.go b/pkg/goformation/cloudformation/appconfig/aws-appconfig-environment_tags.go
similarity index 92%
rename from goformation/cloudformation/appconfig/aws-appconfig-environment_tags.go
rename to pkg/goformation/cloudformation/appconfig/aws-appconfig-environment_tags.go
index 12912fab03..23e73462a9 100644
--- a/goformation/cloudformation/appconfig/aws-appconfig-environment_tags.go
+++ b/pkg/goformation/cloudformation/appconfig/aws-appconfig-environment_tags.go
@@ -1,9 +1,9 @@
 package appconfig
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Environment_Tags AWS CloudFormation Resource (AWS::AppConfig::Environment.Tags)
diff --git a/goformation/cloudformation/appconfig/aws-appconfig-hostedconfigurationversion.go b/pkg/goformation/cloudformation/appconfig/aws-appconfig-hostedconfigurationversion.go
similarity index 97%
rename from goformation/cloudformation/appconfig/aws-appconfig-hostedconfigurationversion.go
rename to pkg/goformation/cloudformation/appconfig/aws-appconfig-hostedconfigurationversion.go
index c2b6f782ee..eb9be97b0b 100644
--- a/goformation/cloudformation/appconfig/aws-appconfig-hostedconfigurationversion.go
+++ b/pkg/goformation/cloudformation/appconfig/aws-appconfig-hostedconfigurationversion.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // HostedConfigurationVersion AWS CloudFormation Resource (AWS::AppConfig::HostedConfigurationVersion)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile.go
similarity index 97%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile.go
index 8ff7e02960..9ee566152e 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_amplitudeconnectorprofilecredentials.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_amplitudeconnectorprofilecredentials.go
similarity index 93%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_amplitudeconnectorprofilecredentials.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_amplitudeconnectorprofilecredentials.go
index 1071fb0413..a02a8a96ef 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_amplitudeconnectorprofilecredentials.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_amplitudeconnectorprofilecredentials.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_AmplitudeConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.AmplitudeConnectorProfileCredentials)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectoroauthrequest.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectoroauthrequest.go
similarity index 93%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectoroauthrequest.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectoroauthrequest.go
index 79589aabcb..96f87c8c36 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectoroauthrequest.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectoroauthrequest.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_ConnectorOAuthRequest AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.ConnectorOAuthRequest)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofileconfig.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofileconfig.go
similarity index 96%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofileconfig.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofileconfig.go
index e85e962092..1be26e4945 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofileconfig.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofileconfig.go
@@ -1,7 +1,7 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_ConnectorProfileConfig AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.ConnectorProfileConfig)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofilecredentials.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofilecredentials.go
similarity index 99%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofilecredentials.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofilecredentials.go
index 6be85f5efd..69cb5ea647 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofilecredentials.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofilecredentials.go
@@ -1,7 +1,7 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_ConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.ConnectorProfileCredentials)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofileproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofileproperties.go
similarity index 98%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofileproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofileproperties.go
index d042a0b1b1..dbf74d8f21 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofileproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofileproperties.go
@@ -1,7 +1,7 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_ConnectorProfileProperties AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.ConnectorProfileProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_datadogconnectorprofilecredentials.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_datadogconnectorprofilecredentials.go
similarity index 93%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_datadogconnectorprofilecredentials.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_datadogconnectorprofilecredentials.go
index b75c17eba4..dc4020b637 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_datadogconnectorprofilecredentials.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_datadogconnectorprofilecredentials.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_DatadogConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.DatadogConnectorProfileCredentials)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_datadogconnectorprofileproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_datadogconnectorprofileproperties.go
similarity index 92%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_datadogconnectorprofileproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_datadogconnectorprofileproperties.go
index a8680aaf8a..929bb91fe1 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_datadogconnectorprofileproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_datadogconnectorprofileproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_DatadogConnectorProfileProperties AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.DatadogConnectorProfileProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_dynatraceconnectorprofilecredentials.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_dynatraceconnectorprofilecredentials.go
similarity index 92%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_dynatraceconnectorprofilecredentials.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_dynatraceconnectorprofilecredentials.go
index bf4cfa7cde..20b6e80d18 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_dynatraceconnectorprofilecredentials.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_dynatraceconnectorprofilecredentials.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_DynatraceConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.DynatraceConnectorProfileCredentials)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_dynatraceconnectorprofileproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_dynatraceconnectorprofileproperties.go
similarity index 92%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_dynatraceconnectorprofileproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_dynatraceconnectorprofileproperties.go
index 3b25e78b31..02200597c4 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_dynatraceconnectorprofileproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_dynatraceconnectorprofileproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_DynatraceConnectorProfileProperties AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.DynatraceConnectorProfileProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_googleanalyticsconnectorprofilecredentials.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_googleanalyticsconnectorprofilecredentials.go
similarity index 95%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_googleanalyticsconnectorprofilecredentials.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_googleanalyticsconnectorprofilecredentials.go
index 495e4e3cee..23806d6b19 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_googleanalyticsconnectorprofilecredentials.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_googleanalyticsconnectorprofilecredentials.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_GoogleAnalyticsConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.GoogleAnalyticsConnectorProfileCredentials)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_infornexusconnectorprofilecredentials.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_infornexusconnectorprofilecredentials.go
similarity index 95%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_infornexusconnectorprofilecredentials.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_infornexusconnectorprofilecredentials.go
index 8503302c76..3bf2c43861 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_infornexusconnectorprofilecredentials.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_infornexusconnectorprofilecredentials.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_InforNexusConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.InforNexusConnectorProfileCredentials)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_infornexusconnectorprofileproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_infornexusconnectorprofileproperties.go
similarity index 92%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_infornexusconnectorprofileproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_infornexusconnectorprofileproperties.go
index a4efbfaaa0..e8456c8c2a 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_infornexusconnectorprofileproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_infornexusconnectorprofileproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_InforNexusConnectorProfileProperties AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.InforNexusConnectorProfileProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_marketoconnectorprofilecredentials.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_marketoconnectorprofilecredentials.go
similarity index 95%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_marketoconnectorprofilecredentials.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_marketoconnectorprofilecredentials.go
index 77590a2db9..9cd7f0f332 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_marketoconnectorprofilecredentials.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_marketoconnectorprofilecredentials.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_MarketoConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.MarketoConnectorProfileCredentials)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_marketoconnectorprofileproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_marketoconnectorprofileproperties.go
similarity index 92%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_marketoconnectorprofileproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_marketoconnectorprofileproperties.go
index c1c833f817..40faaa350f 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_marketoconnectorprofileproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_marketoconnectorprofileproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_MarketoConnectorProfileProperties AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.MarketoConnectorProfileProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_oauthproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_oauthproperties.go
similarity index 94%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_oauthproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_oauthproperties.go
index 4d0b69f462..001390d327 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_oauthproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_oauthproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_OAuthProperties AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.OAuthProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_redshiftconnectorprofilecredentials.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_redshiftconnectorprofilecredentials.go
similarity index 93%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_redshiftconnectorprofilecredentials.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_redshiftconnectorprofilecredentials.go
index fc8e28efe6..3944bfa7a3 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_redshiftconnectorprofilecredentials.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_redshiftconnectorprofilecredentials.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_RedshiftConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.RedshiftConnectorProfileCredentials)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_redshiftconnectorprofileproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_redshiftconnectorprofileproperties.go
similarity index 95%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_redshiftconnectorprofileproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_redshiftconnectorprofileproperties.go
index 1bf15548fb..724010db6c 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_redshiftconnectorprofileproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_redshiftconnectorprofileproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_RedshiftConnectorProfileProperties AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.RedshiftConnectorProfileProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_salesforceconnectorprofilecredentials.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_salesforceconnectorprofilecredentials.go
similarity index 95%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_salesforceconnectorprofilecredentials.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_salesforceconnectorprofilecredentials.go
index 325eb3b2bc..479b6a9b1b 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_salesforceconnectorprofilecredentials.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_salesforceconnectorprofilecredentials.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_SalesforceConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.SalesforceConnectorProfileCredentials)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_salesforceconnectorprofileproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_salesforceconnectorprofileproperties.go
similarity index 93%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_salesforceconnectorprofileproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_salesforceconnectorprofileproperties.go
index a28383aecf..94686999e5 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_salesforceconnectorprofileproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_salesforceconnectorprofileproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_SalesforceConnectorProfileProperties AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.SalesforceConnectorProfileProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_sapodataconnectorprofilecredentials.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_sapodataconnectorprofilecredentials.go
similarity index 96%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_sapodataconnectorprofilecredentials.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_sapodataconnectorprofilecredentials.go
index 55b0b9ec75..c0cb002c9c 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_sapodataconnectorprofilecredentials.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_sapodataconnectorprofilecredentials.go
@@ -1,7 +1,7 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_SAPODataConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.SAPODataConnectorProfileCredentials)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_sapodataconnectorprofileproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_sapodataconnectorprofileproperties.go
similarity index 96%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_sapodataconnectorprofileproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_sapodataconnectorprofileproperties.go
index ef212f907a..74bc075aad 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_sapodataconnectorprofileproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_sapodataconnectorprofileproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_SAPODataConnectorProfileProperties AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.SAPODataConnectorProfileProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_servicenowconnectorprofilecredentials.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_servicenowconnectorprofilecredentials.go
similarity index 93%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_servicenowconnectorprofilecredentials.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_servicenowconnectorprofilecredentials.go
index c666ee2668..f5f9ae14b8 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_servicenowconnectorprofilecredentials.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_servicenowconnectorprofilecredentials.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_ServiceNowConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.ServiceNowConnectorProfileCredentials)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_servicenowconnectorprofileproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_servicenowconnectorprofileproperties.go
similarity index 92%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_servicenowconnectorprofileproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_servicenowconnectorprofileproperties.go
index 6e0ff5439f..f8cd1be1b3 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_servicenowconnectorprofileproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_servicenowconnectorprofileproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_ServiceNowConnectorProfileProperties AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.ServiceNowConnectorProfileProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_singularconnectorprofilecredentials.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_singularconnectorprofilecredentials.go
similarity index 92%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_singularconnectorprofilecredentials.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_singularconnectorprofilecredentials.go
index f66dad5373..52051c9240 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_singularconnectorprofilecredentials.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_singularconnectorprofilecredentials.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_SingularConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.SingularConnectorProfileCredentials)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_slackconnectorprofilecredentials.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_slackconnectorprofilecredentials.go
similarity index 95%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_slackconnectorprofilecredentials.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_slackconnectorprofilecredentials.go
index da980e30f5..6da2aba169 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_slackconnectorprofilecredentials.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_slackconnectorprofilecredentials.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_SlackConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.SlackConnectorProfileCredentials)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_slackconnectorprofileproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_slackconnectorprofileproperties.go
similarity index 92%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_slackconnectorprofileproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_slackconnectorprofileproperties.go
index 7e3111d897..c159ba5443 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_slackconnectorprofileproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_slackconnectorprofileproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_SlackConnectorProfileProperties AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.SlackConnectorProfileProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_snowflakeconnectorprofilecredentials.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_snowflakeconnectorprofilecredentials.go
similarity index 93%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_snowflakeconnectorprofilecredentials.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_snowflakeconnectorprofilecredentials.go
index bad5f26d33..34b1072403 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_snowflakeconnectorprofilecredentials.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_snowflakeconnectorprofilecredentials.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_SnowflakeConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.SnowflakeConnectorProfileCredentials)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_snowflakeconnectorprofileproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_snowflakeconnectorprofileproperties.go
similarity index 96%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_snowflakeconnectorprofileproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_snowflakeconnectorprofileproperties.go
index 5315cc858e..4f154482a1 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_snowflakeconnectorprofileproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_snowflakeconnectorprofileproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_SnowflakeConnectorProfileProperties AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.SnowflakeConnectorProfileProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_trendmicroconnectorprofilecredentials.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_trendmicroconnectorprofilecredentials.go
similarity index 92%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_trendmicroconnectorprofilecredentials.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_trendmicroconnectorprofilecredentials.go
index d21e198d19..91b0877eb0 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_trendmicroconnectorprofilecredentials.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_trendmicroconnectorprofilecredentials.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_TrendmicroConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.TrendmicroConnectorProfileCredentials)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_veevaconnectorprofilecredentials.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_veevaconnectorprofilecredentials.go
similarity index 93%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_veevaconnectorprofilecredentials.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_veevaconnectorprofilecredentials.go
index f5a8dea50d..9ebf122375 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_veevaconnectorprofilecredentials.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_veevaconnectorprofilecredentials.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_VeevaConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.VeevaConnectorProfileCredentials)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_veevaconnectorprofileproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_veevaconnectorprofileproperties.go
similarity index 92%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_veevaconnectorprofileproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_veevaconnectorprofileproperties.go
index ac9d0e0915..cbba29041a 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_veevaconnectorprofileproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_veevaconnectorprofileproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_VeevaConnectorProfileProperties AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.VeevaConnectorProfileProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_zendeskconnectorprofilecredentials.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_zendeskconnectorprofilecredentials.go
similarity index 95%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_zendeskconnectorprofilecredentials.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_zendeskconnectorprofilecredentials.go
index c00d075266..dff9573115 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_zendeskconnectorprofilecredentials.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_zendeskconnectorprofilecredentials.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_ZendeskConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.ZendeskConnectorProfileCredentials)
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_zendeskconnectorprofileproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_zendeskconnectorprofileproperties.go
similarity index 92%
rename from goformation/cloudformation/appflow/aws-appflow-connectorprofile_zendeskconnectorprofileproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_zendeskconnectorprofileproperties.go
index afc1078ab6..78e55fc287 100644
--- a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_zendeskconnectorprofileproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-connectorprofile_zendeskconnectorprofileproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorProfile_ZendeskConnectorProfileProperties AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.ZendeskConnectorProfileProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow.go
similarity index 96%
rename from goformation/cloudformation/appflow/aws-appflow-flow.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow.go
index 2d6d5ed0b4..3e0a276a31 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow AWS CloudFormation Resource (AWS::AppFlow::Flow)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_aggregationconfig.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_aggregationconfig.go
similarity index 91%
rename from goformation/cloudformation/appflow/aws-appflow-flow_aggregationconfig.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_aggregationconfig.go
index 81b9e0c2d9..cf3528326f 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_aggregationconfig.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_aggregationconfig.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_AggregationConfig AWS CloudFormation Resource (AWS::AppFlow::Flow.AggregationConfig)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_amplitudesourceproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_amplitudesourceproperties.go
similarity index 91%
rename from goformation/cloudformation/appflow/aws-appflow-flow_amplitudesourceproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_amplitudesourceproperties.go
index a1ee6973d3..8b175ed1e7 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_amplitudesourceproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_amplitudesourceproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_AmplitudeSourceProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.AmplitudeSourceProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_connectoroperator.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_connectoroperator.go
similarity index 97%
rename from goformation/cloudformation/appflow/aws-appflow-flow_connectoroperator.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_connectoroperator.go
index 56e8405808..448347dac7 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_connectoroperator.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_connectoroperator.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_ConnectorOperator AWS CloudFormation Resource (AWS::AppFlow::Flow.ConnectorOperator)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_datadogsourceproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_datadogsourceproperties.go
similarity index 91%
rename from goformation/cloudformation/appflow/aws-appflow-flow_datadogsourceproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_datadogsourceproperties.go
index 564f12894e..f82e11ce73 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_datadogsourceproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_datadogsourceproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_DatadogSourceProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.DatadogSourceProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_destinationconnectorproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_destinationconnectorproperties.go
similarity index 98%
rename from goformation/cloudformation/appflow/aws-appflow-flow_destinationconnectorproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_destinationconnectorproperties.go
index 3ebd5002e4..c51dd1f625 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_destinationconnectorproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_destinationconnectorproperties.go
@@ -1,7 +1,7 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_DestinationConnectorProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.DestinationConnectorProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_destinationflowconfig.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_destinationflowconfig.go
similarity index 94%
rename from goformation/cloudformation/appflow/aws-appflow-flow_destinationflowconfig.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_destinationflowconfig.go
index 08d6ef5238..3ed40f9fb1 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_destinationflowconfig.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_destinationflowconfig.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_DestinationFlowConfig AWS CloudFormation Resource (AWS::AppFlow::Flow.DestinationFlowConfig)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_dynatracesourceproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_dynatracesourceproperties.go
similarity index 91%
rename from goformation/cloudformation/appflow/aws-appflow-flow_dynatracesourceproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_dynatracesourceproperties.go
index d20c7436dc..87b844abcc 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_dynatracesourceproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_dynatracesourceproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_DynatraceSourceProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.DynatraceSourceProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_errorhandlingconfig.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_errorhandlingconfig.go
similarity index 93%
rename from goformation/cloudformation/appflow/aws-appflow-flow_errorhandlingconfig.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_errorhandlingconfig.go
index ee86ab9a2b..29e9a61c16 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_errorhandlingconfig.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_errorhandlingconfig.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_ErrorHandlingConfig AWS CloudFormation Resource (AWS::AppFlow::Flow.ErrorHandlingConfig)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_eventbridgedestinationproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_eventbridgedestinationproperties.go
similarity index 93%
rename from goformation/cloudformation/appflow/aws-appflow-flow_eventbridgedestinationproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_eventbridgedestinationproperties.go
index 814f8197e9..cacd15ee7a 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_eventbridgedestinationproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_eventbridgedestinationproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_EventBridgeDestinationProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.EventBridgeDestinationProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_googleanalyticssourceproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_googleanalyticssourceproperties.go
similarity index 92%
rename from goformation/cloudformation/appflow/aws-appflow-flow_googleanalyticssourceproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_googleanalyticssourceproperties.go
index 3459dda5d0..1b737700d1 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_googleanalyticssourceproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_googleanalyticssourceproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_GoogleAnalyticsSourceProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.GoogleAnalyticsSourceProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_incrementalpullconfig.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_incrementalpullconfig.go
similarity index 91%
rename from goformation/cloudformation/appflow/aws-appflow-flow_incrementalpullconfig.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_incrementalpullconfig.go
index 8b433355f6..c6a1834500 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_incrementalpullconfig.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_incrementalpullconfig.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_IncrementalPullConfig AWS CloudFormation Resource (AWS::AppFlow::Flow.IncrementalPullConfig)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_infornexussourceproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_infornexussourceproperties.go
similarity index 91%
rename from goformation/cloudformation/appflow/aws-appflow-flow_infornexussourceproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_infornexussourceproperties.go
index da20e31c58..80624c9055 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_infornexussourceproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_infornexussourceproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_InforNexusSourceProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.InforNexusSourceProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_lookoutmetricsdestinationproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_lookoutmetricsdestinationproperties.go
similarity index 92%
rename from goformation/cloudformation/appflow/aws-appflow-flow_lookoutmetricsdestinationproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_lookoutmetricsdestinationproperties.go
index 5282aaeca4..0414937fdd 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_lookoutmetricsdestinationproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_lookoutmetricsdestinationproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_LookoutMetricsDestinationProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.LookoutMetricsDestinationProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_marketosourceproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_marketosourceproperties.go
similarity index 91%
rename from goformation/cloudformation/appflow/aws-appflow-flow_marketosourceproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_marketosourceproperties.go
index 0513706c9f..10b3b74a9b 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_marketosourceproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_marketosourceproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_MarketoSourceProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.MarketoSourceProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_prefixconfig.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_prefixconfig.go
similarity index 92%
rename from goformation/cloudformation/appflow/aws-appflow-flow_prefixconfig.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_prefixconfig.go
index 723320a6a2..26848a2058 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_prefixconfig.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_prefixconfig.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_PrefixConfig AWS CloudFormation Resource (AWS::AppFlow::Flow.PrefixConfig)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_redshiftdestinationproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_redshiftdestinationproperties.go
similarity index 94%
rename from goformation/cloudformation/appflow/aws-appflow-flow_redshiftdestinationproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_redshiftdestinationproperties.go
index 2a1ba5313c..3b52692e31 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_redshiftdestinationproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_redshiftdestinationproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_RedshiftDestinationProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.RedshiftDestinationProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_s3destinationproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_s3destinationproperties.go
similarity index 94%
rename from goformation/cloudformation/appflow/aws-appflow-flow_s3destinationproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_s3destinationproperties.go
index 3895364946..dcccd5dd50 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_s3destinationproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_s3destinationproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_S3DestinationProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.S3DestinationProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_s3inputformatconfig.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_s3inputformatconfig.go
similarity index 91%
rename from goformation/cloudformation/appflow/aws-appflow-flow_s3inputformatconfig.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_s3inputformatconfig.go
index 1bcab13502..f9368eb31c 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_s3inputformatconfig.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_s3inputformatconfig.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_S3InputFormatConfig AWS CloudFormation Resource (AWS::AppFlow::Flow.S3InputFormatConfig)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_s3outputformatconfig.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_s3outputformatconfig.go
similarity index 93%
rename from goformation/cloudformation/appflow/aws-appflow-flow_s3outputformatconfig.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_s3outputformatconfig.go
index 08670e878f..705d3fe1cf 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_s3outputformatconfig.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_s3outputformatconfig.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_S3OutputFormatConfig AWS CloudFormation Resource (AWS::AppFlow::Flow.S3OutputFormatConfig)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_s3sourceproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_s3sourceproperties.go
similarity index 93%
rename from goformation/cloudformation/appflow/aws-appflow-flow_s3sourceproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_s3sourceproperties.go
index d46896c691..29524ca9ae 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_s3sourceproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_s3sourceproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_S3SourceProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.S3SourceProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_salesforcedestinationproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_salesforcedestinationproperties.go
similarity index 94%
rename from goformation/cloudformation/appflow/aws-appflow-flow_salesforcedestinationproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_salesforcedestinationproperties.go
index dc5ccd2a8a..a7a34b8435 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_salesforcedestinationproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_salesforcedestinationproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_SalesforceDestinationProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.SalesforceDestinationProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_salesforcesourceproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_salesforcesourceproperties.go
similarity index 94%
rename from goformation/cloudformation/appflow/aws-appflow-flow_salesforcesourceproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_salesforcesourceproperties.go
index fe83faa3cf..6175fcc74f 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_salesforcesourceproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_salesforcesourceproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_SalesforceSourceProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.SalesforceSourceProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_sapodatasourceproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_sapodatasourceproperties.go
similarity index 91%
rename from goformation/cloudformation/appflow/aws-appflow-flow_sapodatasourceproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_sapodatasourceproperties.go
index 246bd0f4a8..f3a62b2fa8 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_sapodatasourceproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_sapodatasourceproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_SAPODataSourceProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.SAPODataSourceProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_scheduledtriggerproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_scheduledtriggerproperties.go
similarity index 95%
rename from goformation/cloudformation/appflow/aws-appflow-flow_scheduledtriggerproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_scheduledtriggerproperties.go
index b7bc71c1c1..a5bb28c518 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_scheduledtriggerproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_scheduledtriggerproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_ScheduledTriggerProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.ScheduledTriggerProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_servicenowsourceproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_servicenowsourceproperties.go
similarity index 91%
rename from goformation/cloudformation/appflow/aws-appflow-flow_servicenowsourceproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_servicenowsourceproperties.go
index fda474fae8..d43107bc1d 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_servicenowsourceproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_servicenowsourceproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_ServiceNowSourceProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.ServiceNowSourceProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_singularsourceproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_singularsourceproperties.go
similarity index 91%
rename from goformation/cloudformation/appflow/aws-appflow-flow_singularsourceproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_singularsourceproperties.go
index afbb2c4d8f..8851e9c618 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_singularsourceproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_singularsourceproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_SingularSourceProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.SingularSourceProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_slacksourceproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_slacksourceproperties.go
similarity index 91%
rename from goformation/cloudformation/appflow/aws-appflow-flow_slacksourceproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_slacksourceproperties.go
index 8f862eb602..c82441e329 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_slacksourceproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_slacksourceproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_SlackSourceProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.SlackSourceProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_snowflakedestinationproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_snowflakedestinationproperties.go
similarity index 94%
rename from goformation/cloudformation/appflow/aws-appflow-flow_snowflakedestinationproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_snowflakedestinationproperties.go
index 020df9f4fe..78b852c3ee 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_snowflakedestinationproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_snowflakedestinationproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_SnowflakeDestinationProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.SnowflakeDestinationProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_sourceconnectorproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_sourceconnectorproperties.go
similarity index 98%
rename from goformation/cloudformation/appflow/aws-appflow-flow_sourceconnectorproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_sourceconnectorproperties.go
index 13d2e8e5ab..7b1434be03 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_sourceconnectorproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_sourceconnectorproperties.go
@@ -1,7 +1,7 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_SourceConnectorProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.SourceConnectorProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_sourceflowconfig.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_sourceflowconfig.go
similarity index 94%
rename from goformation/cloudformation/appflow/aws-appflow-flow_sourceflowconfig.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_sourceflowconfig.go
index a279cb8ca2..bbd59bc758 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_sourceflowconfig.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_sourceflowconfig.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_SourceFlowConfig AWS CloudFormation Resource (AWS::AppFlow::Flow.SourceFlowConfig)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_task.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_task.go
similarity index 94%
rename from goformation/cloudformation/appflow/aws-appflow-flow_task.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_task.go
index 4b1547c1e3..6c3fb8aa7a 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_task.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_task.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_Task AWS CloudFormation Resource (AWS::AppFlow::Flow.Task)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_taskpropertiesobject.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_taskpropertiesobject.go
similarity index 92%
rename from goformation/cloudformation/appflow/aws-appflow-flow_taskpropertiesobject.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_taskpropertiesobject.go
index 9b5b24ce20..df7f01fd09 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_taskpropertiesobject.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_taskpropertiesobject.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_TaskPropertiesObject AWS CloudFormation Resource (AWS::AppFlow::Flow.TaskPropertiesObject)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_trendmicrosourceproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_trendmicrosourceproperties.go
similarity index 91%
rename from goformation/cloudformation/appflow/aws-appflow-flow_trendmicrosourceproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_trendmicrosourceproperties.go
index d98ce17bd4..95dbc8dd34 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_trendmicrosourceproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_trendmicrosourceproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_TrendmicroSourceProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.TrendmicroSourceProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_triggerconfig.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_triggerconfig.go
similarity index 92%
rename from goformation/cloudformation/appflow/aws-appflow-flow_triggerconfig.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_triggerconfig.go
index 4be86de416..773d7cceff 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_triggerconfig.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_triggerconfig.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_TriggerConfig AWS CloudFormation Resource (AWS::AppFlow::Flow.TriggerConfig)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_upsolverdestinationproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_upsolverdestinationproperties.go
similarity index 94%
rename from goformation/cloudformation/appflow/aws-appflow-flow_upsolverdestinationproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_upsolverdestinationproperties.go
index b57055f269..292f6cf855 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_upsolverdestinationproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_upsolverdestinationproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_UpsolverDestinationProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.UpsolverDestinationProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_upsolvers3outputformatconfig.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_upsolvers3outputformatconfig.go
similarity index 94%
rename from goformation/cloudformation/appflow/aws-appflow-flow_upsolvers3outputformatconfig.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_upsolvers3outputformatconfig.go
index 9a272d9f41..45fc98e8cd 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_upsolvers3outputformatconfig.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_upsolvers3outputformatconfig.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_UpsolverS3OutputFormatConfig AWS CloudFormation Resource (AWS::AppFlow::Flow.UpsolverS3OutputFormatConfig)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_veevasourceproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_veevasourceproperties.go
similarity index 95%
rename from goformation/cloudformation/appflow/aws-appflow-flow_veevasourceproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_veevasourceproperties.go
index 4a252ae942..597c9fb1f5 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_veevasourceproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_veevasourceproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_VeevaSourceProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.VeevaSourceProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_zendeskdestinationproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_zendeskdestinationproperties.go
similarity index 94%
rename from goformation/cloudformation/appflow/aws-appflow-flow_zendeskdestinationproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_zendeskdestinationproperties.go
index 6947a3dcc3..315d3e1ab3 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_zendeskdestinationproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_zendeskdestinationproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_ZendeskDestinationProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.ZendeskDestinationProperties)
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_zendesksourceproperties.go b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_zendesksourceproperties.go
similarity index 91%
rename from goformation/cloudformation/appflow/aws-appflow-flow_zendesksourceproperties.go
rename to pkg/goformation/cloudformation/appflow/aws-appflow-flow_zendesksourceproperties.go
index 905bc82bdc..7a432e03e0 100644
--- a/goformation/cloudformation/appflow/aws-appflow-flow_zendesksourceproperties.go
+++ b/pkg/goformation/cloudformation/appflow/aws-appflow-flow_zendesksourceproperties.go
@@ -1,9 +1,9 @@
 package appflow
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_ZendeskSourceProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.ZendeskSourceProperties)
diff --git a/goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration.go b/pkg/goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration.go
similarity index 95%
rename from goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration.go
rename to pkg/goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration.go
index 108d70131c..931367438e 100644
--- a/goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration.go
+++ b/pkg/goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EventIntegration AWS CloudFormation Resource (AWS::AppIntegrations::EventIntegration)
diff --git a/goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration_eventfilter.go b/pkg/goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration_eventfilter.go
similarity index 92%
rename from goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration_eventfilter.go
rename to pkg/goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration_eventfilter.go
index 6f67597ba4..098d6d02bd 100644
--- a/goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration_eventfilter.go
+++ b/pkg/goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration_eventfilter.go
@@ -1,9 +1,9 @@
 package appintegrations
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EventIntegration_EventFilter AWS CloudFormation Resource (AWS::AppIntegrations::EventIntegration.EventFilter)
diff --git a/goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration_eventintegrationassociation.go b/pkg/goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration_eventintegrationassociation.go
similarity index 96%
rename from goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration_eventintegrationassociation.go
rename to pkg/goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration_eventintegrationassociation.go
index cd8f84cf24..824f52607a 100644
--- a/goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration_eventintegrationassociation.go
+++ b/pkg/goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration_eventintegrationassociation.go
@@ -1,9 +1,9 @@
 package appintegrations
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EventIntegration_EventIntegrationAssociation AWS CloudFormation Resource (AWS::AppIntegrations::EventIntegration.EventIntegrationAssociation)
diff --git a/goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration_metadata.go b/pkg/goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration_metadata.go
similarity index 93%
rename from goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration_metadata.go
rename to pkg/goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration_metadata.go
index 809503dd54..35cd48304f 100644
--- a/goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration_metadata.go
+++ b/pkg/goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration_metadata.go
@@ -1,9 +1,9 @@
 package appintegrations
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EventIntegration_Metadata AWS CloudFormation Resource (AWS::AppIntegrations::EventIntegration.Metadata)
diff --git a/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget.go b/pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget.go
similarity index 97%
rename from goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget.go
rename to pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget.go
index e4ff3cea09..f0b4028b60 100644
--- a/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget.go
+++ b/pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScalableTarget AWS CloudFormation Resource (AWS::ApplicationAutoScaling::ScalableTarget)
diff --git a/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_scalabletargetaction.go b/pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_scalabletargetaction.go
similarity index 93%
rename from goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_scalabletargetaction.go
rename to pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_scalabletargetaction.go
index d4ba5dbc3d..b95956ff56 100644
--- a/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_scalabletargetaction.go
+++ b/pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_scalabletargetaction.go
@@ -1,9 +1,9 @@
 package applicationautoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScalableTarget_ScalableTargetAction AWS CloudFormation Resource (AWS::ApplicationAutoScaling::ScalableTarget.ScalableTargetAction)
diff --git a/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_scheduledaction.go b/pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_scheduledaction.go
similarity index 96%
rename from goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_scheduledaction.go
rename to pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_scheduledaction.go
index bdaf0341ec..601e82e30a 100644
--- a/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_scheduledaction.go
+++ b/pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_scheduledaction.go
@@ -1,9 +1,9 @@
 package applicationautoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScalableTarget_ScheduledAction AWS CloudFormation Resource (AWS::ApplicationAutoScaling::ScalableTarget.ScheduledAction)
diff --git a/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_suspendedstate.go b/pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_suspendedstate.go
similarity index 94%
rename from goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_suspendedstate.go
rename to pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_suspendedstate.go
index ea4dcb9f96..3021d96719 100644
--- a/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_suspendedstate.go
+++ b/pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_suspendedstate.go
@@ -1,9 +1,9 @@
 package applicationautoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScalableTarget_SuspendedState AWS CloudFormation Resource (AWS::ApplicationAutoScaling::ScalableTarget.SuspendedState)
diff --git a/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy.go b/pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy.go
similarity index 97%
rename from goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy.go
rename to pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy.go
index 79451cd297..adb4514a6b 100644
--- a/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy.go
+++ b/pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScalingPolicy AWS CloudFormation Resource (AWS::ApplicationAutoScaling::ScalingPolicy)
diff --git a/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_customizedmetricspecification.go b/pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_customizedmetricspecification.go
similarity index 95%
rename from goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_customizedmetricspecification.go
rename to pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_customizedmetricspecification.go
index b17532cb04..481b4cf69a 100644
--- a/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_customizedmetricspecification.go
+++ b/pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_customizedmetricspecification.go
@@ -1,9 +1,9 @@
 package applicationautoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScalingPolicy_CustomizedMetricSpecification AWS CloudFormation Resource (AWS::ApplicationAutoScaling::ScalingPolicy.CustomizedMetricSpecification)
diff --git a/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_metricdimension.go b/pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_metricdimension.go
similarity index 93%
rename from goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_metricdimension.go
rename to pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_metricdimension.go
index 1af0af0cb1..3fd8c60400 100644
--- a/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_metricdimension.go
+++ b/pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_metricdimension.go
@@ -1,9 +1,9 @@
 package applicationautoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScalingPolicy_MetricDimension AWS CloudFormation Resource (AWS::ApplicationAutoScaling::ScalingPolicy.MetricDimension)
diff --git a/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_predefinedmetricspecification.go b/pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_predefinedmetricspecification.go
similarity index 94%
rename from goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_predefinedmetricspecification.go
rename to pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_predefinedmetricspecification.go
index a6f4bdd632..60276a99d8 100644
--- a/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_predefinedmetricspecification.go
+++ b/pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_predefinedmetricspecification.go
@@ -1,9 +1,9 @@
 package applicationautoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScalingPolicy_PredefinedMetricSpecification AWS CloudFormation Resource (AWS::ApplicationAutoScaling::ScalingPolicy.PredefinedMetricSpecification)
diff --git a/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_stepadjustment.go b/pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_stepadjustment.go
similarity index 95%
rename from goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_stepadjustment.go
rename to pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_stepadjustment.go
index b101c65295..1d9277ca61 100644
--- a/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_stepadjustment.go
+++ b/pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_stepadjustment.go
@@ -1,9 +1,9 @@
 package applicationautoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScalingPolicy_StepAdjustment AWS CloudFormation Resource (AWS::ApplicationAutoScaling::ScalingPolicy.StepAdjustment)
diff --git a/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_stepscalingpolicyconfiguration.go b/pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_stepscalingpolicyconfiguration.go
similarity index 96%
rename from goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_stepscalingpolicyconfiguration.go
rename to pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_stepscalingpolicyconfiguration.go
index 18a407e428..10fc0d50d9 100644
--- a/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_stepscalingpolicyconfiguration.go
+++ b/pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_stepscalingpolicyconfiguration.go
@@ -1,9 +1,9 @@
 package applicationautoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScalingPolicy_StepScalingPolicyConfiguration AWS CloudFormation Resource (AWS::ApplicationAutoScaling::ScalingPolicy.StepScalingPolicyConfiguration)
diff --git a/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_targettrackingscalingpolicyconfiguration.go b/pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_targettrackingscalingpolicyconfiguration.go
similarity index 96%
rename from goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_targettrackingscalingpolicyconfiguration.go
rename to pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_targettrackingscalingpolicyconfiguration.go
index bd4fbcf8f0..cdc3ba1e38 100644
--- a/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_targettrackingscalingpolicyconfiguration.go
+++ b/pkg/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_targettrackingscalingpolicyconfiguration.go
@@ -1,9 +1,9 @@
 package applicationautoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScalingPolicy_TargetTrackingScalingPolicyConfiguration AWS CloudFormation Resource (AWS::ApplicationAutoScaling::ScalingPolicy.TargetTrackingScalingPolicyConfiguration)
diff --git a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application.go b/pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application.go
similarity index 96%
rename from goformation/cloudformation/applicationinsights/aws-applicationinsights-application.go
rename to pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application.go
index b4c2483725..e3bcc79386 100644
--- a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application.go
+++ b/pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application AWS CloudFormation Resource (AWS::ApplicationInsights::Application)
diff --git a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_alarm.go b/pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_alarm.go
similarity index 92%
rename from goformation/cloudformation/applicationinsights/aws-applicationinsights-application_alarm.go
rename to pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_alarm.go
index bc85957049..9c902bb8ed 100644
--- a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_alarm.go
+++ b/pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_alarm.go
@@ -1,9 +1,9 @@
 package applicationinsights
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_Alarm AWS CloudFormation Resource (AWS::ApplicationInsights::Application.Alarm)
diff --git a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_alarmmetric.go b/pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_alarmmetric.go
similarity index 92%
rename from goformation/cloudformation/applicationinsights/aws-applicationinsights-application_alarmmetric.go
rename to pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_alarmmetric.go
index f8e123316b..06c9737a93 100644
--- a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_alarmmetric.go
+++ b/pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_alarmmetric.go
@@ -1,9 +1,9 @@
 package applicationinsights
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_AlarmMetric AWS CloudFormation Resource (AWS::ApplicationInsights::Application.AlarmMetric)
diff --git a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_componentconfiguration.go b/pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_componentconfiguration.go
similarity index 96%
rename from goformation/cloudformation/applicationinsights/aws-applicationinsights-application_componentconfiguration.go
rename to pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_componentconfiguration.go
index 1087c89741..a70ee45f6d 100644
--- a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_componentconfiguration.go
+++ b/pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_componentconfiguration.go
@@ -1,7 +1,7 @@
 package applicationinsights
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_ComponentConfiguration AWS CloudFormation Resource (AWS::ApplicationInsights::Application.ComponentConfiguration)
diff --git a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_componentmonitoringsetting.go b/pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_componentmonitoringsetting.go
similarity index 96%
rename from goformation/cloudformation/applicationinsights/aws-applicationinsights-application_componentmonitoringsetting.go
rename to pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_componentmonitoringsetting.go
index 7bd0f9c548..d2adf4d0a5 100644
--- a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_componentmonitoringsetting.go
+++ b/pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_componentmonitoringsetting.go
@@ -1,9 +1,9 @@
 package applicationinsights
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_ComponentMonitoringSetting AWS CloudFormation Resource (AWS::ApplicationInsights::Application.ComponentMonitoringSetting)
diff --git a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_configurationdetails.go b/pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_configurationdetails.go
similarity index 97%
rename from goformation/cloudformation/applicationinsights/aws-applicationinsights-application_configurationdetails.go
rename to pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_configurationdetails.go
index 7571dc7935..09cd2f57a3 100644
--- a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_configurationdetails.go
+++ b/pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_configurationdetails.go
@@ -1,7 +1,7 @@
 package applicationinsights
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_ConfigurationDetails AWS CloudFormation Resource (AWS::ApplicationInsights::Application.ConfigurationDetails)
diff --git a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_customcomponent.go b/pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_customcomponent.go
similarity index 93%
rename from goformation/cloudformation/applicationinsights/aws-applicationinsights-application_customcomponent.go
rename to pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_customcomponent.go
index 2d1d68b057..669ddee7c5 100644
--- a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_customcomponent.go
+++ b/pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_customcomponent.go
@@ -1,9 +1,9 @@
 package applicationinsights
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_CustomComponent AWS CloudFormation Resource (AWS::ApplicationInsights::Application.CustomComponent)
diff --git a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_jmxprometheusexporter.go b/pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_jmxprometheusexporter.go
similarity index 94%
rename from goformation/cloudformation/applicationinsights/aws-applicationinsights-application_jmxprometheusexporter.go
rename to pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_jmxprometheusexporter.go
index e2b873d73a..19a590ef21 100644
--- a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_jmxprometheusexporter.go
+++ b/pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_jmxprometheusexporter.go
@@ -1,9 +1,9 @@
 package applicationinsights
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_JMXPrometheusExporter AWS CloudFormation Resource (AWS::ApplicationInsights::Application.JMXPrometheusExporter)
diff --git a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_log.go b/pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_log.go
similarity index 95%
rename from goformation/cloudformation/applicationinsights/aws-applicationinsights-application_log.go
rename to pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_log.go
index f4d14c2ab7..77d9b72dd7 100644
--- a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_log.go
+++ b/pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_log.go
@@ -1,9 +1,9 @@
 package applicationinsights
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_Log AWS CloudFormation Resource (AWS::ApplicationInsights::Application.Log)
diff --git a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_logpattern.go b/pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_logpattern.go
similarity index 93%
rename from goformation/cloudformation/applicationinsights/aws-applicationinsights-application_logpattern.go
rename to pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_logpattern.go
index 3d8092be4a..4c398e38cf 100644
--- a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_logpattern.go
+++ b/pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_logpattern.go
@@ -1,9 +1,9 @@
 package applicationinsights
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_LogPattern AWS CloudFormation Resource (AWS::ApplicationInsights::Application.LogPattern)
diff --git a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_logpatternset.go b/pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_logpatternset.go
similarity index 93%
rename from goformation/cloudformation/applicationinsights/aws-applicationinsights-application_logpatternset.go
rename to pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_logpatternset.go
index 0dd60a8c17..f058016494 100644
--- a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_logpatternset.go
+++ b/pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_logpatternset.go
@@ -1,9 +1,9 @@
 package applicationinsights
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_LogPatternSet AWS CloudFormation Resource (AWS::ApplicationInsights::Application.LogPatternSet)
diff --git a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_subcomponentconfigurationdetails.go b/pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_subcomponentconfigurationdetails.go
similarity index 97%
rename from goformation/cloudformation/applicationinsights/aws-applicationinsights-application_subcomponentconfigurationdetails.go
rename to pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_subcomponentconfigurationdetails.go
index 6b928ff26f..36403e4364 100644
--- a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_subcomponentconfigurationdetails.go
+++ b/pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_subcomponentconfigurationdetails.go
@@ -1,7 +1,7 @@
 package applicationinsights
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_SubComponentConfigurationDetails AWS CloudFormation Resource (AWS::ApplicationInsights::Application.SubComponentConfigurationDetails)
diff --git a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_subcomponenttypeconfiguration.go b/pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_subcomponenttypeconfiguration.go
similarity index 94%
rename from goformation/cloudformation/applicationinsights/aws-applicationinsights-application_subcomponenttypeconfiguration.go
rename to pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_subcomponenttypeconfiguration.go
index 3354197342..9ffcf6abfa 100644
--- a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_subcomponenttypeconfiguration.go
+++ b/pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_subcomponenttypeconfiguration.go
@@ -1,9 +1,9 @@
 package applicationinsights
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_SubComponentTypeConfiguration AWS CloudFormation Resource (AWS::ApplicationInsights::Application.SubComponentTypeConfiguration)
diff --git a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_windowsevent.go b/pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_windowsevent.go
similarity index 94%
rename from goformation/cloudformation/applicationinsights/aws-applicationinsights-application_windowsevent.go
rename to pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_windowsevent.go
index 04f3873b53..54ccbae19e 100644
--- a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_windowsevent.go
+++ b/pkg/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_windowsevent.go
@@ -1,9 +1,9 @@
 package applicationinsights
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_WindowsEvent AWS CloudFormation Resource (AWS::ApplicationInsights::Application.WindowsEvent)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute.go
similarity index 96%
rename from goformation/cloudformation/appmesh/aws-appmesh-gatewayroute.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute.go
index 70eea62e13..27b61e784a 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GatewayRoute AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutehostnamematch.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutehostnamematch.go
similarity index 93%
rename from goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutehostnamematch.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutehostnamematch.go
index 4f9ea82c55..758b768231 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutehostnamematch.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutehostnamematch.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GatewayRoute_GatewayRouteHostnameMatch AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.GatewayRouteHostnameMatch)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutehostnamerewrite.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutehostnamerewrite.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutehostnamerewrite.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutehostnamerewrite.go
index e40d8344e0..57e9bbf986 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutehostnamerewrite.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutehostnamerewrite.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GatewayRoute_GatewayRouteHostnameRewrite AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.GatewayRouteHostnameRewrite)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutemetadatamatch.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutemetadatamatch.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutemetadatamatch.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutemetadatamatch.go
index 1a83294b0b..803baafbe2 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutemetadatamatch.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutemetadatamatch.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GatewayRoute_GatewayRouteMetadataMatch AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.GatewayRouteMetadataMatch)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayrouterangematch.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayrouterangematch.go
similarity index 93%
rename from goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayrouterangematch.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayrouterangematch.go
index 3ce54a3793..463a8ff7ee 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayrouterangematch.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayrouterangematch.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GatewayRoute_GatewayRouteRangeMatch AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.GatewayRouteRangeMatch)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutespec.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutespec.go
similarity index 94%
rename from goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutespec.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutespec.go
index 184e11cf8f..14ecac6d6a 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutespec.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutespec.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GatewayRoute_GatewayRouteSpec AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.GatewayRouteSpec)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutetarget.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutetarget.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutetarget.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutetarget.go
index 441d8be295..3e5d982e1b 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutetarget.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutetarget.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GatewayRoute_GatewayRouteTarget AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.GatewayRouteTarget)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutevirtualservice.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutevirtualservice.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutevirtualservice.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutevirtualservice.go
index 0a33198b84..372eca4c3b 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutevirtualservice.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutevirtualservice.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GatewayRoute_GatewayRouteVirtualService AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.GatewayRouteVirtualService)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroute.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroute.go
similarity index 96%
rename from goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroute.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroute.go
index bea47bef9a..744d4a6ccb 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroute.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroute.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GatewayRoute_GrpcGatewayRoute AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.GrpcGatewayRoute)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayrouteaction.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayrouteaction.go
similarity index 96%
rename from goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayrouteaction.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayrouteaction.go
index 85a5484417..c87518fcff 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayrouteaction.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayrouteaction.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GatewayRoute_GrpcGatewayRouteAction AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.GrpcGatewayRouteAction)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroutematch.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroutematch.go
similarity index 94%
rename from goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroutematch.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroutematch.go
index 6b71f25d47..f024e8b508 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroutematch.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroutematch.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GatewayRoute_GrpcGatewayRouteMatch AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.GrpcGatewayRouteMatch)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroutemetadata.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroutemetadata.go
similarity index 94%
rename from goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroutemetadata.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroutemetadata.go
index 234ecbde2a..17d2a22e6a 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroutemetadata.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroutemetadata.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GatewayRoute_GrpcGatewayRouteMetadata AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.GrpcGatewayRouteMetadata)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayrouterewrite.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayrouterewrite.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayrouterewrite.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayrouterewrite.go
index 16c94a649f..adf1c2395a 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayrouterewrite.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayrouterewrite.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GatewayRoute_GrpcGatewayRouteRewrite AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.GrpcGatewayRouteRewrite)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroute.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroute.go
similarity index 96%
rename from goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroute.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroute.go
index 3f8866fe92..f06f2ae805 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroute.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroute.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GatewayRoute_HttpGatewayRoute AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.HttpGatewayRoute)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteaction.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteaction.go
similarity index 96%
rename from goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteaction.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteaction.go
index 15cf2f5bab..8f9d5aaec1 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteaction.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteaction.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GatewayRoute_HttpGatewayRouteAction AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.HttpGatewayRouteAction)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteheader.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteheader.go
similarity index 94%
rename from goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteheader.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteheader.go
index b14d46e69e..dba4d745b7 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteheader.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteheader.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GatewayRoute_HttpGatewayRouteHeader AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.HttpGatewayRouteHeader)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteheadermatch.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteheadermatch.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteheadermatch.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteheadermatch.go
index 058ed64922..b227f894ec 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteheadermatch.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteheadermatch.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GatewayRoute_HttpGatewayRouteHeaderMatch AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.HttpGatewayRouteHeaderMatch)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroutematch.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroutematch.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroutematch.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroutematch.go
index d254cd71e1..15e5a4c3dc 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroutematch.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroutematch.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GatewayRoute_HttpGatewayRouteMatch AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.HttpGatewayRouteMatch)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroutepathrewrite.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroutepathrewrite.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroutepathrewrite.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroutepathrewrite.go
index f98081d3f4..d4138a7804 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroutepathrewrite.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroutepathrewrite.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GatewayRoute_HttpGatewayRoutePathRewrite AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.HttpGatewayRoutePathRewrite)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteprefixrewrite.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteprefixrewrite.go
similarity index 93%
rename from goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteprefixrewrite.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteprefixrewrite.go
index 262bd06ad9..9cf375fadf 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteprefixrewrite.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteprefixrewrite.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GatewayRoute_HttpGatewayRoutePrefixRewrite AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.HttpGatewayRoutePrefixRewrite)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouterewrite.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouterewrite.go
similarity index 96%
rename from goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouterewrite.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouterewrite.go
index dbd8b3637f..acaaa8fbc4 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouterewrite.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouterewrite.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GatewayRoute_HttpGatewayRouteRewrite AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.HttpGatewayRouteRewrite)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httppathmatch.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httppathmatch.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httppathmatch.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httppathmatch.go
index c1fcea25cd..44285b9873 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httppathmatch.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httppathmatch.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GatewayRoute_HttpPathMatch AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.HttpPathMatch)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpqueryparametermatch.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpqueryparametermatch.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpqueryparametermatch.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpqueryparametermatch.go
index 2dabd630d1..330ab62625 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpqueryparametermatch.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpqueryparametermatch.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GatewayRoute_HttpQueryParameterMatch AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.HttpQueryParameterMatch)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_queryparameter.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_queryparameter.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_queryparameter.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_queryparameter.go
index a1fb92d030..cec25c801c 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_queryparameter.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_queryparameter.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GatewayRoute_QueryParameter AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.QueryParameter)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-mesh.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-mesh.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-mesh.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-mesh.go
index 4b4d256ae8..4a05ddd1ce 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-mesh.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-mesh.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Mesh AWS CloudFormation Resource (AWS::AppMesh::Mesh)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-mesh_egressfilter.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-mesh_egressfilter.go
similarity index 91%
rename from goformation/cloudformation/appmesh/aws-appmesh-mesh_egressfilter.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-mesh_egressfilter.go
index 5ce56fd317..237721b98b 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-mesh_egressfilter.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-mesh_egressfilter.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Mesh_EgressFilter AWS CloudFormation Resource (AWS::AppMesh::Mesh.EgressFilter)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-mesh_meshspec.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-mesh_meshspec.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-mesh_meshspec.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-mesh_meshspec.go
index 477832b03c..b7bfb917e4 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-mesh_meshspec.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-mesh_meshspec.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Mesh_MeshSpec AWS CloudFormation Resource (AWS::AppMesh::Mesh.MeshSpec)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-route.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-route.go
index b6f56fd4b3..0982da59c2 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-route.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Route AWS CloudFormation Resource (AWS::AppMesh::Route)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_duration.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_duration.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-route_duration.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-route_duration.go
index 09d3d674aa..bc383a1986 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-route_duration.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_duration.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Route_Duration AWS CloudFormation Resource (AWS::AppMesh::Route.Duration)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_grpcretrypolicy.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_grpcretrypolicy.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-route_grpcretrypolicy.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-route_grpcretrypolicy.go
index 0d4cc46d28..5eca012caa 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-route_grpcretrypolicy.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_grpcretrypolicy.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Route_GrpcRetryPolicy AWS CloudFormation Resource (AWS::AppMesh::Route.GrpcRetryPolicy)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_grpcroute.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_grpcroute.go
similarity index 96%
rename from goformation/cloudformation/appmesh/aws-appmesh-route_grpcroute.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-route_grpcroute.go
index a57b0454e3..4509953fd8 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-route_grpcroute.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_grpcroute.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Route_GrpcRoute AWS CloudFormation Resource (AWS::AppMesh::Route.GrpcRoute)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_grpcrouteaction.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_grpcrouteaction.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-route_grpcrouteaction.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-route_grpcrouteaction.go
index 75e8310e8f..9866bd0650 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-route_grpcrouteaction.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_grpcrouteaction.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Route_GrpcRouteAction AWS CloudFormation Resource (AWS::AppMesh::Route.GrpcRouteAction)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_grpcroutematch.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_grpcroutematch.go
similarity index 93%
rename from goformation/cloudformation/appmesh/aws-appmesh-route_grpcroutematch.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-route_grpcroutematch.go
index 35f3102c3c..3320d9913e 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-route_grpcroutematch.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_grpcroutematch.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Route_GrpcRouteMatch AWS CloudFormation Resource (AWS::AppMesh::Route.GrpcRouteMatch)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_grpcroutemetadata.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_grpcroutemetadata.go
similarity index 93%
rename from goformation/cloudformation/appmesh/aws-appmesh-route_grpcroutemetadata.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-route_grpcroutemetadata.go
index b30b9ccc9d..679c689541 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-route_grpcroutemetadata.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_grpcroutemetadata.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Route_GrpcRouteMetadata AWS CloudFormation Resource (AWS::AppMesh::Route.GrpcRouteMetadata)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_grpcroutemetadatamatchmethod.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_grpcroutemetadatamatchmethod.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-route_grpcroutemetadatamatchmethod.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-route_grpcroutemetadatamatchmethod.go
index a57cf0c98c..ae4239c5a0 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-route_grpcroutemetadatamatchmethod.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_grpcroutemetadatamatchmethod.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Route_GrpcRouteMetadataMatchMethod AWS CloudFormation Resource (AWS::AppMesh::Route.GrpcRouteMetadataMatchMethod)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_grpctimeout.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_grpctimeout.go
similarity index 96%
rename from goformation/cloudformation/appmesh/aws-appmesh-route_grpctimeout.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-route_grpctimeout.go
index 76ee9bc201..166e71a27b 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-route_grpctimeout.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_grpctimeout.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Route_GrpcTimeout AWS CloudFormation Resource (AWS::AppMesh::Route.GrpcTimeout)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_headermatchmethod.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_headermatchmethod.go
similarity index 94%
rename from goformation/cloudformation/appmesh/aws-appmesh-route_headermatchmethod.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-route_headermatchmethod.go
index 66f24f500a..f31286a370 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-route_headermatchmethod.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_headermatchmethod.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Route_HeaderMatchMethod AWS CloudFormation Resource (AWS::AppMesh::Route.HeaderMatchMethod)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_httppathmatch.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_httppathmatch.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-route_httppathmatch.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-route_httppathmatch.go
index 1a0cb9fe3a..793c13763a 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-route_httppathmatch.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_httppathmatch.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Route_HttpPathMatch AWS CloudFormation Resource (AWS::AppMesh::Route.HttpPathMatch)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_httpqueryparametermatch.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_httpqueryparametermatch.go
similarity index 91%
rename from goformation/cloudformation/appmesh/aws-appmesh-route_httpqueryparametermatch.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-route_httpqueryparametermatch.go
index a74b0d5d74..b7f8d855f2 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-route_httpqueryparametermatch.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_httpqueryparametermatch.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Route_HttpQueryParameterMatch AWS CloudFormation Resource (AWS::AppMesh::Route.HttpQueryParameterMatch)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_httpretrypolicy.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_httpretrypolicy.go
similarity index 94%
rename from goformation/cloudformation/appmesh/aws-appmesh-route_httpretrypolicy.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-route_httpretrypolicy.go
index b44661ff87..81933cab1b 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-route_httpretrypolicy.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_httpretrypolicy.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Route_HttpRetryPolicy AWS CloudFormation Resource (AWS::AppMesh::Route.HttpRetryPolicy)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_httproute.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_httproute.go
similarity index 96%
rename from goformation/cloudformation/appmesh/aws-appmesh-route_httproute.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-route_httproute.go
index 35b3624420..52bd2a69ff 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-route_httproute.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_httproute.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Route_HttpRoute AWS CloudFormation Resource (AWS::AppMesh::Route.HttpRoute)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_httprouteaction.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_httprouteaction.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-route_httprouteaction.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-route_httprouteaction.go
index 03e8fda68b..ed17a78e77 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-route_httprouteaction.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_httprouteaction.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Route_HttpRouteAction AWS CloudFormation Resource (AWS::AppMesh::Route.HttpRouteAction)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_httprouteheader.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_httprouteheader.go
similarity index 93%
rename from goformation/cloudformation/appmesh/aws-appmesh-route_httprouteheader.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-route_httprouteheader.go
index 3b5f8dc7b6..1688d7d3b4 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-route_httprouteheader.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_httprouteheader.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Route_HttpRouteHeader AWS CloudFormation Resource (AWS::AppMesh::Route.HttpRouteHeader)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_httproutematch.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_httproutematch.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-route_httproutematch.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-route_httproutematch.go
index b3c3c04394..82f395b652 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-route_httproutematch.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_httproutematch.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Route_HttpRouteMatch AWS CloudFormation Resource (AWS::AppMesh::Route.HttpRouteMatch)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_httptimeout.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_httptimeout.go
similarity index 96%
rename from goformation/cloudformation/appmesh/aws-appmesh-route_httptimeout.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-route_httptimeout.go
index 2b11aa87bf..beb49fee75 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-route_httptimeout.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_httptimeout.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Route_HttpTimeout AWS CloudFormation Resource (AWS::AppMesh::Route.HttpTimeout)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_matchrange.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_matchrange.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-route_matchrange.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-route_matchrange.go
index 8a69029cd3..63ef3f0fbc 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-route_matchrange.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_matchrange.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Route_MatchRange AWS CloudFormation Resource (AWS::AppMesh::Route.MatchRange)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_queryparameter.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_queryparameter.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-route_queryparameter.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-route_queryparameter.go
index 4481b25084..3f94abc45b 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-route_queryparameter.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_queryparameter.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Route_QueryParameter AWS CloudFormation Resource (AWS::AppMesh::Route.QueryParameter)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_routespec.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_routespec.go
similarity index 94%
rename from goformation/cloudformation/appmesh/aws-appmesh-route_routespec.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-route_routespec.go
index 4b6e3f2407..5bbb9f533d 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-route_routespec.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_routespec.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Route_RouteSpec AWS CloudFormation Resource (AWS::AppMesh::Route.RouteSpec)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_tcproute.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_tcproute.go
similarity index 96%
rename from goformation/cloudformation/appmesh/aws-appmesh-route_tcproute.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-route_tcproute.go
index 048b32b76c..710fe77f18 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-route_tcproute.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_tcproute.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Route_TcpRoute AWS CloudFormation Resource (AWS::AppMesh::Route.TcpRoute)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_tcprouteaction.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_tcprouteaction.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-route_tcprouteaction.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-route_tcprouteaction.go
index 5d4e8a73c4..3581b16fcf 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-route_tcprouteaction.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_tcprouteaction.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Route_TcpRouteAction AWS CloudFormation Resource (AWS::AppMesh::Route.TcpRouteAction)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_tcptimeout.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_tcptimeout.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-route_tcptimeout.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-route_tcptimeout.go
index 071673c8ef..7f5b651c81 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-route_tcptimeout.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_tcptimeout.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Route_TcpTimeout AWS CloudFormation Resource (AWS::AppMesh::Route.TcpTimeout)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_weightedtarget.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_weightedtarget.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-route_weightedtarget.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-route_weightedtarget.go
index 083de0768e..19e538d666 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-route_weightedtarget.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-route_weightedtarget.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Route_WeightedTarget AWS CloudFormation Resource (AWS::AppMesh::Route.WeightedTarget)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualgateway.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway.go
index cc30c2af2b..c46a64ad2c 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualGateway AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_subjectalternativenamematchers.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_subjectalternativenamematchers.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_subjectalternativenamematchers.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_subjectalternativenamematchers.go
index 47f75c831f..8e9a874936 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_subjectalternativenamematchers.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_subjectalternativenamematchers.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualGateway_SubjectAlternativeNameMatchers AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.SubjectAlternativeNameMatchers)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_subjectalternativenames.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_subjectalternativenames.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_subjectalternativenames.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_subjectalternativenames.go
index 1bcfe79eeb..c15802c1e5 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_subjectalternativenames.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_subjectalternativenames.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualGateway_SubjectAlternativeNames AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.SubjectAlternativeNames)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayaccesslog.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayaccesslog.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayaccesslog.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayaccesslog.go
index 6b01a950e8..33fedd0809 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayaccesslog.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayaccesslog.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualGateway_VirtualGatewayAccessLog AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayAccessLog)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaybackenddefaults.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaybackenddefaults.go
similarity index 96%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaybackenddefaults.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaybackenddefaults.go
index 823cdd5813..00c354d0d2 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaybackenddefaults.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaybackenddefaults.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualGateway_VirtualGatewayBackendDefaults AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayBackendDefaults)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclientpolicy.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclientpolicy.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclientpolicy.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclientpolicy.go
index 5363c89b2b..0e45ac2261 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclientpolicy.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclientpolicy.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualGateway_VirtualGatewayClientPolicy AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayClientPolicy)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclientpolicytls.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclientpolicytls.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclientpolicytls.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclientpolicytls.go
index 29f2b35d1d..c2b9363281 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclientpolicytls.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclientpolicytls.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualGateway_VirtualGatewayClientPolicyTls AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayClientPolicyTls)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclienttlscertificate.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclienttlscertificate.go
similarity index 96%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclienttlscertificate.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclienttlscertificate.go
index 0ed484434a..1d4bfc7b4a 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclienttlscertificate.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclienttlscertificate.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualGateway_VirtualGatewayClientTlsCertificate AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayClientTlsCertificate)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayconnectionpool.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayconnectionpool.go
similarity index 97%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayconnectionpool.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayconnectionpool.go
index 438d206659..6e19bcb78c 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayconnectionpool.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayconnectionpool.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualGateway_VirtualGatewayConnectionPool AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayConnectionPool)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayfileaccesslog.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayfileaccesslog.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayfileaccesslog.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayfileaccesslog.go
index 60301e7298..90451d56b1 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayfileaccesslog.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayfileaccesslog.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualGateway_VirtualGatewayFileAccessLog AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayFileAccessLog)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaygrpcconnectionpool.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaygrpcconnectionpool.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaygrpcconnectionpool.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaygrpcconnectionpool.go
index 609f083dd9..5c2e670a70 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaygrpcconnectionpool.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaygrpcconnectionpool.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualGateway_VirtualGatewayGrpcConnectionPool AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayGrpcConnectionPool)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhealthcheckpolicy.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhealthcheckpolicy.go
similarity index 96%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhealthcheckpolicy.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhealthcheckpolicy.go
index 51fc4e3d6f..a783345b80 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhealthcheckpolicy.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhealthcheckpolicy.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualGateway_VirtualGatewayHealthCheckPolicy AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayHealthCheckPolicy)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhttp2connectionpool.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhttp2connectionpool.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhttp2connectionpool.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhttp2connectionpool.go
index a4c40093d9..5e8983f1e9 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhttp2connectionpool.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhttp2connectionpool.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualGateway_VirtualGatewayHttp2ConnectionPool AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayHttp2ConnectionPool)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhttpconnectionpool.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhttpconnectionpool.go
similarity index 93%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhttpconnectionpool.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhttpconnectionpool.go
index e5d0927c13..3395ceb0fd 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhttpconnectionpool.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhttpconnectionpool.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualGateway_VirtualGatewayHttpConnectionPool AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayHttpConnectionPool)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistener.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistener.go
similarity index 97%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistener.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistener.go
index 321d01c172..94fc0f32dd 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistener.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistener.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualGateway_VirtualGatewayListener AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayListener)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertls.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertls.go
similarity index 94%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertls.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertls.go
index 965edc3d55..2ad0d4706c 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertls.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertls.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualGateway_VirtualGatewayListenerTls AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTls)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsacmcertificate.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsacmcertificate.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsacmcertificate.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsacmcertificate.go
index 62ce1c0226..a217297635 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsacmcertificate.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsacmcertificate.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualGateway_VirtualGatewayListenerTlsAcmCertificate AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsAcmCertificate)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlscertificate.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlscertificate.go
similarity index 97%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlscertificate.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlscertificate.go
index a5c8fe7673..63f6ca9f3f 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlscertificate.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlscertificate.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualGateway_VirtualGatewayListenerTlsCertificate AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsCertificate)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsfilecertificate.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsfilecertificate.go
similarity index 93%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsfilecertificate.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsfilecertificate.go
index 2d2154559a..0f69b34f42 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsfilecertificate.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsfilecertificate.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualGateway_VirtualGatewayListenerTlsFileCertificate AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsFileCertificate)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlssdscertificate.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlssdscertificate.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlssdscertificate.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlssdscertificate.go
index 1c5235c800..35352c468b 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlssdscertificate.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlssdscertificate.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualGateway_VirtualGatewayListenerTlsSdsCertificate AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsSdsCertificate)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsvalidationcontext.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsvalidationcontext.go
similarity index 96%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsvalidationcontext.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsvalidationcontext.go
index f1a81e43ec..2c5c302a6b 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsvalidationcontext.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsvalidationcontext.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualGateway_VirtualGatewayListenerTlsValidationContext AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsValidationContext)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsvalidationcontexttrust.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsvalidationcontexttrust.go
similarity index 96%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsvalidationcontexttrust.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsvalidationcontexttrust.go
index 3c70887cfa..656e5584a3 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsvalidationcontexttrust.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsvalidationcontexttrust.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualGateway_VirtualGatewayListenerTlsValidationContextTrust AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsValidationContextTrust)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylogging.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylogging.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylogging.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylogging.go
index fc0995df12..6c3c6cb9a4 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylogging.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylogging.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualGateway_VirtualGatewayLogging AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayLogging)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayportmapping.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayportmapping.go
similarity index 93%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayportmapping.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayportmapping.go
index d0b746831a..d3dc8af13c 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayportmapping.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayportmapping.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualGateway_VirtualGatewayPortMapping AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayPortMapping)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayspec.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayspec.go
similarity index 97%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayspec.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayspec.go
index 45bea2bc70..76acb3e325 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayspec.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayspec.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualGateway_VirtualGatewaySpec AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewaySpec)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontext.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontext.go
similarity index 96%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontext.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontext.go
index 89c4a9034a..d8bf3a752c 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontext.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontext.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualGateway_VirtualGatewayTlsValidationContext AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContext)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextacmtrust.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextacmtrust.go
similarity index 93%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextacmtrust.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextacmtrust.go
index be66d41335..8db71e5438 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextacmtrust.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextacmtrust.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualGateway_VirtualGatewayTlsValidationContextAcmTrust AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextAcmTrust)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextfiletrust.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextfiletrust.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextfiletrust.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextfiletrust.go
index 10a3b8dd61..de3bae79d4 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextfiletrust.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextfiletrust.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualGateway_VirtualGatewayTlsValidationContextFileTrust AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextFileTrust)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextsdstrust.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextsdstrust.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextsdstrust.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextsdstrust.go
index 70da85ae37..b991ac7243 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextsdstrust.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextsdstrust.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualGateway_VirtualGatewayTlsValidationContextSdsTrust AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextSdsTrust)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontexttrust.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontexttrust.go
similarity index 97%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontexttrust.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontexttrust.go
index 2d95b4ab3a..6a106f209e 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontexttrust.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontexttrust.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualGateway_VirtualGatewayTlsValidationContextTrust AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextTrust)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode.go
index cf318fd762..1f7cb5947c 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode AWS CloudFormation Resource (AWS::AppMesh::VirtualNode)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_accesslog.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_accesslog.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_accesslog.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_accesslog.go
index 38cb29eed8..d8f4af7db2 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_accesslog.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_accesslog.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_AccessLog AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.AccessLog)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_awscloudmapinstanceattribute.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_awscloudmapinstanceattribute.go
similarity index 93%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_awscloudmapinstanceattribute.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_awscloudmapinstanceattribute.go
index c5c0c61105..4904a0f899 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_awscloudmapinstanceattribute.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_awscloudmapinstanceattribute.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_AwsCloudMapInstanceAttribute AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.AwsCloudMapInstanceAttribute)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_awscloudmapservicediscovery.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_awscloudmapservicediscovery.go
similarity index 94%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_awscloudmapservicediscovery.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_awscloudmapservicediscovery.go
index 7a38dce8e7..52099c9953 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_awscloudmapservicediscovery.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_awscloudmapservicediscovery.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_AwsCloudMapServiceDiscovery AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.AwsCloudMapServiceDiscovery)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_backend.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_backend.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_backend.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_backend.go
index bb342c49a7..b5b92b10a1 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_backend.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_backend.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_Backend AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.Backend)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_backenddefaults.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_backenddefaults.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_backenddefaults.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_backenddefaults.go
index a53a416844..6a90a43b23 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_backenddefaults.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_backenddefaults.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_BackendDefaults AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.BackendDefaults)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_clientpolicy.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_clientpolicy.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_clientpolicy.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_clientpolicy.go
index 69cbf96d5f..3fc92a07c5 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_clientpolicy.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_clientpolicy.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_ClientPolicy AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.ClientPolicy)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_clientpolicytls.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_clientpolicytls.go
similarity index 94%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_clientpolicytls.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_clientpolicytls.go
index ad4963a7e5..5a4623a4f1 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_clientpolicytls.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_clientpolicytls.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_ClientPolicyTls AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.ClientPolicyTls)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_clienttlscertificate.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_clienttlscertificate.go
similarity index 96%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_clienttlscertificate.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_clienttlscertificate.go
index 2a24333987..a87ecda1c6 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_clienttlscertificate.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_clienttlscertificate.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_ClientTlsCertificate AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.ClientTlsCertificate)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_dnsservicediscovery.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_dnsservicediscovery.go
similarity index 93%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_dnsservicediscovery.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_dnsservicediscovery.go
index d3cd15e6d8..7a67289c75 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_dnsservicediscovery.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_dnsservicediscovery.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_DnsServiceDiscovery AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.DnsServiceDiscovery)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_duration.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_duration.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_duration.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_duration.go
index a99484d307..0289c21627 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_duration.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_duration.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_Duration AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.Duration)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_fileaccesslog.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_fileaccesslog.go
similarity index 91%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_fileaccesslog.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_fileaccesslog.go
index ce6ebf3727..354412e9d8 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_fileaccesslog.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_fileaccesslog.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_FileAccessLog AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.FileAccessLog)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_grpctimeout.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_grpctimeout.go
similarity index 96%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_grpctimeout.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_grpctimeout.go
index 44074feceb..82632a55b8 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_grpctimeout.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_grpctimeout.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_GrpcTimeout AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.GrpcTimeout)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_healthcheck.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_healthcheck.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_healthcheck.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_healthcheck.go
index 2ff76ca8e5..9120f9b1d7 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_healthcheck.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_healthcheck.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_HealthCheck AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.HealthCheck)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_httptimeout.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_httptimeout.go
similarity index 96%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_httptimeout.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_httptimeout.go
index 1791734842..fc8b8db9c6 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_httptimeout.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_httptimeout.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_HttpTimeout AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.HttpTimeout)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listener.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listener.go
similarity index 97%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listener.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listener.go
index 73c6108282..dafcd7537f 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listener.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listener.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_Listener AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.Listener)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertimeout.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertimeout.go
similarity index 97%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertimeout.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertimeout.go
index dc26228d2c..31b4002001 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertimeout.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertimeout.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_ListenerTimeout AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.ListenerTimeout)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertls.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertls.go
similarity index 93%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertls.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertls.go
index 14a84c28a0..778b5709de 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertls.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertls.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_ListenerTls AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.ListenerTls)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsacmcertificate.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsacmcertificate.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsacmcertificate.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsacmcertificate.go
index 39419d5b95..ecf455abac 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsacmcertificate.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsacmcertificate.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_ListenerTlsAcmCertificate AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.ListenerTlsAcmCertificate)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlscertificate.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlscertificate.go
similarity index 96%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlscertificate.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlscertificate.go
index 838a42b81c..20163226a8 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlscertificate.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlscertificate.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_ListenerTlsCertificate AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.ListenerTlsCertificate)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsfilecertificate.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsfilecertificate.go
similarity index 93%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsfilecertificate.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsfilecertificate.go
index 90539b8e59..f136eebd4f 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsfilecertificate.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsfilecertificate.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_ListenerTlsFileCertificate AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.ListenerTlsFileCertificate)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlssdscertificate.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlssdscertificate.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlssdscertificate.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlssdscertificate.go
index c0199d046a..64481d57ee 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlssdscertificate.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlssdscertificate.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_ListenerTlsSdsCertificate AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.ListenerTlsSdsCertificate)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsvalidationcontext.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsvalidationcontext.go
similarity index 96%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsvalidationcontext.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsvalidationcontext.go
index 492a7e3f5d..674143b4f8 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsvalidationcontext.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsvalidationcontext.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_ListenerTlsValidationContext AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.ListenerTlsValidationContext)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsvalidationcontexttrust.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsvalidationcontexttrust.go
similarity index 96%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsvalidationcontexttrust.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsvalidationcontexttrust.go
index 5b1f058994..5cba6376df 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsvalidationcontexttrust.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsvalidationcontexttrust.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_ListenerTlsValidationContextTrust AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.ListenerTlsValidationContextTrust)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_logging.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_logging.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_logging.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_logging.go
index 9d7f1af4ac..a2ea9653b9 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_logging.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_logging.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_Logging AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.Logging)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_outlierdetection.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_outlierdetection.go
similarity index 94%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_outlierdetection.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_outlierdetection.go
index 6ab079c993..0c24a173aa 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_outlierdetection.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_outlierdetection.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_OutlierDetection AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.OutlierDetection)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_portmapping.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_portmapping.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_portmapping.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_portmapping.go
index 4d195e223b..73ca03792c 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_portmapping.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_portmapping.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_PortMapping AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.PortMapping)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_servicediscovery.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_servicediscovery.go
similarity index 96%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_servicediscovery.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_servicediscovery.go
index 44333b4ab4..3e02769840 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_servicediscovery.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_servicediscovery.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_ServiceDiscovery AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.ServiceDiscovery)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_subjectalternativenamematchers.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_subjectalternativenamematchers.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_subjectalternativenamematchers.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_subjectalternativenamematchers.go
index 05916574fd..48db4c779d 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_subjectalternativenamematchers.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_subjectalternativenamematchers.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_SubjectAlternativeNameMatchers AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.SubjectAlternativeNameMatchers)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_subjectalternativenames.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_subjectalternativenames.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_subjectalternativenames.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_subjectalternativenames.go
index 144f754a68..5c4a83c465 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_subjectalternativenames.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_subjectalternativenames.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_SubjectAlternativeNames AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.SubjectAlternativeNames)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tcptimeout.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tcptimeout.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tcptimeout.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tcptimeout.go
index 9668c5a83e..f77f3c5f4f 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tcptimeout.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tcptimeout.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_TcpTimeout AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.TcpTimeout)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontext.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontext.go
similarity index 96%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontext.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontext.go
index 534de8d15f..ec71d304ab 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontext.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontext.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_TlsValidationContext AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.TlsValidationContext)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextacmtrust.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextacmtrust.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextacmtrust.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextacmtrust.go
index 1320ec2773..20ee5edc55 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextacmtrust.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextacmtrust.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_TlsValidationContextAcmTrust AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.TlsValidationContextAcmTrust)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextfiletrust.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextfiletrust.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextfiletrust.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextfiletrust.go
index 7d75b78fc1..7252df4ec1 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextfiletrust.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextfiletrust.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_TlsValidationContextFileTrust AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.TlsValidationContextFileTrust)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextsdstrust.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextsdstrust.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextsdstrust.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextsdstrust.go
index 2595139bae..250d772fd0 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextsdstrust.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextsdstrust.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_TlsValidationContextSdsTrust AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.TlsValidationContextSdsTrust)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontexttrust.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontexttrust.go
similarity index 96%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontexttrust.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontexttrust.go
index 675da1db63..3be337b0e3 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontexttrust.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontexttrust.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_TlsValidationContextTrust AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.TlsValidationContextTrust)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodeconnectionpool.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodeconnectionpool.go
similarity index 97%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodeconnectionpool.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodeconnectionpool.go
index ee33526eb3..b7a87d71cc 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodeconnectionpool.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodeconnectionpool.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_VirtualNodeConnectionPool AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.VirtualNodeConnectionPool)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodegrpcconnectionpool.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodegrpcconnectionpool.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodegrpcconnectionpool.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodegrpcconnectionpool.go
index 1dbd37e645..4eb9a703e9 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodegrpcconnectionpool.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodegrpcconnectionpool.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_VirtualNodeGrpcConnectionPool AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.VirtualNodeGrpcConnectionPool)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodehttp2connectionpool.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodehttp2connectionpool.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodehttp2connectionpool.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodehttp2connectionpool.go
index 3bad577df3..3c0637c4d3 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodehttp2connectionpool.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodehttp2connectionpool.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_VirtualNodeHttp2ConnectionPool AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.VirtualNodeHttp2ConnectionPool)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodehttpconnectionpool.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodehttpconnectionpool.go
similarity index 93%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodehttpconnectionpool.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodehttpconnectionpool.go
index 3643b07262..76ae19566b 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodehttpconnectionpool.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodehttpconnectionpool.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_VirtualNodeHttpConnectionPool AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.VirtualNodeHttpConnectionPool)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodespec.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodespec.go
similarity index 97%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodespec.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodespec.go
index 2ec7d83591..ea5870d6c3 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodespec.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodespec.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_VirtualNodeSpec AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.VirtualNodeSpec)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodetcpconnectionpool.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodetcpconnectionpool.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodetcpconnectionpool.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodetcpconnectionpool.go
index 6c4b14b520..5ed143c5e1 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodetcpconnectionpool.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodetcpconnectionpool.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_VirtualNodeTcpConnectionPool AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.VirtualNodeTcpConnectionPool)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualservicebackend.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualservicebackend.go
similarity index 93%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualservicebackend.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualservicebackend.go
index 2556097fe0..d0284b20f1 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualservicebackend.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualservicebackend.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualNode_VirtualServiceBackend AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.VirtualServiceBackend)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualrouter.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualrouter.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualrouter.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualrouter.go
index 505bc57f3b..71f95b01d4 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualrouter.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualrouter.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualRouter AWS CloudFormation Resource (AWS::AppMesh::VirtualRouter)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualrouter_portmapping.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualrouter_portmapping.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualrouter_portmapping.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualrouter_portmapping.go
index 8d0225c87d..66fc4c1e03 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualrouter_portmapping.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualrouter_portmapping.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualRouter_PortMapping AWS CloudFormation Resource (AWS::AppMesh::VirtualRouter.PortMapping)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualrouter_virtualrouterlistener.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualrouter_virtualrouterlistener.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualrouter_virtualrouterlistener.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualrouter_virtualrouterlistener.go
index c927c6ed24..a6a0a90701 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualrouter_virtualrouterlistener.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualrouter_virtualrouterlistener.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualRouter_VirtualRouterListener AWS CloudFormation Resource (AWS::AppMesh::VirtualRouter.VirtualRouterListener)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualrouter_virtualrouterspec.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualrouter_virtualrouterspec.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualrouter_virtualrouterspec.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualrouter_virtualrouterspec.go
index 5215651796..e7dfebd8ca 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualrouter_virtualrouterspec.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualrouter_virtualrouterspec.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualRouter_VirtualRouterSpec AWS CloudFormation Resource (AWS::AppMesh::VirtualRouter.VirtualRouterSpec)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualservice.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualservice.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualservice.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualservice.go
index 9bcfb32de1..583e0b7007 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualservice.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualservice.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualService AWS CloudFormation Resource (AWS::AppMesh::VirtualService)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualnodeserviceprovider.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualnodeserviceprovider.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualnodeserviceprovider.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualnodeserviceprovider.go
index d225a2011f..a874a40c0b 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualnodeserviceprovider.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualnodeserviceprovider.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualService_VirtualNodeServiceProvider AWS CloudFormation Resource (AWS::AppMesh::VirtualService.VirtualNodeServiceProvider)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualrouterserviceprovider.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualrouterserviceprovider.go
similarity index 92%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualrouterserviceprovider.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualrouterserviceprovider.go
index 92dd96ba74..a2f37fd309 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualrouterserviceprovider.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualrouterserviceprovider.go
@@ -1,9 +1,9 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualService_VirtualRouterServiceProvider AWS CloudFormation Resource (AWS::AppMesh::VirtualService.VirtualRouterServiceProvider)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualserviceprovider.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualserviceprovider.go
similarity index 96%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualserviceprovider.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualserviceprovider.go
index b73ae7c5d6..b1a487e161 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualserviceprovider.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualserviceprovider.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualService_VirtualServiceProvider AWS CloudFormation Resource (AWS::AppMesh::VirtualService.VirtualServiceProvider)
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualservicespec.go b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualservicespec.go
similarity index 95%
rename from goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualservicespec.go
rename to pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualservicespec.go
index 6fdd120d09..2454193345 100644
--- a/goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualservicespec.go
+++ b/pkg/goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualservicespec.go
@@ -1,7 +1,7 @@
 package appmesh
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualService_VirtualServiceSpec AWS CloudFormation Resource (AWS::AppMesh::VirtualService.VirtualServiceSpec)
diff --git a/goformation/cloudformation/apprunner/aws-apprunner-service.go b/pkg/goformation/cloudformation/apprunner/aws-apprunner-service.go
similarity index 96%
rename from goformation/cloudformation/apprunner/aws-apprunner-service.go
rename to pkg/goformation/cloudformation/apprunner/aws-apprunner-service.go
index 36b784e8c2..6c1af9163b 100644
--- a/goformation/cloudformation/apprunner/aws-apprunner-service.go
+++ b/pkg/goformation/cloudformation/apprunner/aws-apprunner-service.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Service AWS CloudFormation Resource (AWS::AppRunner::Service)
diff --git a/goformation/cloudformation/apprunner/aws-apprunner-service_authenticationconfiguration.go b/pkg/goformation/cloudformation/apprunner/aws-apprunner-service_authenticationconfiguration.go
similarity index 93%
rename from goformation/cloudformation/apprunner/aws-apprunner-service_authenticationconfiguration.go
rename to pkg/goformation/cloudformation/apprunner/aws-apprunner-service_authenticationconfiguration.go
index 8dacb28a8c..7cf8a4b6ed 100644
--- a/goformation/cloudformation/apprunner/aws-apprunner-service_authenticationconfiguration.go
+++ b/pkg/goformation/cloudformation/apprunner/aws-apprunner-service_authenticationconfiguration.go
@@ -1,9 +1,9 @@
 package apprunner
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Service_AuthenticationConfiguration AWS CloudFormation Resource (AWS::AppRunner::Service.AuthenticationConfiguration)
diff --git a/goformation/cloudformation/apprunner/aws-apprunner-service_codeconfiguration.go b/pkg/goformation/cloudformation/apprunner/aws-apprunner-service_codeconfiguration.go
similarity index 93%
rename from goformation/cloudformation/apprunner/aws-apprunner-service_codeconfiguration.go
rename to pkg/goformation/cloudformation/apprunner/aws-apprunner-service_codeconfiguration.go
index 9f39bbd472..c2ffe6af30 100644
--- a/goformation/cloudformation/apprunner/aws-apprunner-service_codeconfiguration.go
+++ b/pkg/goformation/cloudformation/apprunner/aws-apprunner-service_codeconfiguration.go
@@ -1,9 +1,9 @@
 package apprunner
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Service_CodeConfiguration AWS CloudFormation Resource (AWS::AppRunner::Service.CodeConfiguration)
diff --git a/goformation/cloudformation/apprunner/aws-apprunner-service_codeconfigurationvalues.go b/pkg/goformation/cloudformation/apprunner/aws-apprunner-service_codeconfigurationvalues.go
similarity index 95%
rename from goformation/cloudformation/apprunner/aws-apprunner-service_codeconfigurationvalues.go
rename to pkg/goformation/cloudformation/apprunner/aws-apprunner-service_codeconfigurationvalues.go
index ac264edf02..683f5802f7 100644
--- a/goformation/cloudformation/apprunner/aws-apprunner-service_codeconfigurationvalues.go
+++ b/pkg/goformation/cloudformation/apprunner/aws-apprunner-service_codeconfigurationvalues.go
@@ -1,9 +1,9 @@
 package apprunner
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Service_CodeConfigurationValues AWS CloudFormation Resource (AWS::AppRunner::Service.CodeConfigurationValues)
diff --git a/goformation/cloudformation/apprunner/aws-apprunner-service_coderepository.go b/pkg/goformation/cloudformation/apprunner/aws-apprunner-service_coderepository.go
similarity index 94%
rename from goformation/cloudformation/apprunner/aws-apprunner-service_coderepository.go
rename to pkg/goformation/cloudformation/apprunner/aws-apprunner-service_coderepository.go
index 17476e49a8..fb9a310bbc 100644
--- a/goformation/cloudformation/apprunner/aws-apprunner-service_coderepository.go
+++ b/pkg/goformation/cloudformation/apprunner/aws-apprunner-service_coderepository.go
@@ -1,9 +1,9 @@
 package apprunner
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Service_CodeRepository AWS CloudFormation Resource (AWS::AppRunner::Service.CodeRepository)
diff --git a/goformation/cloudformation/apprunner/aws-apprunner-service_encryptionconfiguration.go b/pkg/goformation/cloudformation/apprunner/aws-apprunner-service_encryptionconfiguration.go
similarity index 91%
rename from goformation/cloudformation/apprunner/aws-apprunner-service_encryptionconfiguration.go
rename to pkg/goformation/cloudformation/apprunner/aws-apprunner-service_encryptionconfiguration.go
index df3f9be830..86df9f4063 100644
--- a/goformation/cloudformation/apprunner/aws-apprunner-service_encryptionconfiguration.go
+++ b/pkg/goformation/cloudformation/apprunner/aws-apprunner-service_encryptionconfiguration.go
@@ -1,9 +1,9 @@
 package apprunner
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Service_EncryptionConfiguration AWS CloudFormation Resource (AWS::AppRunner::Service.EncryptionConfiguration)
diff --git a/goformation/cloudformation/apprunner/aws-apprunner-service_healthcheckconfiguration.go b/pkg/goformation/cloudformation/apprunner/aws-apprunner-service_healthcheckconfiguration.go
similarity index 95%
rename from goformation/cloudformation/apprunner/aws-apprunner-service_healthcheckconfiguration.go
rename to pkg/goformation/cloudformation/apprunner/aws-apprunner-service_healthcheckconfiguration.go
index eccf98f1b4..9c14171d6e 100644
--- a/goformation/cloudformation/apprunner/aws-apprunner-service_healthcheckconfiguration.go
+++ b/pkg/goformation/cloudformation/apprunner/aws-apprunner-service_healthcheckconfiguration.go
@@ -1,9 +1,9 @@
 package apprunner
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Service_HealthCheckConfiguration AWS CloudFormation Resource (AWS::AppRunner::Service.HealthCheckConfiguration)
diff --git a/goformation/cloudformation/apprunner/aws-apprunner-service_imageconfiguration.go b/pkg/goformation/cloudformation/apprunner/aws-apprunner-service_imageconfiguration.go
similarity index 94%
rename from goformation/cloudformation/apprunner/aws-apprunner-service_imageconfiguration.go
rename to pkg/goformation/cloudformation/apprunner/aws-apprunner-service_imageconfiguration.go
index 2975b4faa7..bf88295458 100644
--- a/goformation/cloudformation/apprunner/aws-apprunner-service_imageconfiguration.go
+++ b/pkg/goformation/cloudformation/apprunner/aws-apprunner-service_imageconfiguration.go
@@ -1,9 +1,9 @@
 package apprunner
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Service_ImageConfiguration AWS CloudFormation Resource (AWS::AppRunner::Service.ImageConfiguration)
diff --git a/goformation/cloudformation/apprunner/aws-apprunner-service_imagerepository.go b/pkg/goformation/cloudformation/apprunner/aws-apprunner-service_imagerepository.go
similarity index 94%
rename from goformation/cloudformation/apprunner/aws-apprunner-service_imagerepository.go
rename to pkg/goformation/cloudformation/apprunner/aws-apprunner-service_imagerepository.go
index 8ae8b2102b..0c6e2fc938 100644
--- a/goformation/cloudformation/apprunner/aws-apprunner-service_imagerepository.go
+++ b/pkg/goformation/cloudformation/apprunner/aws-apprunner-service_imagerepository.go
@@ -1,9 +1,9 @@
 package apprunner
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Service_ImageRepository AWS CloudFormation Resource (AWS::AppRunner::Service.ImageRepository)
diff --git a/goformation/cloudformation/apprunner/aws-apprunner-service_instanceconfiguration.go b/pkg/goformation/cloudformation/apprunner/aws-apprunner-service_instanceconfiguration.go
similarity index 93%
rename from goformation/cloudformation/apprunner/aws-apprunner-service_instanceconfiguration.go
rename to pkg/goformation/cloudformation/apprunner/aws-apprunner-service_instanceconfiguration.go
index 9eeac2738b..87a813625f 100644
--- a/goformation/cloudformation/apprunner/aws-apprunner-service_instanceconfiguration.go
+++ b/pkg/goformation/cloudformation/apprunner/aws-apprunner-service_instanceconfiguration.go
@@ -1,9 +1,9 @@
 package apprunner
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Service_InstanceConfiguration AWS CloudFormation Resource (AWS::AppRunner::Service.InstanceConfiguration)
diff --git a/goformation/cloudformation/apprunner/aws-apprunner-service_keyvaluepair.go b/pkg/goformation/cloudformation/apprunner/aws-apprunner-service_keyvaluepair.go
similarity index 92%
rename from goformation/cloudformation/apprunner/aws-apprunner-service_keyvaluepair.go
rename to pkg/goformation/cloudformation/apprunner/aws-apprunner-service_keyvaluepair.go
index 0658509905..70c9a84550 100644
--- a/goformation/cloudformation/apprunner/aws-apprunner-service_keyvaluepair.go
+++ b/pkg/goformation/cloudformation/apprunner/aws-apprunner-service_keyvaluepair.go
@@ -1,9 +1,9 @@
 package apprunner
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Service_KeyValuePair AWS CloudFormation Resource (AWS::AppRunner::Service.KeyValuePair)
diff --git a/goformation/cloudformation/apprunner/aws-apprunner-service_sourcecodeversion.go b/pkg/goformation/cloudformation/apprunner/aws-apprunner-service_sourcecodeversion.go
similarity index 92%
rename from goformation/cloudformation/apprunner/aws-apprunner-service_sourcecodeversion.go
rename to pkg/goformation/cloudformation/apprunner/aws-apprunner-service_sourcecodeversion.go
index d9c894b870..003a0e20d7 100644
--- a/goformation/cloudformation/apprunner/aws-apprunner-service_sourcecodeversion.go
+++ b/pkg/goformation/cloudformation/apprunner/aws-apprunner-service_sourcecodeversion.go
@@ -1,9 +1,9 @@
 package apprunner
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Service_SourceCodeVersion AWS CloudFormation Resource (AWS::AppRunner::Service.SourceCodeVersion)
diff --git a/goformation/cloudformation/apprunner/aws-apprunner-service_sourceconfiguration.go b/pkg/goformation/cloudformation/apprunner/aws-apprunner-service_sourceconfiguration.go
similarity index 95%
rename from goformation/cloudformation/apprunner/aws-apprunner-service_sourceconfiguration.go
rename to pkg/goformation/cloudformation/apprunner/aws-apprunner-service_sourceconfiguration.go
index bab1e2a117..72d49cbc94 100644
--- a/goformation/cloudformation/apprunner/aws-apprunner-service_sourceconfiguration.go
+++ b/pkg/goformation/cloudformation/apprunner/aws-apprunner-service_sourceconfiguration.go
@@ -1,9 +1,9 @@
 package apprunner
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Service_SourceConfiguration AWS CloudFormation Resource (AWS::AppRunner::Service.SourceConfiguration)
diff --git a/goformation/cloudformation/appstream/aws-appstream-appblock.go b/pkg/goformation/cloudformation/appstream/aws-appstream-appblock.go
similarity index 95%
rename from goformation/cloudformation/appstream/aws-appstream-appblock.go
rename to pkg/goformation/cloudformation/appstream/aws-appstream-appblock.go
index e0cf1f703f..cbb609a7ae 100644
--- a/goformation/cloudformation/appstream/aws-appstream-appblock.go
+++ b/pkg/goformation/cloudformation/appstream/aws-appstream-appblock.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AppBlock AWS CloudFormation Resource (AWS::AppStream::AppBlock)
diff --git a/goformation/cloudformation/appstream/aws-appstream-appblock_s3location.go b/pkg/goformation/cloudformation/appstream/aws-appstream-appblock_s3location.go
similarity index 92%
rename from goformation/cloudformation/appstream/aws-appstream-appblock_s3location.go
rename to pkg/goformation/cloudformation/appstream/aws-appstream-appblock_s3location.go
index 4cb7d49c79..3f465f2c30 100644
--- a/goformation/cloudformation/appstream/aws-appstream-appblock_s3location.go
+++ b/pkg/goformation/cloudformation/appstream/aws-appstream-appblock_s3location.go
@@ -1,9 +1,9 @@
 package appstream
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AppBlock_S3Location AWS CloudFormation Resource (AWS::AppStream::AppBlock.S3Location)
diff --git a/goformation/cloudformation/appstream/aws-appstream-appblock_scriptdetails.go b/pkg/goformation/cloudformation/appstream/aws-appstream-appblock_scriptdetails.go
similarity index 94%
rename from goformation/cloudformation/appstream/aws-appstream-appblock_scriptdetails.go
rename to pkg/goformation/cloudformation/appstream/aws-appstream-appblock_scriptdetails.go
index d43ee8a3b3..70d6b2959c 100644
--- a/goformation/cloudformation/appstream/aws-appstream-appblock_scriptdetails.go
+++ b/pkg/goformation/cloudformation/appstream/aws-appstream-appblock_scriptdetails.go
@@ -1,9 +1,9 @@
 package appstream
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AppBlock_ScriptDetails AWS CloudFormation Resource (AWS::AppStream::AppBlock.ScriptDetails)
diff --git a/goformation/cloudformation/appstream/aws-appstream-application.go b/pkg/goformation/cloudformation/appstream/aws-appstream-application.go
similarity index 96%
rename from goformation/cloudformation/appstream/aws-appstream-application.go
rename to pkg/goformation/cloudformation/appstream/aws-appstream-application.go
index e0d22f1b7a..ded46d3743 100644
--- a/goformation/cloudformation/appstream/aws-appstream-application.go
+++ b/pkg/goformation/cloudformation/appstream/aws-appstream-application.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application AWS CloudFormation Resource (AWS::AppStream::Application)
diff --git a/goformation/cloudformation/appstream/aws-appstream-application_s3location.go b/pkg/goformation/cloudformation/appstream/aws-appstream-application_s3location.go
similarity index 92%
rename from goformation/cloudformation/appstream/aws-appstream-application_s3location.go
rename to pkg/goformation/cloudformation/appstream/aws-appstream-application_s3location.go
index 5808145982..62584b9b2c 100644
--- a/goformation/cloudformation/appstream/aws-appstream-application_s3location.go
+++ b/pkg/goformation/cloudformation/appstream/aws-appstream-application_s3location.go
@@ -1,9 +1,9 @@
 package appstream
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_S3Location AWS CloudFormation Resource (AWS::AppStream::Application.S3Location)
diff --git a/goformation/cloudformation/appstream/aws-appstream-applicationfleetassociation.go b/pkg/goformation/cloudformation/appstream/aws-appstream-applicationfleetassociation.go
similarity index 96%
rename from goformation/cloudformation/appstream/aws-appstream-applicationfleetassociation.go
rename to pkg/goformation/cloudformation/appstream/aws-appstream-applicationfleetassociation.go
index edb0fc8a64..946630327e 100644
--- a/goformation/cloudformation/appstream/aws-appstream-applicationfleetassociation.go
+++ b/pkg/goformation/cloudformation/appstream/aws-appstream-applicationfleetassociation.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationFleetAssociation AWS CloudFormation Resource (AWS::AppStream::ApplicationFleetAssociation)
diff --git a/goformation/cloudformation/appstream/aws-appstream-directoryconfig.go b/pkg/goformation/cloudformation/appstream/aws-appstream-directoryconfig.go
similarity index 97%
rename from goformation/cloudformation/appstream/aws-appstream-directoryconfig.go
rename to pkg/goformation/cloudformation/appstream/aws-appstream-directoryconfig.go
index 4d28994c73..0cc16f9e71 100644
--- a/goformation/cloudformation/appstream/aws-appstream-directoryconfig.go
+++ b/pkg/goformation/cloudformation/appstream/aws-appstream-directoryconfig.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DirectoryConfig AWS CloudFormation Resource (AWS::AppStream::DirectoryConfig)
diff --git a/goformation/cloudformation/appstream/aws-appstream-directoryconfig_serviceaccountcredentials.go b/pkg/goformation/cloudformation/appstream/aws-appstream-directoryconfig_serviceaccountcredentials.go
similarity index 93%
rename from goformation/cloudformation/appstream/aws-appstream-directoryconfig_serviceaccountcredentials.go
rename to pkg/goformation/cloudformation/appstream/aws-appstream-directoryconfig_serviceaccountcredentials.go
index d3beb4722b..0195863a80 100644
--- a/goformation/cloudformation/appstream/aws-appstream-directoryconfig_serviceaccountcredentials.go
+++ b/pkg/goformation/cloudformation/appstream/aws-appstream-directoryconfig_serviceaccountcredentials.go
@@ -1,9 +1,9 @@
 package appstream
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DirectoryConfig_ServiceAccountCredentials AWS CloudFormation Resource (AWS::AppStream::DirectoryConfig.ServiceAccountCredentials)
diff --git a/goformation/cloudformation/appstream/aws-appstream-fleet.go b/pkg/goformation/cloudformation/appstream/aws-appstream-fleet.go
similarity index 97%
rename from goformation/cloudformation/appstream/aws-appstream-fleet.go
rename to pkg/goformation/cloudformation/appstream/aws-appstream-fleet.go
index d17b996c1a..a0cbee410c 100644
--- a/goformation/cloudformation/appstream/aws-appstream-fleet.go
+++ b/pkg/goformation/cloudformation/appstream/aws-appstream-fleet.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Fleet AWS CloudFormation Resource (AWS::AppStream::Fleet)
diff --git a/goformation/cloudformation/appstream/aws-appstream-fleet_computecapacity.go b/pkg/goformation/cloudformation/appstream/aws-appstream-fleet_computecapacity.go
similarity index 91%
rename from goformation/cloudformation/appstream/aws-appstream-fleet_computecapacity.go
rename to pkg/goformation/cloudformation/appstream/aws-appstream-fleet_computecapacity.go
index 7c1ab5f4bb..d05e49b9a3 100644
--- a/goformation/cloudformation/appstream/aws-appstream-fleet_computecapacity.go
+++ b/pkg/goformation/cloudformation/appstream/aws-appstream-fleet_computecapacity.go
@@ -1,9 +1,9 @@
 package appstream
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Fleet_ComputeCapacity AWS CloudFormation Resource (AWS::AppStream::Fleet.ComputeCapacity)
diff --git a/goformation/cloudformation/appstream/aws-appstream-fleet_domainjoininfo.go b/pkg/goformation/cloudformation/appstream/aws-appstream-fleet_domainjoininfo.go
similarity index 93%
rename from goformation/cloudformation/appstream/aws-appstream-fleet_domainjoininfo.go
rename to pkg/goformation/cloudformation/appstream/aws-appstream-fleet_domainjoininfo.go
index f0a6cc5eaf..a855726153 100644
--- a/goformation/cloudformation/appstream/aws-appstream-fleet_domainjoininfo.go
+++ b/pkg/goformation/cloudformation/appstream/aws-appstream-fleet_domainjoininfo.go
@@ -1,9 +1,9 @@
 package appstream
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Fleet_DomainJoinInfo AWS CloudFormation Resource (AWS::AppStream::Fleet.DomainJoinInfo)
diff --git a/goformation/cloudformation/appstream/aws-appstream-fleet_vpcconfig.go b/pkg/goformation/cloudformation/appstream/aws-appstream-fleet_vpcconfig.go
similarity index 92%
rename from goformation/cloudformation/appstream/aws-appstream-fleet_vpcconfig.go
rename to pkg/goformation/cloudformation/appstream/aws-appstream-fleet_vpcconfig.go
index dc9facb8fd..8a267b7012 100644
--- a/goformation/cloudformation/appstream/aws-appstream-fleet_vpcconfig.go
+++ b/pkg/goformation/cloudformation/appstream/aws-appstream-fleet_vpcconfig.go
@@ -1,9 +1,9 @@
 package appstream
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Fleet_VpcConfig AWS CloudFormation Resource (AWS::AppStream::Fleet.VpcConfig)
diff --git a/goformation/cloudformation/appstream/aws-appstream-imagebuilder.go b/pkg/goformation/cloudformation/appstream/aws-appstream-imagebuilder.go
similarity index 97%
rename from goformation/cloudformation/appstream/aws-appstream-imagebuilder.go
rename to pkg/goformation/cloudformation/appstream/aws-appstream-imagebuilder.go
index 86a13e65b7..abf8ed841a 100644
--- a/goformation/cloudformation/appstream/aws-appstream-imagebuilder.go
+++ b/pkg/goformation/cloudformation/appstream/aws-appstream-imagebuilder.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ImageBuilder AWS CloudFormation Resource (AWS::AppStream::ImageBuilder)
diff --git a/goformation/cloudformation/appstream/aws-appstream-imagebuilder_accessendpoint.go b/pkg/goformation/cloudformation/appstream/aws-appstream-imagebuilder_accessendpoint.go
similarity index 93%
rename from goformation/cloudformation/appstream/aws-appstream-imagebuilder_accessendpoint.go
rename to pkg/goformation/cloudformation/appstream/aws-appstream-imagebuilder_accessendpoint.go
index 28d51e45d7..27b8134598 100644
--- a/goformation/cloudformation/appstream/aws-appstream-imagebuilder_accessendpoint.go
+++ b/pkg/goformation/cloudformation/appstream/aws-appstream-imagebuilder_accessendpoint.go
@@ -1,9 +1,9 @@
 package appstream
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ImageBuilder_AccessEndpoint AWS CloudFormation Resource (AWS::AppStream::ImageBuilder.AccessEndpoint)
diff --git a/goformation/cloudformation/appstream/aws-appstream-imagebuilder_domainjoininfo.go b/pkg/goformation/cloudformation/appstream/aws-appstream-imagebuilder_domainjoininfo.go
similarity index 93%
rename from goformation/cloudformation/appstream/aws-appstream-imagebuilder_domainjoininfo.go
rename to pkg/goformation/cloudformation/appstream/aws-appstream-imagebuilder_domainjoininfo.go
index 60d577a855..22fe0324d7 100644
--- a/goformation/cloudformation/appstream/aws-appstream-imagebuilder_domainjoininfo.go
+++ b/pkg/goformation/cloudformation/appstream/aws-appstream-imagebuilder_domainjoininfo.go
@@ -1,9 +1,9 @@
 package appstream
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ImageBuilder_DomainJoinInfo AWS CloudFormation Resource (AWS::AppStream::ImageBuilder.DomainJoinInfo)
diff --git a/goformation/cloudformation/appstream/aws-appstream-imagebuilder_vpcconfig.go b/pkg/goformation/cloudformation/appstream/aws-appstream-imagebuilder_vpcconfig.go
similarity index 92%
rename from goformation/cloudformation/appstream/aws-appstream-imagebuilder_vpcconfig.go
rename to pkg/goformation/cloudformation/appstream/aws-appstream-imagebuilder_vpcconfig.go
index 3ccdbd06c6..217b813272 100644
--- a/goformation/cloudformation/appstream/aws-appstream-imagebuilder_vpcconfig.go
+++ b/pkg/goformation/cloudformation/appstream/aws-appstream-imagebuilder_vpcconfig.go
@@ -1,9 +1,9 @@
 package appstream
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ImageBuilder_VpcConfig AWS CloudFormation Resource (AWS::AppStream::ImageBuilder.VpcConfig)
diff --git a/goformation/cloudformation/appstream/aws-appstream-stack.go b/pkg/goformation/cloudformation/appstream/aws-appstream-stack.go
similarity index 97%
rename from goformation/cloudformation/appstream/aws-appstream-stack.go
rename to pkg/goformation/cloudformation/appstream/aws-appstream-stack.go
index 379355e419..8a9575fcee 100644
--- a/goformation/cloudformation/appstream/aws-appstream-stack.go
+++ b/pkg/goformation/cloudformation/appstream/aws-appstream-stack.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Stack AWS CloudFormation Resource (AWS::AppStream::Stack)
diff --git a/goformation/cloudformation/appstream/aws-appstream-stack_accessendpoint.go b/pkg/goformation/cloudformation/appstream/aws-appstream-stack_accessendpoint.go
similarity index 92%
rename from goformation/cloudformation/appstream/aws-appstream-stack_accessendpoint.go
rename to pkg/goformation/cloudformation/appstream/aws-appstream-stack_accessendpoint.go
index 7b99589050..6057251ff9 100644
--- a/goformation/cloudformation/appstream/aws-appstream-stack_accessendpoint.go
+++ b/pkg/goformation/cloudformation/appstream/aws-appstream-stack_accessendpoint.go
@@ -1,9 +1,9 @@
 package appstream
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Stack_AccessEndpoint AWS CloudFormation Resource (AWS::AppStream::Stack.AccessEndpoint)
diff --git a/goformation/cloudformation/appstream/aws-appstream-stack_applicationsettings.go b/pkg/goformation/cloudformation/appstream/aws-appstream-stack_applicationsettings.go
similarity index 92%
rename from goformation/cloudformation/appstream/aws-appstream-stack_applicationsettings.go
rename to pkg/goformation/cloudformation/appstream/aws-appstream-stack_applicationsettings.go
index 9a9b0b92fa..e688ca15f2 100644
--- a/goformation/cloudformation/appstream/aws-appstream-stack_applicationsettings.go
+++ b/pkg/goformation/cloudformation/appstream/aws-appstream-stack_applicationsettings.go
@@ -1,9 +1,9 @@
 package appstream
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Stack_ApplicationSettings AWS CloudFormation Resource (AWS::AppStream::Stack.ApplicationSettings)
diff --git a/goformation/cloudformation/appstream/aws-appstream-stack_storageconnector.go b/pkg/goformation/cloudformation/appstream/aws-appstream-stack_storageconnector.go
similarity index 93%
rename from goformation/cloudformation/appstream/aws-appstream-stack_storageconnector.go
rename to pkg/goformation/cloudformation/appstream/aws-appstream-stack_storageconnector.go
index d7512116e2..0f86a2cb38 100644
--- a/goformation/cloudformation/appstream/aws-appstream-stack_storageconnector.go
+++ b/pkg/goformation/cloudformation/appstream/aws-appstream-stack_storageconnector.go
@@ -1,9 +1,9 @@
 package appstream
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Stack_StorageConnector AWS CloudFormation Resource (AWS::AppStream::Stack.StorageConnector)
diff --git a/goformation/cloudformation/appstream/aws-appstream-stack_usersetting.go b/pkg/goformation/cloudformation/appstream/aws-appstream-stack_usersetting.go
similarity index 92%
rename from goformation/cloudformation/appstream/aws-appstream-stack_usersetting.go
rename to pkg/goformation/cloudformation/appstream/aws-appstream-stack_usersetting.go
index 725df822a6..4a4f27e32d 100644
--- a/goformation/cloudformation/appstream/aws-appstream-stack_usersetting.go
+++ b/pkg/goformation/cloudformation/appstream/aws-appstream-stack_usersetting.go
@@ -1,9 +1,9 @@
 package appstream
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Stack_UserSetting AWS CloudFormation Resource (AWS::AppStream::Stack.UserSetting)
diff --git a/goformation/cloudformation/appstream/aws-appstream-stackfleetassociation.go b/pkg/goformation/cloudformation/appstream/aws-appstream-stackfleetassociation.go
similarity index 96%
rename from goformation/cloudformation/appstream/aws-appstream-stackfleetassociation.go
rename to pkg/goformation/cloudformation/appstream/aws-appstream-stackfleetassociation.go
index 6ec0bc814c..448075d4f2 100644
--- a/goformation/cloudformation/appstream/aws-appstream-stackfleetassociation.go
+++ b/pkg/goformation/cloudformation/appstream/aws-appstream-stackfleetassociation.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StackFleetAssociation AWS CloudFormation Resource (AWS::AppStream::StackFleetAssociation)
diff --git a/goformation/cloudformation/appstream/aws-appstream-stackuserassociation.go b/pkg/goformation/cloudformation/appstream/aws-appstream-stackuserassociation.go
similarity index 97%
rename from goformation/cloudformation/appstream/aws-appstream-stackuserassociation.go
rename to pkg/goformation/cloudformation/appstream/aws-appstream-stackuserassociation.go
index fd2e55092f..ad4ade0670 100644
--- a/goformation/cloudformation/appstream/aws-appstream-stackuserassociation.go
+++ b/pkg/goformation/cloudformation/appstream/aws-appstream-stackuserassociation.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StackUserAssociation AWS CloudFormation Resource (AWS::AppStream::StackUserAssociation)
diff --git a/goformation/cloudformation/appstream/aws-appstream-user.go b/pkg/goformation/cloudformation/appstream/aws-appstream-user.go
similarity index 97%
rename from goformation/cloudformation/appstream/aws-appstream-user.go
rename to pkg/goformation/cloudformation/appstream/aws-appstream-user.go
index 83acf6fe6c..d729280764 100644
--- a/goformation/cloudformation/appstream/aws-appstream-user.go
+++ b/pkg/goformation/cloudformation/appstream/aws-appstream-user.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // User AWS CloudFormation Resource (AWS::AppStream::User)
diff --git a/goformation/cloudformation/appsync/aws-appsync-apicache.go b/pkg/goformation/cloudformation/appsync/aws-appsync-apicache.go
similarity index 97%
rename from goformation/cloudformation/appsync/aws-appsync-apicache.go
rename to pkg/goformation/cloudformation/appsync/aws-appsync-apicache.go
index 2423145c17..3656daacc1 100644
--- a/goformation/cloudformation/appsync/aws-appsync-apicache.go
+++ b/pkg/goformation/cloudformation/appsync/aws-appsync-apicache.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApiCache AWS CloudFormation Resource (AWS::AppSync::ApiCache)
diff --git a/goformation/cloudformation/appsync/aws-appsync-apikey.go b/pkg/goformation/cloudformation/appsync/aws-appsync-apikey.go
similarity index 97%
rename from goformation/cloudformation/appsync/aws-appsync-apikey.go
rename to pkg/goformation/cloudformation/appsync/aws-appsync-apikey.go
index c933e18c20..2e5b6ab255 100644
--- a/goformation/cloudformation/appsync/aws-appsync-apikey.go
+++ b/pkg/goformation/cloudformation/appsync/aws-appsync-apikey.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApiKey AWS CloudFormation Resource (AWS::AppSync::ApiKey)
diff --git a/goformation/cloudformation/appsync/aws-appsync-datasource.go b/pkg/goformation/cloudformation/appsync/aws-appsync-datasource.go
similarity index 97%
rename from goformation/cloudformation/appsync/aws-appsync-datasource.go
rename to pkg/goformation/cloudformation/appsync/aws-appsync-datasource.go
index ef06dd09e2..05b58bca34 100644
--- a/goformation/cloudformation/appsync/aws-appsync-datasource.go
+++ b/pkg/goformation/cloudformation/appsync/aws-appsync-datasource.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource AWS CloudFormation Resource (AWS::AppSync::DataSource)
diff --git a/goformation/cloudformation/appsync/aws-appsync-datasource_authorizationconfig.go b/pkg/goformation/cloudformation/appsync/aws-appsync-datasource_authorizationconfig.go
similarity index 93%
rename from goformation/cloudformation/appsync/aws-appsync-datasource_authorizationconfig.go
rename to pkg/goformation/cloudformation/appsync/aws-appsync-datasource_authorizationconfig.go
index 6d2527eb46..54314cdaab 100644
--- a/goformation/cloudformation/appsync/aws-appsync-datasource_authorizationconfig.go
+++ b/pkg/goformation/cloudformation/appsync/aws-appsync-datasource_authorizationconfig.go
@@ -1,9 +1,9 @@
 package appsync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_AuthorizationConfig AWS CloudFormation Resource (AWS::AppSync::DataSource.AuthorizationConfig)
diff --git a/goformation/cloudformation/appsync/aws-appsync-datasource_awsiamconfig.go b/pkg/goformation/cloudformation/appsync/aws-appsync-datasource_awsiamconfig.go
similarity index 93%
rename from goformation/cloudformation/appsync/aws-appsync-datasource_awsiamconfig.go
rename to pkg/goformation/cloudformation/appsync/aws-appsync-datasource_awsiamconfig.go
index 214e925104..5283ecb01c 100644
--- a/goformation/cloudformation/appsync/aws-appsync-datasource_awsiamconfig.go
+++ b/pkg/goformation/cloudformation/appsync/aws-appsync-datasource_awsiamconfig.go
@@ -1,9 +1,9 @@
 package appsync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_AwsIamConfig AWS CloudFormation Resource (AWS::AppSync::DataSource.AwsIamConfig)
diff --git a/goformation/cloudformation/appsync/aws-appsync-datasource_deltasyncconfig.go b/pkg/goformation/cloudformation/appsync/aws-appsync-datasource_deltasyncconfig.go
similarity index 94%
rename from goformation/cloudformation/appsync/aws-appsync-datasource_deltasyncconfig.go
rename to pkg/goformation/cloudformation/appsync/aws-appsync-datasource_deltasyncconfig.go
index 21452d9553..2c810a4b20 100644
--- a/goformation/cloudformation/appsync/aws-appsync-datasource_deltasyncconfig.go
+++ b/pkg/goformation/cloudformation/appsync/aws-appsync-datasource_deltasyncconfig.go
@@ -1,9 +1,9 @@
 package appsync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_DeltaSyncConfig AWS CloudFormation Resource (AWS::AppSync::DataSource.DeltaSyncConfig)
diff --git a/goformation/cloudformation/appsync/aws-appsync-datasource_dynamodbconfig.go b/pkg/goformation/cloudformation/appsync/aws-appsync-datasource_dynamodbconfig.go
similarity index 95%
rename from goformation/cloudformation/appsync/aws-appsync-datasource_dynamodbconfig.go
rename to pkg/goformation/cloudformation/appsync/aws-appsync-datasource_dynamodbconfig.go
index 33bdf0978e..d02fbbc54d 100644
--- a/goformation/cloudformation/appsync/aws-appsync-datasource_dynamodbconfig.go
+++ b/pkg/goformation/cloudformation/appsync/aws-appsync-datasource_dynamodbconfig.go
@@ -1,9 +1,9 @@
 package appsync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_DynamoDBConfig AWS CloudFormation Resource (AWS::AppSync::DataSource.DynamoDBConfig)
diff --git a/goformation/cloudformation/appsync/aws-appsync-datasource_elasticsearchconfig.go b/pkg/goformation/cloudformation/appsync/aws-appsync-datasource_elasticsearchconfig.go
similarity index 93%
rename from goformation/cloudformation/appsync/aws-appsync-datasource_elasticsearchconfig.go
rename to pkg/goformation/cloudformation/appsync/aws-appsync-datasource_elasticsearchconfig.go
index 9f1227ed49..f8478e48f2 100644
--- a/goformation/cloudformation/appsync/aws-appsync-datasource_elasticsearchconfig.go
+++ b/pkg/goformation/cloudformation/appsync/aws-appsync-datasource_elasticsearchconfig.go
@@ -1,9 +1,9 @@
 package appsync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_ElasticsearchConfig AWS CloudFormation Resource (AWS::AppSync::DataSource.ElasticsearchConfig)
diff --git a/goformation/cloudformation/appsync/aws-appsync-datasource_httpconfig.go b/pkg/goformation/cloudformation/appsync/aws-appsync-datasource_httpconfig.go
similarity index 92%
rename from goformation/cloudformation/appsync/aws-appsync-datasource_httpconfig.go
rename to pkg/goformation/cloudformation/appsync/aws-appsync-datasource_httpconfig.go
index 348b69b68e..02bbdc02d7 100644
--- a/goformation/cloudformation/appsync/aws-appsync-datasource_httpconfig.go
+++ b/pkg/goformation/cloudformation/appsync/aws-appsync-datasource_httpconfig.go
@@ -1,9 +1,9 @@
 package appsync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_HttpConfig AWS CloudFormation Resource (AWS::AppSync::DataSource.HttpConfig)
diff --git a/goformation/cloudformation/appsync/aws-appsync-datasource_lambdaconfig.go b/pkg/goformation/cloudformation/appsync/aws-appsync-datasource_lambdaconfig.go
similarity index 91%
rename from goformation/cloudformation/appsync/aws-appsync-datasource_lambdaconfig.go
rename to pkg/goformation/cloudformation/appsync/aws-appsync-datasource_lambdaconfig.go
index 2b4cba7354..71a4f411f8 100644
--- a/goformation/cloudformation/appsync/aws-appsync-datasource_lambdaconfig.go
+++ b/pkg/goformation/cloudformation/appsync/aws-appsync-datasource_lambdaconfig.go
@@ -1,9 +1,9 @@
 package appsync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_LambdaConfig AWS CloudFormation Resource (AWS::AppSync::DataSource.LambdaConfig)
diff --git a/goformation/cloudformation/appsync/aws-appsync-datasource_opensearchserviceconfig.go b/pkg/goformation/cloudformation/appsync/aws-appsync-datasource_opensearchserviceconfig.go
similarity index 93%
rename from goformation/cloudformation/appsync/aws-appsync-datasource_opensearchserviceconfig.go
rename to pkg/goformation/cloudformation/appsync/aws-appsync-datasource_opensearchserviceconfig.go
index 7bf0b0d137..2125caf5d2 100644
--- a/goformation/cloudformation/appsync/aws-appsync-datasource_opensearchserviceconfig.go
+++ b/pkg/goformation/cloudformation/appsync/aws-appsync-datasource_opensearchserviceconfig.go
@@ -1,9 +1,9 @@
 package appsync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_OpenSearchServiceConfig AWS CloudFormation Resource (AWS::AppSync::DataSource.OpenSearchServiceConfig)
diff --git a/goformation/cloudformation/appsync/aws-appsync-datasource_rdshttpendpointconfig.go b/pkg/goformation/cloudformation/appsync/aws-appsync-datasource_rdshttpendpointconfig.go
similarity index 95%
rename from goformation/cloudformation/appsync/aws-appsync-datasource_rdshttpendpointconfig.go
rename to pkg/goformation/cloudformation/appsync/aws-appsync-datasource_rdshttpendpointconfig.go
index 445a29ab1b..adac4295de 100644
--- a/goformation/cloudformation/appsync/aws-appsync-datasource_rdshttpendpointconfig.go
+++ b/pkg/goformation/cloudformation/appsync/aws-appsync-datasource_rdshttpendpointconfig.go
@@ -1,9 +1,9 @@
 package appsync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_RdsHttpEndpointConfig AWS CloudFormation Resource (AWS::AppSync::DataSource.RdsHttpEndpointConfig)
diff --git a/goformation/cloudformation/appsync/aws-appsync-datasource_relationaldatabaseconfig.go b/pkg/goformation/cloudformation/appsync/aws-appsync-datasource_relationaldatabaseconfig.go
similarity index 93%
rename from goformation/cloudformation/appsync/aws-appsync-datasource_relationaldatabaseconfig.go
rename to pkg/goformation/cloudformation/appsync/aws-appsync-datasource_relationaldatabaseconfig.go
index 7c5781896e..55cc0cb6cd 100644
--- a/goformation/cloudformation/appsync/aws-appsync-datasource_relationaldatabaseconfig.go
+++ b/pkg/goformation/cloudformation/appsync/aws-appsync-datasource_relationaldatabaseconfig.go
@@ -1,9 +1,9 @@
 package appsync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_RelationalDatabaseConfig AWS CloudFormation Resource (AWS::AppSync::DataSource.RelationalDatabaseConfig)
diff --git a/goformation/cloudformation/appsync/aws-appsync-functionconfiguration.go b/pkg/goformation/cloudformation/appsync/aws-appsync-functionconfiguration.go
similarity index 97%
rename from goformation/cloudformation/appsync/aws-appsync-functionconfiguration.go
rename to pkg/goformation/cloudformation/appsync/aws-appsync-functionconfiguration.go
index dda51872b8..fc824d2d2f 100644
--- a/goformation/cloudformation/appsync/aws-appsync-functionconfiguration.go
+++ b/pkg/goformation/cloudformation/appsync/aws-appsync-functionconfiguration.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FunctionConfiguration AWS CloudFormation Resource (AWS::AppSync::FunctionConfiguration)
diff --git a/goformation/cloudformation/appsync/aws-appsync-functionconfiguration_lambdaconflicthandlerconfig.go b/pkg/goformation/cloudformation/appsync/aws-appsync-functionconfiguration_lambdaconflicthandlerconfig.go
similarity index 92%
rename from goformation/cloudformation/appsync/aws-appsync-functionconfiguration_lambdaconflicthandlerconfig.go
rename to pkg/goformation/cloudformation/appsync/aws-appsync-functionconfiguration_lambdaconflicthandlerconfig.go
index 4566347b71..382a07614d 100644
--- a/goformation/cloudformation/appsync/aws-appsync-functionconfiguration_lambdaconflicthandlerconfig.go
+++ b/pkg/goformation/cloudformation/appsync/aws-appsync-functionconfiguration_lambdaconflicthandlerconfig.go
@@ -1,9 +1,9 @@
 package appsync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FunctionConfiguration_LambdaConflictHandlerConfig AWS CloudFormation Resource (AWS::AppSync::FunctionConfiguration.LambdaConflictHandlerConfig)
diff --git a/goformation/cloudformation/appsync/aws-appsync-functionconfiguration_syncconfig.go b/pkg/goformation/cloudformation/appsync/aws-appsync-functionconfiguration_syncconfig.go
similarity index 94%
rename from goformation/cloudformation/appsync/aws-appsync-functionconfiguration_syncconfig.go
rename to pkg/goformation/cloudformation/appsync/aws-appsync-functionconfiguration_syncconfig.go
index 0fe4ff931f..0630f251e7 100644
--- a/goformation/cloudformation/appsync/aws-appsync-functionconfiguration_syncconfig.go
+++ b/pkg/goformation/cloudformation/appsync/aws-appsync-functionconfiguration_syncconfig.go
@@ -1,9 +1,9 @@
 package appsync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FunctionConfiguration_SyncConfig AWS CloudFormation Resource (AWS::AppSync::FunctionConfiguration.SyncConfig)
diff --git a/goformation/cloudformation/appsync/aws-appsync-graphqlapi.go b/pkg/goformation/cloudformation/appsync/aws-appsync-graphqlapi.go
similarity index 97%
rename from goformation/cloudformation/appsync/aws-appsync-graphqlapi.go
rename to pkg/goformation/cloudformation/appsync/aws-appsync-graphqlapi.go
index 7ce4e90816..4c4873f571 100644
--- a/goformation/cloudformation/appsync/aws-appsync-graphqlapi.go
+++ b/pkg/goformation/cloudformation/appsync/aws-appsync-graphqlapi.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GraphQLApi AWS CloudFormation Resource (AWS::AppSync::GraphQLApi)
diff --git a/goformation/cloudformation/appsync/aws-appsync-graphqlapi_additionalauthenticationprovider.go b/pkg/goformation/cloudformation/appsync/aws-appsync-graphqlapi_additionalauthenticationprovider.go
similarity index 95%
rename from goformation/cloudformation/appsync/aws-appsync-graphqlapi_additionalauthenticationprovider.go
rename to pkg/goformation/cloudformation/appsync/aws-appsync-graphqlapi_additionalauthenticationprovider.go
index 4c45d257c0..c5750ed269 100644
--- a/goformation/cloudformation/appsync/aws-appsync-graphqlapi_additionalauthenticationprovider.go
+++ b/pkg/goformation/cloudformation/appsync/aws-appsync-graphqlapi_additionalauthenticationprovider.go
@@ -1,9 +1,9 @@
 package appsync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GraphQLApi_AdditionalAuthenticationProvider AWS CloudFormation Resource (AWS::AppSync::GraphQLApi.AdditionalAuthenticationProvider)
diff --git a/goformation/cloudformation/appsync/aws-appsync-graphqlapi_additionalauthenticationproviders.go b/pkg/goformation/cloudformation/appsync/aws-appsync-graphqlapi_additionalauthenticationproviders.go
similarity index 95%
rename from goformation/cloudformation/appsync/aws-appsync-graphqlapi_additionalauthenticationproviders.go
rename to pkg/goformation/cloudformation/appsync/aws-appsync-graphqlapi_additionalauthenticationproviders.go
index 2ad0edcce0..3a3a6374f0 100644
--- a/goformation/cloudformation/appsync/aws-appsync-graphqlapi_additionalauthenticationproviders.go
+++ b/pkg/goformation/cloudformation/appsync/aws-appsync-graphqlapi_additionalauthenticationproviders.go
@@ -1,7 +1,7 @@
 package appsync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GraphQLApi_AdditionalAuthenticationProviders AWS CloudFormation Resource (AWS::AppSync::GraphQLApi.AdditionalAuthenticationProviders)
diff --git a/goformation/cloudformation/appsync/aws-appsync-graphqlapi_cognitouserpoolconfig.go b/pkg/goformation/cloudformation/appsync/aws-appsync-graphqlapi_cognitouserpoolconfig.go
similarity index 94%
rename from goformation/cloudformation/appsync/aws-appsync-graphqlapi_cognitouserpoolconfig.go
rename to pkg/goformation/cloudformation/appsync/aws-appsync-graphqlapi_cognitouserpoolconfig.go
index d8cf317293..ee948ecc12 100644
--- a/goformation/cloudformation/appsync/aws-appsync-graphqlapi_cognitouserpoolconfig.go
+++ b/pkg/goformation/cloudformation/appsync/aws-appsync-graphqlapi_cognitouserpoolconfig.go
@@ -1,9 +1,9 @@
 package appsync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GraphQLApi_CognitoUserPoolConfig AWS CloudFormation Resource (AWS::AppSync::GraphQLApi.CognitoUserPoolConfig)
diff --git a/goformation/cloudformation/appsync/aws-appsync-graphqlapi_lambdaauthorizerconfig.go b/pkg/goformation/cloudformation/appsync/aws-appsync-graphqlapi_lambdaauthorizerconfig.go
similarity index 94%
rename from goformation/cloudformation/appsync/aws-appsync-graphqlapi_lambdaauthorizerconfig.go
rename to pkg/goformation/cloudformation/appsync/aws-appsync-graphqlapi_lambdaauthorizerconfig.go
index b9fe4967e9..7683aead10 100644
--- a/goformation/cloudformation/appsync/aws-appsync-graphqlapi_lambdaauthorizerconfig.go
+++ b/pkg/goformation/cloudformation/appsync/aws-appsync-graphqlapi_lambdaauthorizerconfig.go
@@ -1,9 +1,9 @@
 package appsync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GraphQLApi_LambdaAuthorizerConfig AWS CloudFormation Resource (AWS::AppSync::GraphQLApi.LambdaAuthorizerConfig)
diff --git a/goformation/cloudformation/appsync/aws-appsync-graphqlapi_logconfig.go b/pkg/goformation/cloudformation/appsync/aws-appsync-graphqlapi_logconfig.go
similarity index 93%
rename from goformation/cloudformation/appsync/aws-appsync-graphqlapi_logconfig.go
rename to pkg/goformation/cloudformation/appsync/aws-appsync-graphqlapi_logconfig.go
index 7fb49e66af..c7788ad6cf 100644
--- a/goformation/cloudformation/appsync/aws-appsync-graphqlapi_logconfig.go
+++ b/pkg/goformation/cloudformation/appsync/aws-appsync-graphqlapi_logconfig.go
@@ -1,9 +1,9 @@
 package appsync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GraphQLApi_LogConfig AWS CloudFormation Resource (AWS::AppSync::GraphQLApi.LogConfig)
diff --git a/goformation/cloudformation/appsync/aws-appsync-graphqlapi_openidconnectconfig.go b/pkg/goformation/cloudformation/appsync/aws-appsync-graphqlapi_openidconnectconfig.go
similarity index 94%
rename from goformation/cloudformation/appsync/aws-appsync-graphqlapi_openidconnectconfig.go
rename to pkg/goformation/cloudformation/appsync/aws-appsync-graphqlapi_openidconnectconfig.go
index 5890876b6c..74b26b72c2 100644
--- a/goformation/cloudformation/appsync/aws-appsync-graphqlapi_openidconnectconfig.go
+++ b/pkg/goformation/cloudformation/appsync/aws-appsync-graphqlapi_openidconnectconfig.go
@@ -1,9 +1,9 @@
 package appsync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GraphQLApi_OpenIDConnectConfig AWS CloudFormation Resource (AWS::AppSync::GraphQLApi.OpenIDConnectConfig)
diff --git a/goformation/cloudformation/appsync/aws-appsync-graphqlapi_tags.go b/pkg/goformation/cloudformation/appsync/aws-appsync-graphqlapi_tags.go
similarity index 94%
rename from goformation/cloudformation/appsync/aws-appsync-graphqlapi_tags.go
rename to pkg/goformation/cloudformation/appsync/aws-appsync-graphqlapi_tags.go
index a76a56fc4c..d4a43b8305 100644
--- a/goformation/cloudformation/appsync/aws-appsync-graphqlapi_tags.go
+++ b/pkg/goformation/cloudformation/appsync/aws-appsync-graphqlapi_tags.go
@@ -1,7 +1,7 @@
 package appsync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GraphQLApi_Tags AWS CloudFormation Resource (AWS::AppSync::GraphQLApi.Tags)
diff --git a/goformation/cloudformation/appsync/aws-appsync-graphqlapi_userpoolconfig.go b/pkg/goformation/cloudformation/appsync/aws-appsync-graphqlapi_userpoolconfig.go
similarity index 94%
rename from goformation/cloudformation/appsync/aws-appsync-graphqlapi_userpoolconfig.go
rename to pkg/goformation/cloudformation/appsync/aws-appsync-graphqlapi_userpoolconfig.go
index fb284ea704..6cc413aef5 100644
--- a/goformation/cloudformation/appsync/aws-appsync-graphqlapi_userpoolconfig.go
+++ b/pkg/goformation/cloudformation/appsync/aws-appsync-graphqlapi_userpoolconfig.go
@@ -1,9 +1,9 @@
 package appsync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GraphQLApi_UserPoolConfig AWS CloudFormation Resource (AWS::AppSync::GraphQLApi.UserPoolConfig)
diff --git a/goformation/cloudformation/appsync/aws-appsync-graphqlschema.go b/pkg/goformation/cloudformation/appsync/aws-appsync-graphqlschema.go
similarity index 96%
rename from goformation/cloudformation/appsync/aws-appsync-graphqlschema.go
rename to pkg/goformation/cloudformation/appsync/aws-appsync-graphqlschema.go
index 01d8792b52..ea13b4732a 100644
--- a/goformation/cloudformation/appsync/aws-appsync-graphqlschema.go
+++ b/pkg/goformation/cloudformation/appsync/aws-appsync-graphqlschema.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GraphQLSchema AWS CloudFormation Resource (AWS::AppSync::GraphQLSchema)
diff --git a/goformation/cloudformation/appsync/aws-appsync-resolver.go b/pkg/goformation/cloudformation/appsync/aws-appsync-resolver.go
similarity index 98%
rename from goformation/cloudformation/appsync/aws-appsync-resolver.go
rename to pkg/goformation/cloudformation/appsync/aws-appsync-resolver.go
index 5157d730e0..1ecc367d16 100644
--- a/goformation/cloudformation/appsync/aws-appsync-resolver.go
+++ b/pkg/goformation/cloudformation/appsync/aws-appsync-resolver.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Resolver AWS CloudFormation Resource (AWS::AppSync::Resolver)
diff --git a/goformation/cloudformation/appsync/aws-appsync-resolver_cachingconfig.go b/pkg/goformation/cloudformation/appsync/aws-appsync-resolver_cachingconfig.go
similarity index 92%
rename from goformation/cloudformation/appsync/aws-appsync-resolver_cachingconfig.go
rename to pkg/goformation/cloudformation/appsync/aws-appsync-resolver_cachingconfig.go
index dd66bacef6..3ddf882820 100644
--- a/goformation/cloudformation/appsync/aws-appsync-resolver_cachingconfig.go
+++ b/pkg/goformation/cloudformation/appsync/aws-appsync-resolver_cachingconfig.go
@@ -1,9 +1,9 @@
 package appsync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Resolver_CachingConfig AWS CloudFormation Resource (AWS::AppSync::Resolver.CachingConfig)
diff --git a/goformation/cloudformation/appsync/aws-appsync-resolver_lambdaconflicthandlerconfig.go b/pkg/goformation/cloudformation/appsync/aws-appsync-resolver_lambdaconflicthandlerconfig.go
similarity index 92%
rename from goformation/cloudformation/appsync/aws-appsync-resolver_lambdaconflicthandlerconfig.go
rename to pkg/goformation/cloudformation/appsync/aws-appsync-resolver_lambdaconflicthandlerconfig.go
index 824c14b46d..ccd3ca2897 100644
--- a/goformation/cloudformation/appsync/aws-appsync-resolver_lambdaconflicthandlerconfig.go
+++ b/pkg/goformation/cloudformation/appsync/aws-appsync-resolver_lambdaconflicthandlerconfig.go
@@ -1,9 +1,9 @@
 package appsync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Resolver_LambdaConflictHandlerConfig AWS CloudFormation Resource (AWS::AppSync::Resolver.LambdaConflictHandlerConfig)
diff --git a/goformation/cloudformation/appsync/aws-appsync-resolver_pipelineconfig.go b/pkg/goformation/cloudformation/appsync/aws-appsync-resolver_pipelineconfig.go
similarity index 91%
rename from goformation/cloudformation/appsync/aws-appsync-resolver_pipelineconfig.go
rename to pkg/goformation/cloudformation/appsync/aws-appsync-resolver_pipelineconfig.go
index d212c668d1..68880e3ddd 100644
--- a/goformation/cloudformation/appsync/aws-appsync-resolver_pipelineconfig.go
+++ b/pkg/goformation/cloudformation/appsync/aws-appsync-resolver_pipelineconfig.go
@@ -1,9 +1,9 @@
 package appsync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Resolver_PipelineConfig AWS CloudFormation Resource (AWS::AppSync::Resolver.PipelineConfig)
diff --git a/goformation/cloudformation/appsync/aws-appsync-resolver_syncconfig.go b/pkg/goformation/cloudformation/appsync/aws-appsync-resolver_syncconfig.go
similarity index 94%
rename from goformation/cloudformation/appsync/aws-appsync-resolver_syncconfig.go
rename to pkg/goformation/cloudformation/appsync/aws-appsync-resolver_syncconfig.go
index b98f606cec..f443feaf2f 100644
--- a/goformation/cloudformation/appsync/aws-appsync-resolver_syncconfig.go
+++ b/pkg/goformation/cloudformation/appsync/aws-appsync-resolver_syncconfig.go
@@ -1,9 +1,9 @@
 package appsync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Resolver_SyncConfig AWS CloudFormation Resource (AWS::AppSync::Resolver.SyncConfig)
diff --git a/goformation/cloudformation/aps/aws-aps-rulegroupsnamespace.go b/pkg/goformation/cloudformation/aps/aws-aps-rulegroupsnamespace.go
similarity index 95%
rename from goformation/cloudformation/aps/aws-aps-rulegroupsnamespace.go
rename to pkg/goformation/cloudformation/aps/aws-aps-rulegroupsnamespace.go
index 70d672cfda..baa0bd8222 100644
--- a/goformation/cloudformation/aps/aws-aps-rulegroupsnamespace.go
+++ b/pkg/goformation/cloudformation/aps/aws-aps-rulegroupsnamespace.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroupsNamespace AWS CloudFormation Resource (AWS::APS::RuleGroupsNamespace)
diff --git a/goformation/cloudformation/aps/aws-aps-workspace.go b/pkg/goformation/cloudformation/aps/aws-aps-workspace.go
similarity index 95%
rename from goformation/cloudformation/aps/aws-aps-workspace.go
rename to pkg/goformation/cloudformation/aps/aws-aps-workspace.go
index a569a3e4e6..edad7f1d27 100644
--- a/goformation/cloudformation/aps/aws-aps-workspace.go
+++ b/pkg/goformation/cloudformation/aps/aws-aps-workspace.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Workspace AWS CloudFormation Resource (AWS::APS::Workspace)
diff --git a/goformation/cloudformation/ask/alexa-ask-skill.go b/pkg/goformation/cloudformation/ask/alexa-ask-skill.go
similarity index 96%
rename from goformation/cloudformation/ask/alexa-ask-skill.go
rename to pkg/goformation/cloudformation/ask/alexa-ask-skill.go
index 43eef3ee7b..a6c0002648 100644
--- a/goformation/cloudformation/ask/alexa-ask-skill.go
+++ b/pkg/goformation/cloudformation/ask/alexa-ask-skill.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Skill AWS CloudFormation Resource (Alexa::ASK::Skill)
diff --git a/goformation/cloudformation/ask/alexa-ask-skill_authenticationconfiguration.go b/pkg/goformation/cloudformation/ask/alexa-ask-skill_authenticationconfiguration.go
similarity index 94%
rename from goformation/cloudformation/ask/alexa-ask-skill_authenticationconfiguration.go
rename to pkg/goformation/cloudformation/ask/alexa-ask-skill_authenticationconfiguration.go
index 723c0e38b8..9b174e2651 100644
--- a/goformation/cloudformation/ask/alexa-ask-skill_authenticationconfiguration.go
+++ b/pkg/goformation/cloudformation/ask/alexa-ask-skill_authenticationconfiguration.go
@@ -1,9 +1,9 @@
 package ask
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Skill_AuthenticationConfiguration AWS CloudFormation Resource (Alexa::ASK::Skill.AuthenticationConfiguration)
diff --git a/goformation/cloudformation/ask/alexa-ask-skill_overrides.go b/pkg/goformation/cloudformation/ask/alexa-ask-skill_overrides.go
similarity index 95%
rename from goformation/cloudformation/ask/alexa-ask-skill_overrides.go
rename to pkg/goformation/cloudformation/ask/alexa-ask-skill_overrides.go
index 74a4db586f..6435e39d89 100644
--- a/goformation/cloudformation/ask/alexa-ask-skill_overrides.go
+++ b/pkg/goformation/cloudformation/ask/alexa-ask-skill_overrides.go
@@ -1,7 +1,7 @@
 package ask
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Skill_Overrides AWS CloudFormation Resource (Alexa::ASK::Skill.Overrides)
diff --git a/goformation/cloudformation/ask/alexa-ask-skill_skillpackage.go b/pkg/goformation/cloudformation/ask/alexa-ask-skill_skillpackage.go
similarity index 94%
rename from goformation/cloudformation/ask/alexa-ask-skill_skillpackage.go
rename to pkg/goformation/cloudformation/ask/alexa-ask-skill_skillpackage.go
index 18043b3d69..608967fe29 100644
--- a/goformation/cloudformation/ask/alexa-ask-skill_skillpackage.go
+++ b/pkg/goformation/cloudformation/ask/alexa-ask-skill_skillpackage.go
@@ -1,9 +1,9 @@
 package ask
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Skill_SkillPackage AWS CloudFormation Resource (Alexa::ASK::Skill.SkillPackage)
diff --git a/goformation/cloudformation/athena/aws-athena-datacatalog.go b/pkg/goformation/cloudformation/athena/aws-athena-datacatalog.go
similarity index 95%
rename from goformation/cloudformation/athena/aws-athena-datacatalog.go
rename to pkg/goformation/cloudformation/athena/aws-athena-datacatalog.go
index cb24ea2b53..4084682e5f 100644
--- a/goformation/cloudformation/athena/aws-athena-datacatalog.go
+++ b/pkg/goformation/cloudformation/athena/aws-athena-datacatalog.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataCatalog AWS CloudFormation Resource (AWS::Athena::DataCatalog)
diff --git a/goformation/cloudformation/athena/aws-athena-datacatalog_tags.go b/pkg/goformation/cloudformation/athena/aws-athena-datacatalog_tags.go
similarity index 90%
rename from goformation/cloudformation/athena/aws-athena-datacatalog_tags.go
rename to pkg/goformation/cloudformation/athena/aws-athena-datacatalog_tags.go
index 1ab4af1cef..e99c46736d 100644
--- a/goformation/cloudformation/athena/aws-athena-datacatalog_tags.go
+++ b/pkg/goformation/cloudformation/athena/aws-athena-datacatalog_tags.go
@@ -1,8 +1,8 @@
 package athena
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataCatalog_Tags AWS CloudFormation Resource (AWS::Athena::DataCatalog.Tags)
diff --git a/goformation/cloudformation/athena/aws-athena-namedquery.go b/pkg/goformation/cloudformation/athena/aws-athena-namedquery.go
similarity index 97%
rename from goformation/cloudformation/athena/aws-athena-namedquery.go
rename to pkg/goformation/cloudformation/athena/aws-athena-namedquery.go
index da2a5b712e..2a51675c08 100644
--- a/goformation/cloudformation/athena/aws-athena-namedquery.go
+++ b/pkg/goformation/cloudformation/athena/aws-athena-namedquery.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NamedQuery AWS CloudFormation Resource (AWS::Athena::NamedQuery)
diff --git a/goformation/cloudformation/athena/aws-athena-preparedstatement.go b/pkg/goformation/cloudformation/athena/aws-athena-preparedstatement.go
similarity index 97%
rename from goformation/cloudformation/athena/aws-athena-preparedstatement.go
rename to pkg/goformation/cloudformation/athena/aws-athena-preparedstatement.go
index 5a0e69d937..6aa0d14cb2 100644
--- a/goformation/cloudformation/athena/aws-athena-preparedstatement.go
+++ b/pkg/goformation/cloudformation/athena/aws-athena-preparedstatement.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PreparedStatement AWS CloudFormation Resource (AWS::Athena::PreparedStatement)
diff --git a/goformation/cloudformation/athena/aws-athena-workgroup.go b/pkg/goformation/cloudformation/athena/aws-athena-workgroup.go
similarity index 96%
rename from goformation/cloudformation/athena/aws-athena-workgroup.go
rename to pkg/goformation/cloudformation/athena/aws-athena-workgroup.go
index 55c5f2cf21..7a4c5ce481 100644
--- a/goformation/cloudformation/athena/aws-athena-workgroup.go
+++ b/pkg/goformation/cloudformation/athena/aws-athena-workgroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WorkGroup AWS CloudFormation Resource (AWS::Athena::WorkGroup)
diff --git a/goformation/cloudformation/athena/aws-athena-workgroup_encryptionconfiguration.go b/pkg/goformation/cloudformation/athena/aws-athena-workgroup_encryptionconfiguration.go
similarity index 93%
rename from goformation/cloudformation/athena/aws-athena-workgroup_encryptionconfiguration.go
rename to pkg/goformation/cloudformation/athena/aws-athena-workgroup_encryptionconfiguration.go
index 16a2e0e974..2fb8874c23 100644
--- a/goformation/cloudformation/athena/aws-athena-workgroup_encryptionconfiguration.go
+++ b/pkg/goformation/cloudformation/athena/aws-athena-workgroup_encryptionconfiguration.go
@@ -1,9 +1,9 @@
 package athena
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WorkGroup_EncryptionConfiguration AWS CloudFormation Resource (AWS::Athena::WorkGroup.EncryptionConfiguration)
diff --git a/goformation/cloudformation/athena/aws-athena-workgroup_engineversion.go b/pkg/goformation/cloudformation/athena/aws-athena-workgroup_engineversion.go
similarity index 93%
rename from goformation/cloudformation/athena/aws-athena-workgroup_engineversion.go
rename to pkg/goformation/cloudformation/athena/aws-athena-workgroup_engineversion.go
index 7cbefb61d4..e64bcd17f2 100644
--- a/goformation/cloudformation/athena/aws-athena-workgroup_engineversion.go
+++ b/pkg/goformation/cloudformation/athena/aws-athena-workgroup_engineversion.go
@@ -1,9 +1,9 @@
 package athena
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WorkGroup_EngineVersion AWS CloudFormation Resource (AWS::Athena::WorkGroup.EngineVersion)
diff --git a/goformation/cloudformation/athena/aws-athena-workgroup_resultconfiguration.go b/pkg/goformation/cloudformation/athena/aws-athena-workgroup_resultconfiguration.go
similarity index 93%
rename from goformation/cloudformation/athena/aws-athena-workgroup_resultconfiguration.go
rename to pkg/goformation/cloudformation/athena/aws-athena-workgroup_resultconfiguration.go
index 8ae616e5c7..33cfaa6f7b 100644
--- a/goformation/cloudformation/athena/aws-athena-workgroup_resultconfiguration.go
+++ b/pkg/goformation/cloudformation/athena/aws-athena-workgroup_resultconfiguration.go
@@ -1,9 +1,9 @@
 package athena
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WorkGroup_ResultConfiguration AWS CloudFormation Resource (AWS::Athena::WorkGroup.ResultConfiguration)
diff --git a/goformation/cloudformation/athena/aws-athena-workgroup_resultconfigurationupdates.go b/pkg/goformation/cloudformation/athena/aws-athena-workgroup_resultconfigurationupdates.go
similarity index 95%
rename from goformation/cloudformation/athena/aws-athena-workgroup_resultconfigurationupdates.go
rename to pkg/goformation/cloudformation/athena/aws-athena-workgroup_resultconfigurationupdates.go
index d6e3967f6a..51786fec34 100644
--- a/goformation/cloudformation/athena/aws-athena-workgroup_resultconfigurationupdates.go
+++ b/pkg/goformation/cloudformation/athena/aws-athena-workgroup_resultconfigurationupdates.go
@@ -1,9 +1,9 @@
 package athena
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WorkGroup_ResultConfigurationUpdates AWS CloudFormation Resource (AWS::Athena::WorkGroup.ResultConfigurationUpdates)
diff --git a/goformation/cloudformation/athena/aws-athena-workgroup_tags.go b/pkg/goformation/cloudformation/athena/aws-athena-workgroup_tags.go
similarity index 90%
rename from goformation/cloudformation/athena/aws-athena-workgroup_tags.go
rename to pkg/goformation/cloudformation/athena/aws-athena-workgroup_tags.go
index 65f7d4cc6b..efa27aa419 100644
--- a/goformation/cloudformation/athena/aws-athena-workgroup_tags.go
+++ b/pkg/goformation/cloudformation/athena/aws-athena-workgroup_tags.go
@@ -1,8 +1,8 @@
 package athena
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WorkGroup_Tags AWS CloudFormation Resource (AWS::Athena::WorkGroup.Tags)
diff --git a/goformation/cloudformation/athena/aws-athena-workgroup_workgroupconfiguration.go b/pkg/goformation/cloudformation/athena/aws-athena-workgroup_workgroupconfiguration.go
similarity index 96%
rename from goformation/cloudformation/athena/aws-athena-workgroup_workgroupconfiguration.go
rename to pkg/goformation/cloudformation/athena/aws-athena-workgroup_workgroupconfiguration.go
index 95fab1c404..13e01ddff8 100644
--- a/goformation/cloudformation/athena/aws-athena-workgroup_workgroupconfiguration.go
+++ b/pkg/goformation/cloudformation/athena/aws-athena-workgroup_workgroupconfiguration.go
@@ -1,9 +1,9 @@
 package athena
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WorkGroup_WorkGroupConfiguration AWS CloudFormation Resource (AWS::Athena::WorkGroup.WorkGroupConfiguration)
diff --git a/goformation/cloudformation/athena/aws-athena-workgroup_workgroupconfigurationupdates.go b/pkg/goformation/cloudformation/athena/aws-athena-workgroup_workgroupconfigurationupdates.go
similarity index 96%
rename from goformation/cloudformation/athena/aws-athena-workgroup_workgroupconfigurationupdates.go
rename to pkg/goformation/cloudformation/athena/aws-athena-workgroup_workgroupconfigurationupdates.go
index b4272acaf3..3331c01d04 100644
--- a/goformation/cloudformation/athena/aws-athena-workgroup_workgroupconfigurationupdates.go
+++ b/pkg/goformation/cloudformation/athena/aws-athena-workgroup_workgroupconfigurationupdates.go
@@ -1,9 +1,9 @@
 package athena
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WorkGroup_WorkGroupConfigurationUpdates AWS CloudFormation Resource (AWS::Athena::WorkGroup.WorkGroupConfigurationUpdates)
diff --git a/goformation/cloudformation/auditmanager/aws-auditmanager-assessment.go b/pkg/goformation/cloudformation/auditmanager/aws-auditmanager-assessment.go
similarity index 96%
rename from goformation/cloudformation/auditmanager/aws-auditmanager-assessment.go
rename to pkg/goformation/cloudformation/auditmanager/aws-auditmanager-assessment.go
index 37d0eae3cd..8be7395d73 100644
--- a/goformation/cloudformation/auditmanager/aws-auditmanager-assessment.go
+++ b/pkg/goformation/cloudformation/auditmanager/aws-auditmanager-assessment.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Assessment AWS CloudFormation Resource (AWS::AuditManager::Assessment)
diff --git a/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_assessmentreportsdestination.go b/pkg/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_assessmentreportsdestination.go
similarity index 93%
rename from goformation/cloudformation/auditmanager/aws-auditmanager-assessment_assessmentreportsdestination.go
rename to pkg/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_assessmentreportsdestination.go
index 14e1bb4137..1ed2b5061b 100644
--- a/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_assessmentreportsdestination.go
+++ b/pkg/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_assessmentreportsdestination.go
@@ -1,9 +1,9 @@
 package auditmanager
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Assessment_AssessmentReportsDestination AWS CloudFormation Resource (AWS::AuditManager::Assessment.AssessmentReportsDestination)
diff --git a/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_awsaccount.go b/pkg/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_awsaccount.go
similarity index 93%
rename from goformation/cloudformation/auditmanager/aws-auditmanager-assessment_awsaccount.go
rename to pkg/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_awsaccount.go
index 905f1fa4bd..3bed5fb5d8 100644
--- a/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_awsaccount.go
+++ b/pkg/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_awsaccount.go
@@ -1,9 +1,9 @@
 package auditmanager
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Assessment_AWSAccount AWS CloudFormation Resource (AWS::AuditManager::Assessment.AWSAccount)
diff --git a/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_awsservice.go b/pkg/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_awsservice.go
similarity index 91%
rename from goformation/cloudformation/auditmanager/aws-auditmanager-assessment_awsservice.go
rename to pkg/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_awsservice.go
index ecc46a9f72..6a393da6d5 100644
--- a/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_awsservice.go
+++ b/pkg/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_awsservice.go
@@ -1,9 +1,9 @@
 package auditmanager
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Assessment_AWSService AWS CloudFormation Resource (AWS::AuditManager::Assessment.AWSService)
diff --git a/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_delegation.go b/pkg/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_delegation.go
similarity index 96%
rename from goformation/cloudformation/auditmanager/aws-auditmanager-assessment_delegation.go
rename to pkg/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_delegation.go
index 6ead58be76..2e747e6de6 100644
--- a/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_delegation.go
+++ b/pkg/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_delegation.go
@@ -1,9 +1,9 @@
 package auditmanager
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Assessment_Delegation AWS CloudFormation Resource (AWS::AuditManager::Assessment.Delegation)
diff --git a/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_role.go b/pkg/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_role.go
similarity index 92%
rename from goformation/cloudformation/auditmanager/aws-auditmanager-assessment_role.go
rename to pkg/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_role.go
index c521232ffd..1e75d32306 100644
--- a/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_role.go
+++ b/pkg/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_role.go
@@ -1,9 +1,9 @@
 package auditmanager
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Assessment_Role AWS CloudFormation Resource (AWS::AuditManager::Assessment.Role)
diff --git a/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_scope.go b/pkg/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_scope.go
similarity index 96%
rename from goformation/cloudformation/auditmanager/aws-auditmanager-assessment_scope.go
rename to pkg/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_scope.go
index dd814f6e1a..8a7b8311c1 100644
--- a/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_scope.go
+++ b/pkg/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_scope.go
@@ -1,7 +1,7 @@
 package auditmanager
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Assessment_Scope AWS CloudFormation Resource (AWS::AuditManager::Assessment.Scope)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup.go
similarity index 98%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup.go
index 5410a5678e..0a953a6403 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AutoScalingGroup AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_acceleratorcountrequest.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_acceleratorcountrequest.go
similarity index 93%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_acceleratorcountrequest.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_acceleratorcountrequest.go
index 833d3a6f22..2b42116c23 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_acceleratorcountrequest.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_acceleratorcountrequest.go
@@ -1,9 +1,9 @@
 package autoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AutoScalingGroup_AcceleratorCountRequest AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.AcceleratorCountRequest)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_acceleratortotalmemorymibrequest.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_acceleratortotalmemorymibrequest.go
similarity index 93%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_acceleratortotalmemorymibrequest.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_acceleratortotalmemorymibrequest.go
index 6d0ff32404..28a45118a7 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_acceleratortotalmemorymibrequest.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_acceleratortotalmemorymibrequest.go
@@ -1,9 +1,9 @@
 package autoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AutoScalingGroup_AcceleratorTotalMemoryMiBRequest AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.AcceleratorTotalMemoryMiBRequest)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_baselineebsbandwidthmbpsrequest.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_baselineebsbandwidthmbpsrequest.go
similarity index 93%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_baselineebsbandwidthmbpsrequest.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_baselineebsbandwidthmbpsrequest.go
index 2840f0e69a..a1e2f51d4b 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_baselineebsbandwidthmbpsrequest.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_baselineebsbandwidthmbpsrequest.go
@@ -1,9 +1,9 @@
 package autoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AutoScalingGroup_BaselineEbsBandwidthMbpsRequest AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.BaselineEbsBandwidthMbpsRequest)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_instancerequirements.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_instancerequirements.go
similarity index 98%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_instancerequirements.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_instancerequirements.go
index 6f0827aead..3618950827 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_instancerequirements.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_instancerequirements.go
@@ -1,9 +1,9 @@
 package autoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AutoScalingGroup_InstanceRequirements AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.InstanceRequirements)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_instancesdistribution.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_instancesdistribution.go
similarity index 96%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_instancesdistribution.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_instancesdistribution.go
index dc9e3d2827..6ad46157b8 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_instancesdistribution.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_instancesdistribution.go
@@ -1,9 +1,9 @@
 package autoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AutoScalingGroup_InstancesDistribution AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.InstancesDistribution)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplate.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplate.go
similarity index 96%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplate.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplate.go
index 95c1d67be8..7d67dc55e6 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplate.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplate.go
@@ -1,7 +1,7 @@
 package autoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AutoScalingGroup_LaunchTemplate AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.LaunchTemplate)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplateoverrides.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplateoverrides.go
similarity index 95%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplateoverrides.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplateoverrides.go
index 9a1dd9a7dc..5de7b0f58e 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplateoverrides.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplateoverrides.go
@@ -1,9 +1,9 @@
 package autoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AutoScalingGroup_LaunchTemplateOverrides AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.LaunchTemplateOverrides)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplatespecification.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplatespecification.go
similarity index 94%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplatespecification.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplatespecification.go
index f43696bf33..0334e98ad7 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplatespecification.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplatespecification.go
@@ -1,9 +1,9 @@
 package autoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AutoScalingGroup_LaunchTemplateSpecification AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.LaunchTemplateSpecification)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_lifecyclehookspecification.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_lifecyclehookspecification.go
similarity index 96%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_lifecyclehookspecification.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_lifecyclehookspecification.go
index b47a8a0658..2fe65fb0a7 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_lifecyclehookspecification.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_lifecyclehookspecification.go
@@ -1,9 +1,9 @@
 package autoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AutoScalingGroup_LifecycleHookSpecification AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.LifecycleHookSpecification)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_memorygibpervcpurequest.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_memorygibpervcpurequest.go
similarity index 93%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_memorygibpervcpurequest.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_memorygibpervcpurequest.go
index 3eb73075b7..1b4e391b3b 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_memorygibpervcpurequest.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_memorygibpervcpurequest.go
@@ -1,9 +1,9 @@
 package autoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AutoScalingGroup_MemoryGiBPerVCpuRequest AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.MemoryGiBPerVCpuRequest)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_memorymibrequest.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_memorymibrequest.go
similarity index 93%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_memorymibrequest.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_memorymibrequest.go
index 6e6277139b..d32f7d94cb 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_memorymibrequest.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_memorymibrequest.go
@@ -1,9 +1,9 @@
 package autoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AutoScalingGroup_MemoryMiBRequest AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.MemoryMiBRequest)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_metricscollection.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_metricscollection.go
similarity index 92%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_metricscollection.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_metricscollection.go
index 8d8f65a4cb..98633bc16e 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_metricscollection.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_metricscollection.go
@@ -1,9 +1,9 @@
 package autoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AutoScalingGroup_MetricsCollection AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.MetricsCollection)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_mixedinstancespolicy.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_mixedinstancespolicy.go
similarity index 96%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_mixedinstancespolicy.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_mixedinstancespolicy.go
index 025f9f45a7..f9ccff6a26 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_mixedinstancespolicy.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_mixedinstancespolicy.go
@@ -1,7 +1,7 @@
 package autoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AutoScalingGroup_MixedInstancesPolicy AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.MixedInstancesPolicy)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_networkinterfacecountrequest.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_networkinterfacecountrequest.go
similarity index 93%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_networkinterfacecountrequest.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_networkinterfacecountrequest.go
index a37099adc6..8f86d5a9ac 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_networkinterfacecountrequest.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_networkinterfacecountrequest.go
@@ -1,9 +1,9 @@
 package autoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AutoScalingGroup_NetworkInterfaceCountRequest AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.NetworkInterfaceCountRequest)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_notificationconfiguration.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_notificationconfiguration.go
similarity index 93%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_notificationconfiguration.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_notificationconfiguration.go
index 28d6b6d79f..6753acde0b 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_notificationconfiguration.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_notificationconfiguration.go
@@ -1,9 +1,9 @@
 package autoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AutoScalingGroup_NotificationConfiguration AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.NotificationConfiguration)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_tagproperty.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_tagproperty.go
similarity index 93%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_tagproperty.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_tagproperty.go
index a4dbee2def..711aac052e 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_tagproperty.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_tagproperty.go
@@ -1,9 +1,9 @@
 package autoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AutoScalingGroup_TagProperty AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.TagProperty)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_totallocalstoragegbrequest.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_totallocalstoragegbrequest.go
similarity index 93%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_totallocalstoragegbrequest.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_totallocalstoragegbrequest.go
index 60cd4f3cec..75bf160c00 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_totallocalstoragegbrequest.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_totallocalstoragegbrequest.go
@@ -1,9 +1,9 @@
 package autoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AutoScalingGroup_TotalLocalStorageGBRequest AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.TotalLocalStorageGBRequest)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_vcpucountrequest.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_vcpucountrequest.go
similarity index 93%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_vcpucountrequest.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_vcpucountrequest.go
index cc391f17ed..111a8ba465 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_vcpucountrequest.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_vcpucountrequest.go
@@ -1,9 +1,9 @@
 package autoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AutoScalingGroup_VCpuCountRequest AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.VCpuCountRequest)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration.go
similarity index 98%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration.go
index 302d6edfbe..963a809a8a 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchConfiguration AWS CloudFormation Resource (AWS::AutoScaling::LaunchConfiguration)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_blockdevice.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_blockdevice.go
similarity index 95%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_blockdevice.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_blockdevice.go
index 1287c258e7..69b2ea7a4e 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_blockdevice.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_blockdevice.go
@@ -1,9 +1,9 @@
 package autoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchConfiguration_BlockDevice AWS CloudFormation Resource (AWS::AutoScaling::LaunchConfiguration.BlockDevice)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_blockdevicemapping.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_blockdevicemapping.go
similarity index 94%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_blockdevicemapping.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_blockdevicemapping.go
index 8b4f69fdba..2c3fb9f56d 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_blockdevicemapping.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_blockdevicemapping.go
@@ -1,9 +1,9 @@
 package autoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchConfiguration_BlockDeviceMapping AWS CloudFormation Resource (AWS::AutoScaling::LaunchConfiguration.BlockDeviceMapping)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_metadataoption.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_metadataoption.go
similarity index 94%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_metadataoption.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_metadataoption.go
index e8697a3a3d..87c5f9288d 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_metadataoption.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_metadataoption.go
@@ -1,9 +1,9 @@
 package autoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchConfiguration_MetadataOption AWS CloudFormation Resource (AWS::AutoScaling::LaunchConfiguration.MetadataOption)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_metadataoptions.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_metadataoptions.go
similarity index 94%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_metadataoptions.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_metadataoptions.go
index 422e2fe6b8..ffe46f5294 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_metadataoptions.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_metadataoptions.go
@@ -1,9 +1,9 @@
 package autoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchConfiguration_MetadataOptions AWS CloudFormation Resource (AWS::AutoScaling::LaunchConfiguration.MetadataOptions)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-lifecyclehook.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-lifecyclehook.go
similarity index 97%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-lifecyclehook.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-lifecyclehook.go
index ec39da458c..f299f41d0e 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-lifecyclehook.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-lifecyclehook.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LifecycleHook AWS CloudFormation Resource (AWS::AutoScaling::LifecycleHook)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy.go
similarity index 98%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy.go
index 5abc147434..d68c170143 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScalingPolicy AWS CloudFormation Resource (AWS::AutoScaling::ScalingPolicy)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_customizedmetricspecification.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_customizedmetricspecification.go
similarity index 95%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_customizedmetricspecification.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_customizedmetricspecification.go
index d6f49e0acb..d8853c4337 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_customizedmetricspecification.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_customizedmetricspecification.go
@@ -1,9 +1,9 @@
 package autoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScalingPolicy_CustomizedMetricSpecification AWS CloudFormation Resource (AWS::AutoScaling::ScalingPolicy.CustomizedMetricSpecification)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_metricdimension.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_metricdimension.go
similarity index 93%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_metricdimension.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_metricdimension.go
index 474435ee5d..087c861d76 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_metricdimension.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_metricdimension.go
@@ -1,9 +1,9 @@
 package autoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScalingPolicy_MetricDimension AWS CloudFormation Resource (AWS::AutoScaling::ScalingPolicy.MetricDimension)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predefinedmetricspecification.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predefinedmetricspecification.go
similarity index 93%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predefinedmetricspecification.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predefinedmetricspecification.go
index b6fdc7ddd1..44baa23d02 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predefinedmetricspecification.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predefinedmetricspecification.go
@@ -1,9 +1,9 @@
 package autoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScalingPolicy_PredefinedMetricSpecification AWS CloudFormation Resource (AWS::AutoScaling::ScalingPolicy.PredefinedMetricSpecification)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingconfiguration.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingconfiguration.go
similarity index 95%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingconfiguration.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingconfiguration.go
index 8abf876e5a..a164792638 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingconfiguration.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingconfiguration.go
@@ -1,9 +1,9 @@
 package autoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScalingPolicy_PredictiveScalingConfiguration AWS CloudFormation Resource (AWS::AutoScaling::ScalingPolicy.PredictiveScalingConfiguration)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingmetricspecification.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingmetricspecification.go
similarity index 95%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingmetricspecification.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingmetricspecification.go
index 97267fe66d..f39fb38955 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingmetricspecification.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingmetricspecification.go
@@ -1,9 +1,9 @@
 package autoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScalingPolicy_PredictiveScalingMetricSpecification AWS CloudFormation Resource (AWS::AutoScaling::ScalingPolicy.PredictiveScalingMetricSpecification)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedloadmetric.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedloadmetric.go
similarity index 93%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedloadmetric.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedloadmetric.go
index 1d743e85ed..309cc42637 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedloadmetric.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedloadmetric.go
@@ -1,9 +1,9 @@
 package autoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScalingPolicy_PredictiveScalingPredefinedLoadMetric AWS CloudFormation Resource (AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedLoadMetric)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedmetricpair.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedmetricpair.go
similarity index 93%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedmetricpair.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedmetricpair.go
index 3e50659543..c6b3f19e85 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedmetricpair.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedmetricpair.go
@@ -1,9 +1,9 @@
 package autoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScalingPolicy_PredictiveScalingPredefinedMetricPair AWS CloudFormation Resource (AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedMetricPair)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedscalingmetric.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedscalingmetric.go
similarity index 94%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedscalingmetric.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedscalingmetric.go
index bd4ffb4881..3793e1789b 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedscalingmetric.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedscalingmetric.go
@@ -1,9 +1,9 @@
 package autoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScalingPolicy_PredictiveScalingPredefinedScalingMetric AWS CloudFormation Resource (AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedScalingMetric)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_stepadjustment.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_stepadjustment.go
similarity index 94%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_stepadjustment.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_stepadjustment.go
index 7372599557..238c8938f3 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_stepadjustment.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_stepadjustment.go
@@ -1,9 +1,9 @@
 package autoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScalingPolicy_StepAdjustment AWS CloudFormation Resource (AWS::AutoScaling::ScalingPolicy.StepAdjustment)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_targettrackingconfiguration.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_targettrackingconfiguration.go
similarity index 95%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_targettrackingconfiguration.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_targettrackingconfiguration.go
index 06dd80b4d3..3208742c24 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_targettrackingconfiguration.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_targettrackingconfiguration.go
@@ -1,9 +1,9 @@
 package autoscaling
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScalingPolicy_TargetTrackingConfiguration AWS CloudFormation Resource (AWS::AutoScaling::ScalingPolicy.TargetTrackingConfiguration)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-scheduledaction.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scheduledaction.go
similarity index 97%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-scheduledaction.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scheduledaction.go
index 7593a909ad..26502cc332 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-scheduledaction.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-scheduledaction.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScheduledAction AWS CloudFormation Resource (AWS::AutoScaling::ScheduledAction)
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-warmpool.go b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-warmpool.go
similarity index 97%
rename from goformation/cloudformation/autoscaling/aws-autoscaling-warmpool.go
rename to pkg/goformation/cloudformation/autoscaling/aws-autoscaling-warmpool.go
index fbb5aa649d..6b58c1c057 100644
--- a/goformation/cloudformation/autoscaling/aws-autoscaling-warmpool.go
+++ b/pkg/goformation/cloudformation/autoscaling/aws-autoscaling-warmpool.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WarmPool AWS CloudFormation Resource (AWS::AutoScaling::WarmPool)
diff --git a/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan.go b/pkg/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan.go
similarity index 98%
rename from goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan.go
rename to pkg/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan.go
index 54c4212ae3..2a5f71cc7c 100644
--- a/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan.go
+++ b/pkg/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScalingPlan AWS CloudFormation Resource (AWS::AutoScalingPlans::ScalingPlan)
diff --git a/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_applicationsource.go b/pkg/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_applicationsource.go
similarity index 93%
rename from goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_applicationsource.go
rename to pkg/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_applicationsource.go
index 0e853eb2d6..2ce70be23b 100644
--- a/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_applicationsource.go
+++ b/pkg/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_applicationsource.go
@@ -1,9 +1,9 @@
 package autoscalingplans
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScalingPlan_ApplicationSource AWS CloudFormation Resource (AWS::AutoScalingPlans::ScalingPlan.ApplicationSource)
diff --git a/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_customizedloadmetricspecification.go b/pkg/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_customizedloadmetricspecification.go
similarity index 95%
rename from goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_customizedloadmetricspecification.go
rename to pkg/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_customizedloadmetricspecification.go
index 798d458ec5..3ea4830e42 100644
--- a/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_customizedloadmetricspecification.go
+++ b/pkg/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_customizedloadmetricspecification.go
@@ -1,9 +1,9 @@
 package autoscalingplans
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScalingPlan_CustomizedLoadMetricSpecification AWS CloudFormation Resource (AWS::AutoScalingPlans::ScalingPlan.CustomizedLoadMetricSpecification)
diff --git a/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_customizedscalingmetricspecification.go b/pkg/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_customizedscalingmetricspecification.go
similarity index 95%
rename from goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_customizedscalingmetricspecification.go
rename to pkg/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_customizedscalingmetricspecification.go
index 592a9ad464..08aca82cd8 100644
--- a/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_customizedscalingmetricspecification.go
+++ b/pkg/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_customizedscalingmetricspecification.go
@@ -1,9 +1,9 @@
 package autoscalingplans
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScalingPlan_CustomizedScalingMetricSpecification AWS CloudFormation Resource (AWS::AutoScalingPlans::ScalingPlan.CustomizedScalingMetricSpecification)
diff --git a/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_metricdimension.go b/pkg/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_metricdimension.go
similarity index 93%
rename from goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_metricdimension.go
rename to pkg/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_metricdimension.go
index fb92266f1d..5e48648372 100644
--- a/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_metricdimension.go
+++ b/pkg/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_metricdimension.go
@@ -1,9 +1,9 @@
 package autoscalingplans
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScalingPlan_MetricDimension AWS CloudFormation Resource (AWS::AutoScalingPlans::ScalingPlan.MetricDimension)
diff --git a/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_predefinedloadmetricspecification.go b/pkg/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_predefinedloadmetricspecification.go
similarity index 93%
rename from goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_predefinedloadmetricspecification.go
rename to pkg/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_predefinedloadmetricspecification.go
index 1ab6de4940..37420a92e8 100644
--- a/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_predefinedloadmetricspecification.go
+++ b/pkg/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_predefinedloadmetricspecification.go
@@ -1,9 +1,9 @@
 package autoscalingplans
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScalingPlan_PredefinedLoadMetricSpecification AWS CloudFormation Resource (AWS::AutoScalingPlans::ScalingPlan.PredefinedLoadMetricSpecification)
diff --git a/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_predefinedscalingmetricspecification.go b/pkg/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_predefinedscalingmetricspecification.go
similarity index 94%
rename from goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_predefinedscalingmetricspecification.go
rename to pkg/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_predefinedscalingmetricspecification.go
index a401aa242f..fdf9b74520 100644
--- a/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_predefinedscalingmetricspecification.go
+++ b/pkg/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_predefinedscalingmetricspecification.go
@@ -1,9 +1,9 @@
 package autoscalingplans
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScalingPlan_PredefinedScalingMetricSpecification AWS CloudFormation Resource (AWS::AutoScalingPlans::ScalingPlan.PredefinedScalingMetricSpecification)
diff --git a/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_scalinginstruction.go b/pkg/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_scalinginstruction.go
similarity index 97%
rename from goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_scalinginstruction.go
rename to pkg/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_scalinginstruction.go
index ef83f4804d..400cb81b94 100644
--- a/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_scalinginstruction.go
+++ b/pkg/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_scalinginstruction.go
@@ -1,9 +1,9 @@
 package autoscalingplans
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScalingPlan_ScalingInstruction AWS CloudFormation Resource (AWS::AutoScalingPlans::ScalingPlan.ScalingInstruction)
diff --git a/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_tagfilter.go b/pkg/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_tagfilter.go
similarity index 92%
rename from goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_tagfilter.go
rename to pkg/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_tagfilter.go
index 29ac326647..4b4b63b27c 100644
--- a/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_tagfilter.go
+++ b/pkg/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_tagfilter.go
@@ -1,9 +1,9 @@
 package autoscalingplans
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScalingPlan_TagFilter AWS CloudFormation Resource (AWS::AutoScalingPlans::ScalingPlan.TagFilter)
diff --git a/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_targettrackingconfiguration.go b/pkg/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_targettrackingconfiguration.go
similarity index 96%
rename from goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_targettrackingconfiguration.go
rename to pkg/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_targettrackingconfiguration.go
index 5035537e98..972d47bad3 100644
--- a/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_targettrackingconfiguration.go
+++ b/pkg/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_targettrackingconfiguration.go
@@ -1,9 +1,9 @@
 package autoscalingplans
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScalingPlan_TargetTrackingConfiguration AWS CloudFormation Resource (AWS::AutoScalingPlans::ScalingPlan.TargetTrackingConfiguration)
diff --git a/goformation/cloudformation/backup/aws-backup-backupplan.go b/pkg/goformation/cloudformation/backup/aws-backup-backupplan.go
similarity index 96%
rename from goformation/cloudformation/backup/aws-backup-backupplan.go
rename to pkg/goformation/cloudformation/backup/aws-backup-backupplan.go
index ce8bb6f5e7..d3ab4c4150 100644
--- a/goformation/cloudformation/backup/aws-backup-backupplan.go
+++ b/pkg/goformation/cloudformation/backup/aws-backup-backupplan.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // BackupPlan AWS CloudFormation Resource (AWS::Backup::BackupPlan)
diff --git a/goformation/cloudformation/backup/aws-backup-backupplan_advancedbackupsettingresourcetype.go b/pkg/goformation/cloudformation/backup/aws-backup-backupplan_advancedbackupsettingresourcetype.go
similarity index 93%
rename from goformation/cloudformation/backup/aws-backup-backupplan_advancedbackupsettingresourcetype.go
rename to pkg/goformation/cloudformation/backup/aws-backup-backupplan_advancedbackupsettingresourcetype.go
index 3aa9d6c591..b4cc2e5b7d 100644
--- a/goformation/cloudformation/backup/aws-backup-backupplan_advancedbackupsettingresourcetype.go
+++ b/pkg/goformation/cloudformation/backup/aws-backup-backupplan_advancedbackupsettingresourcetype.go
@@ -1,9 +1,9 @@
 package backup
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // BackupPlan_AdvancedBackupSettingResourceType AWS CloudFormation Resource (AWS::Backup::BackupPlan.AdvancedBackupSettingResourceType)
diff --git a/goformation/cloudformation/backup/aws-backup-backupplan_backupplanresourcetype.go b/pkg/goformation/cloudformation/backup/aws-backup-backupplan_backupplanresourcetype.go
similarity index 94%
rename from goformation/cloudformation/backup/aws-backup-backupplan_backupplanresourcetype.go
rename to pkg/goformation/cloudformation/backup/aws-backup-backupplan_backupplanresourcetype.go
index 14bf8d7941..554c5161c5 100644
--- a/goformation/cloudformation/backup/aws-backup-backupplan_backupplanresourcetype.go
+++ b/pkg/goformation/cloudformation/backup/aws-backup-backupplan_backupplanresourcetype.go
@@ -1,9 +1,9 @@
 package backup
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // BackupPlan_BackupPlanResourceType AWS CloudFormation Resource (AWS::Backup::BackupPlan.BackupPlanResourceType)
diff --git a/goformation/cloudformation/backup/aws-backup-backupplan_backupruleresourcetype.go b/pkg/goformation/cloudformation/backup/aws-backup-backupplan_backupruleresourcetype.go
similarity index 96%
rename from goformation/cloudformation/backup/aws-backup-backupplan_backupruleresourcetype.go
rename to pkg/goformation/cloudformation/backup/aws-backup-backupplan_backupruleresourcetype.go
index b537b7fad0..587073db17 100644
--- a/goformation/cloudformation/backup/aws-backup-backupplan_backupruleresourcetype.go
+++ b/pkg/goformation/cloudformation/backup/aws-backup-backupplan_backupruleresourcetype.go
@@ -1,9 +1,9 @@
 package backup
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // BackupPlan_BackupRuleResourceType AWS CloudFormation Resource (AWS::Backup::BackupPlan.BackupRuleResourceType)
diff --git a/goformation/cloudformation/backup/aws-backup-backupplan_copyactionresourcetype.go b/pkg/goformation/cloudformation/backup/aws-backup-backupplan_copyactionresourcetype.go
similarity index 93%
rename from goformation/cloudformation/backup/aws-backup-backupplan_copyactionresourcetype.go
rename to pkg/goformation/cloudformation/backup/aws-backup-backupplan_copyactionresourcetype.go
index 0cdccdcf12..5f2b2e8154 100644
--- a/goformation/cloudformation/backup/aws-backup-backupplan_copyactionresourcetype.go
+++ b/pkg/goformation/cloudformation/backup/aws-backup-backupplan_copyactionresourcetype.go
@@ -1,9 +1,9 @@
 package backup
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // BackupPlan_CopyActionResourceType AWS CloudFormation Resource (AWS::Backup::BackupPlan.CopyActionResourceType)
diff --git a/goformation/cloudformation/backup/aws-backup-backupplan_lifecycleresourcetype.go b/pkg/goformation/cloudformation/backup/aws-backup-backupplan_lifecycleresourcetype.go
similarity index 93%
rename from goformation/cloudformation/backup/aws-backup-backupplan_lifecycleresourcetype.go
rename to pkg/goformation/cloudformation/backup/aws-backup-backupplan_lifecycleresourcetype.go
index 1889b7a008..e9b86121cc 100644
--- a/goformation/cloudformation/backup/aws-backup-backupplan_lifecycleresourcetype.go
+++ b/pkg/goformation/cloudformation/backup/aws-backup-backupplan_lifecycleresourcetype.go
@@ -1,9 +1,9 @@
 package backup
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // BackupPlan_LifecycleResourceType AWS CloudFormation Resource (AWS::Backup::BackupPlan.LifecycleResourceType)
diff --git a/goformation/cloudformation/backup/aws-backup-backupselection.go b/pkg/goformation/cloudformation/backup/aws-backup-backupselection.go
similarity index 96%
rename from goformation/cloudformation/backup/aws-backup-backupselection.go
rename to pkg/goformation/cloudformation/backup/aws-backup-backupselection.go
index 56a56d48d8..9fdfce1068 100644
--- a/goformation/cloudformation/backup/aws-backup-backupselection.go
+++ b/pkg/goformation/cloudformation/backup/aws-backup-backupselection.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // BackupSelection AWS CloudFormation Resource (AWS::Backup::BackupSelection)
diff --git a/goformation/cloudformation/backup/aws-backup-backupselection_backupselectionresourcetype.go b/pkg/goformation/cloudformation/backup/aws-backup-backupselection_backupselectionresourcetype.go
similarity index 95%
rename from goformation/cloudformation/backup/aws-backup-backupselection_backupselectionresourcetype.go
rename to pkg/goformation/cloudformation/backup/aws-backup-backupselection_backupselectionresourcetype.go
index 6157e8fb09..3931de8366 100644
--- a/goformation/cloudformation/backup/aws-backup-backupselection_backupselectionresourcetype.go
+++ b/pkg/goformation/cloudformation/backup/aws-backup-backupselection_backupselectionresourcetype.go
@@ -1,9 +1,9 @@
 package backup
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // BackupSelection_BackupSelectionResourceType AWS CloudFormation Resource (AWS::Backup::BackupSelection.BackupSelectionResourceType)
diff --git a/goformation/cloudformation/backup/aws-backup-backupselection_conditionresourcetype.go b/pkg/goformation/cloudformation/backup/aws-backup-backupselection_conditionresourcetype.go
similarity index 94%
rename from goformation/cloudformation/backup/aws-backup-backupselection_conditionresourcetype.go
rename to pkg/goformation/cloudformation/backup/aws-backup-backupselection_conditionresourcetype.go
index f36c1acf66..4f3dfba392 100644
--- a/goformation/cloudformation/backup/aws-backup-backupselection_conditionresourcetype.go
+++ b/pkg/goformation/cloudformation/backup/aws-backup-backupselection_conditionresourcetype.go
@@ -1,9 +1,9 @@
 package backup
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // BackupSelection_ConditionResourceType AWS CloudFormation Resource (AWS::Backup::BackupSelection.ConditionResourceType)
diff --git a/goformation/cloudformation/backup/aws-backup-backupvault.go b/pkg/goformation/cloudformation/backup/aws-backup-backupvault.go
similarity index 97%
rename from goformation/cloudformation/backup/aws-backup-backupvault.go
rename to pkg/goformation/cloudformation/backup/aws-backup-backupvault.go
index 265bc82bdb..f2b26cbb11 100644
--- a/goformation/cloudformation/backup/aws-backup-backupvault.go
+++ b/pkg/goformation/cloudformation/backup/aws-backup-backupvault.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // BackupVault AWS CloudFormation Resource (AWS::Backup::BackupVault)
diff --git a/goformation/cloudformation/backup/aws-backup-backupvault_lockconfigurationtype.go b/pkg/goformation/cloudformation/backup/aws-backup-backupvault_lockconfigurationtype.go
similarity index 94%
rename from goformation/cloudformation/backup/aws-backup-backupvault_lockconfigurationtype.go
rename to pkg/goformation/cloudformation/backup/aws-backup-backupvault_lockconfigurationtype.go
index 126bf190c5..7a09957390 100644
--- a/goformation/cloudformation/backup/aws-backup-backupvault_lockconfigurationtype.go
+++ b/pkg/goformation/cloudformation/backup/aws-backup-backupvault_lockconfigurationtype.go
@@ -1,9 +1,9 @@
 package backup
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // BackupVault_LockConfigurationType AWS CloudFormation Resource (AWS::Backup::BackupVault.LockConfigurationType)
diff --git a/goformation/cloudformation/backup/aws-backup-backupvault_notificationobjecttype.go b/pkg/goformation/cloudformation/backup/aws-backup-backupvault_notificationobjecttype.go
similarity index 93%
rename from goformation/cloudformation/backup/aws-backup-backupvault_notificationobjecttype.go
rename to pkg/goformation/cloudformation/backup/aws-backup-backupvault_notificationobjecttype.go
index 0f1ec9743d..11e2b4acdb 100644
--- a/goformation/cloudformation/backup/aws-backup-backupvault_notificationobjecttype.go
+++ b/pkg/goformation/cloudformation/backup/aws-backup-backupvault_notificationobjecttype.go
@@ -1,9 +1,9 @@
 package backup
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // BackupVault_NotificationObjectType AWS CloudFormation Resource (AWS::Backup::BackupVault.NotificationObjectType)
diff --git a/goformation/cloudformation/backup/aws-backup-framework.go b/pkg/goformation/cloudformation/backup/aws-backup-framework.go
similarity index 95%
rename from goformation/cloudformation/backup/aws-backup-framework.go
rename to pkg/goformation/cloudformation/backup/aws-backup-framework.go
index 4087cbfb79..b03d9ce575 100644
--- a/goformation/cloudformation/backup/aws-backup-framework.go
+++ b/pkg/goformation/cloudformation/backup/aws-backup-framework.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Framework AWS CloudFormation Resource (AWS::Backup::Framework)
diff --git a/goformation/cloudformation/backup/aws-backup-framework_controlinputparameter.go b/pkg/goformation/cloudformation/backup/aws-backup-framework_controlinputparameter.go
similarity index 93%
rename from goformation/cloudformation/backup/aws-backup-framework_controlinputparameter.go
rename to pkg/goformation/cloudformation/backup/aws-backup-framework_controlinputparameter.go
index 878699f7e8..2e415c09f6 100644
--- a/goformation/cloudformation/backup/aws-backup-framework_controlinputparameter.go
+++ b/pkg/goformation/cloudformation/backup/aws-backup-framework_controlinputparameter.go
@@ -1,9 +1,9 @@
 package backup
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Framework_ControlInputParameter AWS CloudFormation Resource (AWS::Backup::Framework.ControlInputParameter)
diff --git a/goformation/cloudformation/backup/aws-backup-framework_frameworkcontrol.go b/pkg/goformation/cloudformation/backup/aws-backup-framework_frameworkcontrol.go
similarity index 94%
rename from goformation/cloudformation/backup/aws-backup-framework_frameworkcontrol.go
rename to pkg/goformation/cloudformation/backup/aws-backup-framework_frameworkcontrol.go
index 2a58a31f82..d92072786c 100644
--- a/goformation/cloudformation/backup/aws-backup-framework_frameworkcontrol.go
+++ b/pkg/goformation/cloudformation/backup/aws-backup-framework_frameworkcontrol.go
@@ -1,9 +1,9 @@
 package backup
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Framework_FrameworkControl AWS CloudFormation Resource (AWS::Backup::Framework.FrameworkControl)
diff --git a/goformation/cloudformation/backup/aws-backup-reportplan.go b/pkg/goformation/cloudformation/backup/aws-backup-reportplan.go
similarity index 95%
rename from goformation/cloudformation/backup/aws-backup-reportplan.go
rename to pkg/goformation/cloudformation/backup/aws-backup-reportplan.go
index e5f63d824e..7bba24c853 100644
--- a/goformation/cloudformation/backup/aws-backup-reportplan.go
+++ b/pkg/goformation/cloudformation/backup/aws-backup-reportplan.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReportPlan AWS CloudFormation Resource (AWS::Backup::ReportPlan)
diff --git a/goformation/cloudformation/batch/aws-batch-computeenvironment.go b/pkg/goformation/cloudformation/batch/aws-batch-computeenvironment.go
similarity index 97%
rename from goformation/cloudformation/batch/aws-batch-computeenvironment.go
rename to pkg/goformation/cloudformation/batch/aws-batch-computeenvironment.go
index 07ea7ad877..d1277c3152 100644
--- a/goformation/cloudformation/batch/aws-batch-computeenvironment.go
+++ b/pkg/goformation/cloudformation/batch/aws-batch-computeenvironment.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ComputeEnvironment AWS CloudFormation Resource (AWS::Batch::ComputeEnvironment)
diff --git a/goformation/cloudformation/batch/aws-batch-computeenvironment_computeresources.go b/pkg/goformation/cloudformation/batch/aws-batch-computeenvironment_computeresources.go
similarity index 97%
rename from goformation/cloudformation/batch/aws-batch-computeenvironment_computeresources.go
rename to pkg/goformation/cloudformation/batch/aws-batch-computeenvironment_computeresources.go
index 751cfdf108..1c61edd3bc 100644
--- a/goformation/cloudformation/batch/aws-batch-computeenvironment_computeresources.go
+++ b/pkg/goformation/cloudformation/batch/aws-batch-computeenvironment_computeresources.go
@@ -1,9 +1,9 @@
 package batch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ComputeEnvironment_ComputeResources AWS CloudFormation Resource (AWS::Batch::ComputeEnvironment.ComputeResources)
diff --git a/goformation/cloudformation/batch/aws-batch-computeenvironment_ec2configurationobject.go b/pkg/goformation/cloudformation/batch/aws-batch-computeenvironment_ec2configurationobject.go
similarity index 93%
rename from goformation/cloudformation/batch/aws-batch-computeenvironment_ec2configurationobject.go
rename to pkg/goformation/cloudformation/batch/aws-batch-computeenvironment_ec2configurationobject.go
index bffc77b481..b1e1480109 100644
--- a/goformation/cloudformation/batch/aws-batch-computeenvironment_ec2configurationobject.go
+++ b/pkg/goformation/cloudformation/batch/aws-batch-computeenvironment_ec2configurationobject.go
@@ -1,9 +1,9 @@
 package batch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ComputeEnvironment_Ec2ConfigurationObject AWS CloudFormation Resource (AWS::Batch::ComputeEnvironment.Ec2ConfigurationObject)
diff --git a/goformation/cloudformation/batch/aws-batch-computeenvironment_launchtemplatespecification.go b/pkg/goformation/cloudformation/batch/aws-batch-computeenvironment_launchtemplatespecification.go
similarity index 94%
rename from goformation/cloudformation/batch/aws-batch-computeenvironment_launchtemplatespecification.go
rename to pkg/goformation/cloudformation/batch/aws-batch-computeenvironment_launchtemplatespecification.go
index ccb88806ec..27a143b75a 100644
--- a/goformation/cloudformation/batch/aws-batch-computeenvironment_launchtemplatespecification.go
+++ b/pkg/goformation/cloudformation/batch/aws-batch-computeenvironment_launchtemplatespecification.go
@@ -1,9 +1,9 @@
 package batch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ComputeEnvironment_LaunchTemplateSpecification AWS CloudFormation Resource (AWS::Batch::ComputeEnvironment.LaunchTemplateSpecification)
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition.go b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition.go
similarity index 97%
rename from goformation/cloudformation/batch/aws-batch-jobdefinition.go
rename to pkg/goformation/cloudformation/batch/aws-batch-jobdefinition.go
index 51fe52f456..cce117f4a9 100644
--- a/goformation/cloudformation/batch/aws-batch-jobdefinition.go
+++ b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // JobDefinition AWS CloudFormation Resource (AWS::Batch::JobDefinition)
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_authorizationconfig.go b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_authorizationconfig.go
similarity index 93%
rename from goformation/cloudformation/batch/aws-batch-jobdefinition_authorizationconfig.go
rename to pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_authorizationconfig.go
index 87983972ef..2931d5463a 100644
--- a/goformation/cloudformation/batch/aws-batch-jobdefinition_authorizationconfig.go
+++ b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_authorizationconfig.go
@@ -1,9 +1,9 @@
 package batch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // JobDefinition_AuthorizationConfig AWS CloudFormation Resource (AWS::Batch::JobDefinition.AuthorizationConfig)
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_containerproperties.go b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_containerproperties.go
similarity index 98%
rename from goformation/cloudformation/batch/aws-batch-jobdefinition_containerproperties.go
rename to pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_containerproperties.go
index 68d8e52075..595a8ef408 100644
--- a/goformation/cloudformation/batch/aws-batch-jobdefinition_containerproperties.go
+++ b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_containerproperties.go
@@ -1,9 +1,9 @@
 package batch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // JobDefinition_ContainerProperties AWS CloudFormation Resource (AWS::Batch::JobDefinition.ContainerProperties)
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_device.go b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_device.go
similarity index 93%
rename from goformation/cloudformation/batch/aws-batch-jobdefinition_device.go
rename to pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_device.go
index f1136ec266..512cf84427 100644
--- a/goformation/cloudformation/batch/aws-batch-jobdefinition_device.go
+++ b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_device.go
@@ -1,9 +1,9 @@
 package batch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // JobDefinition_Device AWS CloudFormation Resource (AWS::Batch::JobDefinition.Device)
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_efsvolumeconfiguration.go b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_efsvolumeconfiguration.go
similarity index 95%
rename from goformation/cloudformation/batch/aws-batch-jobdefinition_efsvolumeconfiguration.go
rename to pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_efsvolumeconfiguration.go
index 11490887a0..f880805042 100644
--- a/goformation/cloudformation/batch/aws-batch-jobdefinition_efsvolumeconfiguration.go
+++ b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_efsvolumeconfiguration.go
@@ -1,9 +1,9 @@
 package batch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // JobDefinition_EfsVolumeConfiguration AWS CloudFormation Resource (AWS::Batch::JobDefinition.EfsVolumeConfiguration)
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_environment.go b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_environment.go
similarity index 92%
rename from goformation/cloudformation/batch/aws-batch-jobdefinition_environment.go
rename to pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_environment.go
index 4d1d86a398..e28323e6db 100644
--- a/goformation/cloudformation/batch/aws-batch-jobdefinition_environment.go
+++ b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_environment.go
@@ -1,9 +1,9 @@
 package batch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // JobDefinition_Environment AWS CloudFormation Resource (AWS::Batch::JobDefinition.Environment)
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_evaluateonexit.go b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_evaluateonexit.go
similarity index 94%
rename from goformation/cloudformation/batch/aws-batch-jobdefinition_evaluateonexit.go
rename to pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_evaluateonexit.go
index 9e765e4f54..5c5949e073 100644
--- a/goformation/cloudformation/batch/aws-batch-jobdefinition_evaluateonexit.go
+++ b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_evaluateonexit.go
@@ -1,9 +1,9 @@
 package batch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // JobDefinition_EvaluateOnExit AWS CloudFormation Resource (AWS::Batch::JobDefinition.EvaluateOnExit)
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_fargateplatformconfiguration.go b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_fargateplatformconfiguration.go
similarity index 92%
rename from goformation/cloudformation/batch/aws-batch-jobdefinition_fargateplatformconfiguration.go
rename to pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_fargateplatformconfiguration.go
index 3b0e679116..39fa8de6bf 100644
--- a/goformation/cloudformation/batch/aws-batch-jobdefinition_fargateplatformconfiguration.go
+++ b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_fargateplatformconfiguration.go
@@ -1,9 +1,9 @@
 package batch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // JobDefinition_FargatePlatformConfiguration AWS CloudFormation Resource (AWS::Batch::JobDefinition.FargatePlatformConfiguration)
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_linuxparameters.go b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_linuxparameters.go
similarity index 95%
rename from goformation/cloudformation/batch/aws-batch-jobdefinition_linuxparameters.go
rename to pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_linuxparameters.go
index 6efcbd3adf..a33210671c 100644
--- a/goformation/cloudformation/batch/aws-batch-jobdefinition_linuxparameters.go
+++ b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_linuxparameters.go
@@ -1,9 +1,9 @@
 package batch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // JobDefinition_LinuxParameters AWS CloudFormation Resource (AWS::Batch::JobDefinition.LinuxParameters)
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_logconfiguration.go b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_logconfiguration.go
similarity index 94%
rename from goformation/cloudformation/batch/aws-batch-jobdefinition_logconfiguration.go
rename to pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_logconfiguration.go
index a9fd14fe98..54e835f14d 100644
--- a/goformation/cloudformation/batch/aws-batch-jobdefinition_logconfiguration.go
+++ b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_logconfiguration.go
@@ -1,9 +1,9 @@
 package batch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // JobDefinition_LogConfiguration AWS CloudFormation Resource (AWS::Batch::JobDefinition.LogConfiguration)
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_mountpoints.go b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_mountpoints.go
similarity index 93%
rename from goformation/cloudformation/batch/aws-batch-jobdefinition_mountpoints.go
rename to pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_mountpoints.go
index 93f40bdf67..59d18e2b91 100644
--- a/goformation/cloudformation/batch/aws-batch-jobdefinition_mountpoints.go
+++ b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_mountpoints.go
@@ -1,9 +1,9 @@
 package batch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // JobDefinition_MountPoints AWS CloudFormation Resource (AWS::Batch::JobDefinition.MountPoints)
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_networkconfiguration.go b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_networkconfiguration.go
similarity index 92%
rename from goformation/cloudformation/batch/aws-batch-jobdefinition_networkconfiguration.go
rename to pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_networkconfiguration.go
index b7babe53f4..af4d54d744 100644
--- a/goformation/cloudformation/batch/aws-batch-jobdefinition_networkconfiguration.go
+++ b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_networkconfiguration.go
@@ -1,9 +1,9 @@
 package batch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // JobDefinition_NetworkConfiguration AWS CloudFormation Resource (AWS::Batch::JobDefinition.NetworkConfiguration)
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_nodeproperties.go b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_nodeproperties.go
similarity index 93%
rename from goformation/cloudformation/batch/aws-batch-jobdefinition_nodeproperties.go
rename to pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_nodeproperties.go
index b7bbd83f06..756c90eab1 100644
--- a/goformation/cloudformation/batch/aws-batch-jobdefinition_nodeproperties.go
+++ b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_nodeproperties.go
@@ -1,9 +1,9 @@
 package batch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // JobDefinition_NodeProperties AWS CloudFormation Resource (AWS::Batch::JobDefinition.NodeProperties)
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_noderangeproperty.go b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_noderangeproperty.go
similarity index 93%
rename from goformation/cloudformation/batch/aws-batch-jobdefinition_noderangeproperty.go
rename to pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_noderangeproperty.go
index ba5b694065..8b2125ae5c 100644
--- a/goformation/cloudformation/batch/aws-batch-jobdefinition_noderangeproperty.go
+++ b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_noderangeproperty.go
@@ -1,9 +1,9 @@
 package batch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // JobDefinition_NodeRangeProperty AWS CloudFormation Resource (AWS::Batch::JobDefinition.NodeRangeProperty)
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_resourcerequirement.go b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_resourcerequirement.go
similarity index 93%
rename from goformation/cloudformation/batch/aws-batch-jobdefinition_resourcerequirement.go
rename to pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_resourcerequirement.go
index 801f017797..5d87c6a7f2 100644
--- a/goformation/cloudformation/batch/aws-batch-jobdefinition_resourcerequirement.go
+++ b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_resourcerequirement.go
@@ -1,9 +1,9 @@
 package batch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // JobDefinition_ResourceRequirement AWS CloudFormation Resource (AWS::Batch::JobDefinition.ResourceRequirement)
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_retrystrategy.go b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_retrystrategy.go
similarity index 93%
rename from goformation/cloudformation/batch/aws-batch-jobdefinition_retrystrategy.go
rename to pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_retrystrategy.go
index 9cfead0df2..bf8132800c 100644
--- a/goformation/cloudformation/batch/aws-batch-jobdefinition_retrystrategy.go
+++ b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_retrystrategy.go
@@ -1,9 +1,9 @@
 package batch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // JobDefinition_RetryStrategy AWS CloudFormation Resource (AWS::Batch::JobDefinition.RetryStrategy)
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_secret.go b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_secret.go
similarity index 92%
rename from goformation/cloudformation/batch/aws-batch-jobdefinition_secret.go
rename to pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_secret.go
index 86b67498ab..1009aa0be8 100644
--- a/goformation/cloudformation/batch/aws-batch-jobdefinition_secret.go
+++ b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_secret.go
@@ -1,9 +1,9 @@
 package batch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // JobDefinition_Secret AWS CloudFormation Resource (AWS::Batch::JobDefinition.Secret)
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_timeout.go b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_timeout.go
similarity index 91%
rename from goformation/cloudformation/batch/aws-batch-jobdefinition_timeout.go
rename to pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_timeout.go
index d67a7fe23d..759c7dced6 100644
--- a/goformation/cloudformation/batch/aws-batch-jobdefinition_timeout.go
+++ b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_timeout.go
@@ -1,9 +1,9 @@
 package batch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // JobDefinition_Timeout AWS CloudFormation Resource (AWS::Batch::JobDefinition.Timeout)
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_tmpfs.go b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_tmpfs.go
similarity index 93%
rename from goformation/cloudformation/batch/aws-batch-jobdefinition_tmpfs.go
rename to pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_tmpfs.go
index 3e8598fbec..e3a2da2cd1 100644
--- a/goformation/cloudformation/batch/aws-batch-jobdefinition_tmpfs.go
+++ b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_tmpfs.go
@@ -1,9 +1,9 @@
 package batch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // JobDefinition_Tmpfs AWS CloudFormation Resource (AWS::Batch::JobDefinition.Tmpfs)
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_ulimit.go b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_ulimit.go
similarity index 93%
rename from goformation/cloudformation/batch/aws-batch-jobdefinition_ulimit.go
rename to pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_ulimit.go
index ea8ff37caa..52154bdd16 100644
--- a/goformation/cloudformation/batch/aws-batch-jobdefinition_ulimit.go
+++ b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_ulimit.go
@@ -1,9 +1,9 @@
 package batch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // JobDefinition_Ulimit AWS CloudFormation Resource (AWS::Batch::JobDefinition.Ulimit)
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_volumes.go b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_volumes.go
similarity index 93%
rename from goformation/cloudformation/batch/aws-batch-jobdefinition_volumes.go
rename to pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_volumes.go
index 97ad05b020..172bbb75ff 100644
--- a/goformation/cloudformation/batch/aws-batch-jobdefinition_volumes.go
+++ b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_volumes.go
@@ -1,9 +1,9 @@
 package batch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // JobDefinition_Volumes AWS CloudFormation Resource (AWS::Batch::JobDefinition.Volumes)
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_volumeshost.go b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_volumeshost.go
similarity index 91%
rename from goformation/cloudformation/batch/aws-batch-jobdefinition_volumeshost.go
rename to pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_volumeshost.go
index f896c80ebb..9ebc8d41de 100644
--- a/goformation/cloudformation/batch/aws-batch-jobdefinition_volumeshost.go
+++ b/pkg/goformation/cloudformation/batch/aws-batch-jobdefinition_volumeshost.go
@@ -1,9 +1,9 @@
 package batch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // JobDefinition_VolumesHost AWS CloudFormation Resource (AWS::Batch::JobDefinition.VolumesHost)
diff --git a/goformation/cloudformation/batch/aws-batch-jobqueue.go b/pkg/goformation/cloudformation/batch/aws-batch-jobqueue.go
similarity index 97%
rename from goformation/cloudformation/batch/aws-batch-jobqueue.go
rename to pkg/goformation/cloudformation/batch/aws-batch-jobqueue.go
index 88f63f3e74..1d9155a7fb 100644
--- a/goformation/cloudformation/batch/aws-batch-jobqueue.go
+++ b/pkg/goformation/cloudformation/batch/aws-batch-jobqueue.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // JobQueue AWS CloudFormation Resource (AWS::Batch::JobQueue)
diff --git a/goformation/cloudformation/batch/aws-batch-jobqueue_computeenvironmentorder.go b/pkg/goformation/cloudformation/batch/aws-batch-jobqueue_computeenvironmentorder.go
similarity index 93%
rename from goformation/cloudformation/batch/aws-batch-jobqueue_computeenvironmentorder.go
rename to pkg/goformation/cloudformation/batch/aws-batch-jobqueue_computeenvironmentorder.go
index 4c09009895..39309fc6d1 100644
--- a/goformation/cloudformation/batch/aws-batch-jobqueue_computeenvironmentorder.go
+++ b/pkg/goformation/cloudformation/batch/aws-batch-jobqueue_computeenvironmentorder.go
@@ -1,9 +1,9 @@
 package batch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // JobQueue_ComputeEnvironmentOrder AWS CloudFormation Resource (AWS::Batch::JobQueue.ComputeEnvironmentOrder)
diff --git a/goformation/cloudformation/batch/aws-batch-schedulingpolicy.go b/pkg/goformation/cloudformation/batch/aws-batch-schedulingpolicy.go
similarity index 96%
rename from goformation/cloudformation/batch/aws-batch-schedulingpolicy.go
rename to pkg/goformation/cloudformation/batch/aws-batch-schedulingpolicy.go
index a3df224b34..f4678f02a5 100644
--- a/goformation/cloudformation/batch/aws-batch-schedulingpolicy.go
+++ b/pkg/goformation/cloudformation/batch/aws-batch-schedulingpolicy.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SchedulingPolicy AWS CloudFormation Resource (AWS::Batch::SchedulingPolicy)
diff --git a/goformation/cloudformation/batch/aws-batch-schedulingpolicy_fairsharepolicy.go b/pkg/goformation/cloudformation/batch/aws-batch-schedulingpolicy_fairsharepolicy.go
similarity index 94%
rename from goformation/cloudformation/batch/aws-batch-schedulingpolicy_fairsharepolicy.go
rename to pkg/goformation/cloudformation/batch/aws-batch-schedulingpolicy_fairsharepolicy.go
index 5d924358db..07d34e63b7 100644
--- a/goformation/cloudformation/batch/aws-batch-schedulingpolicy_fairsharepolicy.go
+++ b/pkg/goformation/cloudformation/batch/aws-batch-schedulingpolicy_fairsharepolicy.go
@@ -1,9 +1,9 @@
 package batch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SchedulingPolicy_FairsharePolicy AWS CloudFormation Resource (AWS::Batch::SchedulingPolicy.FairsharePolicy)
diff --git a/goformation/cloudformation/batch/aws-batch-schedulingpolicy_shareattributes.go b/pkg/goformation/cloudformation/batch/aws-batch-schedulingpolicy_shareattributes.go
similarity index 93%
rename from goformation/cloudformation/batch/aws-batch-schedulingpolicy_shareattributes.go
rename to pkg/goformation/cloudformation/batch/aws-batch-schedulingpolicy_shareattributes.go
index 1315aa2d89..54b46df7ec 100644
--- a/goformation/cloudformation/batch/aws-batch-schedulingpolicy_shareattributes.go
+++ b/pkg/goformation/cloudformation/batch/aws-batch-schedulingpolicy_shareattributes.go
@@ -1,9 +1,9 @@
 package batch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SchedulingPolicy_ShareAttributes AWS CloudFormation Resource (AWS::Batch::SchedulingPolicy.ShareAttributes)
diff --git a/goformation/cloudformation/budgets/aws-budgets-budget.go b/pkg/goformation/cloudformation/budgets/aws-budgets-budget.go
similarity index 98%
rename from goformation/cloudformation/budgets/aws-budgets-budget.go
rename to pkg/goformation/cloudformation/budgets/aws-budgets-budget.go
index afad373f91..f81a2b7407 100644
--- a/goformation/cloudformation/budgets/aws-budgets-budget.go
+++ b/pkg/goformation/cloudformation/budgets/aws-budgets-budget.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Budget AWS CloudFormation Resource (AWS::Budgets::Budget)
diff --git a/goformation/cloudformation/budgets/aws-budgets-budget_budgetdata.go b/pkg/goformation/cloudformation/budgets/aws-budgets-budget_budgetdata.go
similarity index 96%
rename from goformation/cloudformation/budgets/aws-budgets-budget_budgetdata.go
rename to pkg/goformation/cloudformation/budgets/aws-budgets-budget_budgetdata.go
index 0156a5ae6b..f13d529b69 100644
--- a/goformation/cloudformation/budgets/aws-budgets-budget_budgetdata.go
+++ b/pkg/goformation/cloudformation/budgets/aws-budgets-budget_budgetdata.go
@@ -1,9 +1,9 @@
 package budgets
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Budget_BudgetData AWS CloudFormation Resource (AWS::Budgets::Budget.BudgetData)
diff --git a/goformation/cloudformation/budgets/aws-budgets-budget_costtypes.go b/pkg/goformation/cloudformation/budgets/aws-budgets-budget_costtypes.go
similarity index 96%
rename from goformation/cloudformation/budgets/aws-budgets-budget_costtypes.go
rename to pkg/goformation/cloudformation/budgets/aws-budgets-budget_costtypes.go
index 93a627c34e..891a779e26 100644
--- a/goformation/cloudformation/budgets/aws-budgets-budget_costtypes.go
+++ b/pkg/goformation/cloudformation/budgets/aws-budgets-budget_costtypes.go
@@ -1,9 +1,9 @@
 package budgets
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Budget_CostTypes AWS CloudFormation Resource (AWS::Budgets::Budget.CostTypes)
diff --git a/goformation/cloudformation/budgets/aws-budgets-budget_notification.go b/pkg/goformation/cloudformation/budgets/aws-budgets-budget_notification.go
similarity index 94%
rename from goformation/cloudformation/budgets/aws-budgets-budget_notification.go
rename to pkg/goformation/cloudformation/budgets/aws-budgets-budget_notification.go
index 37f8ea880d..45629457d5 100644
--- a/goformation/cloudformation/budgets/aws-budgets-budget_notification.go
+++ b/pkg/goformation/cloudformation/budgets/aws-budgets-budget_notification.go
@@ -1,9 +1,9 @@
 package budgets
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Budget_Notification AWS CloudFormation Resource (AWS::Budgets::Budget.Notification)
diff --git a/goformation/cloudformation/budgets/aws-budgets-budget_notificationwithsubscribers.go b/pkg/goformation/cloudformation/budgets/aws-budgets-budget_notificationwithsubscribers.go
similarity index 96%
rename from goformation/cloudformation/budgets/aws-budgets-budget_notificationwithsubscribers.go
rename to pkg/goformation/cloudformation/budgets/aws-budgets-budget_notificationwithsubscribers.go
index cd8e57b035..12f2c39508 100644
--- a/goformation/cloudformation/budgets/aws-budgets-budget_notificationwithsubscribers.go
+++ b/pkg/goformation/cloudformation/budgets/aws-budgets-budget_notificationwithsubscribers.go
@@ -1,7 +1,7 @@
 package budgets
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Budget_NotificationWithSubscribers AWS CloudFormation Resource (AWS::Budgets::Budget.NotificationWithSubscribers)
diff --git a/goformation/cloudformation/budgets/aws-budgets-budget_spend.go b/pkg/goformation/cloudformation/budgets/aws-budgets-budget_spend.go
similarity index 92%
rename from goformation/cloudformation/budgets/aws-budgets-budget_spend.go
rename to pkg/goformation/cloudformation/budgets/aws-budgets-budget_spend.go
index d2d5779049..2c37e13cbf 100644
--- a/goformation/cloudformation/budgets/aws-budgets-budget_spend.go
+++ b/pkg/goformation/cloudformation/budgets/aws-budgets-budget_spend.go
@@ -1,9 +1,9 @@
 package budgets
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Budget_Spend AWS CloudFormation Resource (AWS::Budgets::Budget.Spend)
diff --git a/goformation/cloudformation/budgets/aws-budgets-budget_subscriber.go b/pkg/goformation/cloudformation/budgets/aws-budgets-budget_subscriber.go
similarity index 92%
rename from goformation/cloudformation/budgets/aws-budgets-budget_subscriber.go
rename to pkg/goformation/cloudformation/budgets/aws-budgets-budget_subscriber.go
index d8c563e8bc..0343a24246 100644
--- a/goformation/cloudformation/budgets/aws-budgets-budget_subscriber.go
+++ b/pkg/goformation/cloudformation/budgets/aws-budgets-budget_subscriber.go
@@ -1,9 +1,9 @@
 package budgets
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Budget_Subscriber AWS CloudFormation Resource (AWS::Budgets::Budget.Subscriber)
diff --git a/goformation/cloudformation/budgets/aws-budgets-budget_timeperiod.go b/pkg/goformation/cloudformation/budgets/aws-budgets-budget_timeperiod.go
similarity index 92%
rename from goformation/cloudformation/budgets/aws-budgets-budget_timeperiod.go
rename to pkg/goformation/cloudformation/budgets/aws-budgets-budget_timeperiod.go
index 02e394f5e8..2c7b7a9446 100644
--- a/goformation/cloudformation/budgets/aws-budgets-budget_timeperiod.go
+++ b/pkg/goformation/cloudformation/budgets/aws-budgets-budget_timeperiod.go
@@ -1,9 +1,9 @@
 package budgets
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Budget_TimePeriod AWS CloudFormation Resource (AWS::Budgets::Budget.TimePeriod)
diff --git a/goformation/cloudformation/budgets/aws-budgets-budgetsaction.go b/pkg/goformation/cloudformation/budgets/aws-budgets-budgetsaction.go
similarity index 97%
rename from goformation/cloudformation/budgets/aws-budgets-budgetsaction.go
rename to pkg/goformation/cloudformation/budgets/aws-budgets-budgetsaction.go
index 85bc4a1669..f6b16fffd7 100644
--- a/goformation/cloudformation/budgets/aws-budgets-budgetsaction.go
+++ b/pkg/goformation/cloudformation/budgets/aws-budgets-budgetsaction.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // BudgetsAction AWS CloudFormation Resource (AWS::Budgets::BudgetsAction)
diff --git a/goformation/cloudformation/budgets/aws-budgets-budgetsaction_actionthreshold.go b/pkg/goformation/cloudformation/budgets/aws-budgets-budgetsaction_actionthreshold.go
similarity index 92%
rename from goformation/cloudformation/budgets/aws-budgets-budgetsaction_actionthreshold.go
rename to pkg/goformation/cloudformation/budgets/aws-budgets-budgetsaction_actionthreshold.go
index 47af95bc66..585c188d52 100644
--- a/goformation/cloudformation/budgets/aws-budgets-budgetsaction_actionthreshold.go
+++ b/pkg/goformation/cloudformation/budgets/aws-budgets-budgetsaction_actionthreshold.go
@@ -1,9 +1,9 @@
 package budgets
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // BudgetsAction_ActionThreshold AWS CloudFormation Resource (AWS::Budgets::BudgetsAction.ActionThreshold)
diff --git a/goformation/cloudformation/budgets/aws-budgets-budgetsaction_definition.go b/pkg/goformation/cloudformation/budgets/aws-budgets-budgetsaction_definition.go
similarity index 96%
rename from goformation/cloudformation/budgets/aws-budgets-budgetsaction_definition.go
rename to pkg/goformation/cloudformation/budgets/aws-budgets-budgetsaction_definition.go
index 6bf5f804db..72ad8d0cca 100644
--- a/goformation/cloudformation/budgets/aws-budgets-budgetsaction_definition.go
+++ b/pkg/goformation/cloudformation/budgets/aws-budgets-budgetsaction_definition.go
@@ -1,7 +1,7 @@
 package budgets
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // BudgetsAction_Definition AWS CloudFormation Resource (AWS::Budgets::BudgetsAction.Definition)
diff --git a/goformation/cloudformation/budgets/aws-budgets-budgetsaction_iamactiondefinition.go b/pkg/goformation/cloudformation/budgets/aws-budgets-budgetsaction_iamactiondefinition.go
similarity index 94%
rename from goformation/cloudformation/budgets/aws-budgets-budgetsaction_iamactiondefinition.go
rename to pkg/goformation/cloudformation/budgets/aws-budgets-budgetsaction_iamactiondefinition.go
index b1ecc611d4..d628dac40d 100644
--- a/goformation/cloudformation/budgets/aws-budgets-budgetsaction_iamactiondefinition.go
+++ b/pkg/goformation/cloudformation/budgets/aws-budgets-budgetsaction_iamactiondefinition.go
@@ -1,9 +1,9 @@
 package budgets
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // BudgetsAction_IamActionDefinition AWS CloudFormation Resource (AWS::Budgets::BudgetsAction.IamActionDefinition)
diff --git a/goformation/cloudformation/budgets/aws-budgets-budgetsaction_scpactiondefinition.go b/pkg/goformation/cloudformation/budgets/aws-budgets-budgetsaction_scpactiondefinition.go
similarity index 93%
rename from goformation/cloudformation/budgets/aws-budgets-budgetsaction_scpactiondefinition.go
rename to pkg/goformation/cloudformation/budgets/aws-budgets-budgetsaction_scpactiondefinition.go
index eae4507271..667e31736c 100644
--- a/goformation/cloudformation/budgets/aws-budgets-budgetsaction_scpactiondefinition.go
+++ b/pkg/goformation/cloudformation/budgets/aws-budgets-budgetsaction_scpactiondefinition.go
@@ -1,9 +1,9 @@
 package budgets
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // BudgetsAction_ScpActionDefinition AWS CloudFormation Resource (AWS::Budgets::BudgetsAction.ScpActionDefinition)
diff --git a/goformation/cloudformation/budgets/aws-budgets-budgetsaction_ssmactiondefinition.go b/pkg/goformation/cloudformation/budgets/aws-budgets-budgetsaction_ssmactiondefinition.go
similarity index 94%
rename from goformation/cloudformation/budgets/aws-budgets-budgetsaction_ssmactiondefinition.go
rename to pkg/goformation/cloudformation/budgets/aws-budgets-budgetsaction_ssmactiondefinition.go
index d18aa0d7f2..eec9ac5ecf 100644
--- a/goformation/cloudformation/budgets/aws-budgets-budgetsaction_ssmactiondefinition.go
+++ b/pkg/goformation/cloudformation/budgets/aws-budgets-budgetsaction_ssmactiondefinition.go
@@ -1,9 +1,9 @@
 package budgets
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // BudgetsAction_SsmActionDefinition AWS CloudFormation Resource (AWS::Budgets::BudgetsAction.SsmActionDefinition)
diff --git a/goformation/cloudformation/budgets/aws-budgets-budgetsaction_subscriber.go b/pkg/goformation/cloudformation/budgets/aws-budgets-budgetsaction_subscriber.go
similarity index 92%
rename from goformation/cloudformation/budgets/aws-budgets-budgetsaction_subscriber.go
rename to pkg/goformation/cloudformation/budgets/aws-budgets-budgetsaction_subscriber.go
index 1d3cb38d81..07beb64fd4 100644
--- a/goformation/cloudformation/budgets/aws-budgets-budgetsaction_subscriber.go
+++ b/pkg/goformation/cloudformation/budgets/aws-budgets-budgetsaction_subscriber.go
@@ -1,9 +1,9 @@
 package budgets
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // BudgetsAction_Subscriber AWS CloudFormation Resource (AWS::Budgets::BudgetsAction.Subscriber)
diff --git a/goformation/cloudformation/cassandra/aws-cassandra-keyspace.go b/pkg/goformation/cloudformation/cassandra/aws-cassandra-keyspace.go
similarity index 94%
rename from goformation/cloudformation/cassandra/aws-cassandra-keyspace.go
rename to pkg/goformation/cloudformation/cassandra/aws-cassandra-keyspace.go
index 4dce423c18..1eadd1cd43 100644
--- a/goformation/cloudformation/cassandra/aws-cassandra-keyspace.go
+++ b/pkg/goformation/cloudformation/cassandra/aws-cassandra-keyspace.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Keyspace AWS CloudFormation Resource (AWS::Cassandra::Keyspace)
diff --git a/goformation/cloudformation/cassandra/aws-cassandra-table.go b/pkg/goformation/cloudformation/cassandra/aws-cassandra-table.go
similarity index 96%
rename from goformation/cloudformation/cassandra/aws-cassandra-table.go
rename to pkg/goformation/cloudformation/cassandra/aws-cassandra-table.go
index b5c8ba0731..bff8233ba3 100644
--- a/goformation/cloudformation/cassandra/aws-cassandra-table.go
+++ b/pkg/goformation/cloudformation/cassandra/aws-cassandra-table.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Table AWS CloudFormation Resource (AWS::Cassandra::Table)
diff --git a/goformation/cloudformation/cassandra/aws-cassandra-table_billingmode.go b/pkg/goformation/cloudformation/cassandra/aws-cassandra-table_billingmode.go
similarity index 92%
rename from goformation/cloudformation/cassandra/aws-cassandra-table_billingmode.go
rename to pkg/goformation/cloudformation/cassandra/aws-cassandra-table_billingmode.go
index dd29e63e2d..f404a65aea 100644
--- a/goformation/cloudformation/cassandra/aws-cassandra-table_billingmode.go
+++ b/pkg/goformation/cloudformation/cassandra/aws-cassandra-table_billingmode.go
@@ -1,9 +1,9 @@
 package cassandra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Table_BillingMode AWS CloudFormation Resource (AWS::Cassandra::Table.BillingMode)
diff --git a/goformation/cloudformation/cassandra/aws-cassandra-table_clusteringkeycolumn.go b/pkg/goformation/cloudformation/cassandra/aws-cassandra-table_clusteringkeycolumn.go
similarity index 92%
rename from goformation/cloudformation/cassandra/aws-cassandra-table_clusteringkeycolumn.go
rename to pkg/goformation/cloudformation/cassandra/aws-cassandra-table_clusteringkeycolumn.go
index 94c96c381e..96a7952d49 100644
--- a/goformation/cloudformation/cassandra/aws-cassandra-table_clusteringkeycolumn.go
+++ b/pkg/goformation/cloudformation/cassandra/aws-cassandra-table_clusteringkeycolumn.go
@@ -1,9 +1,9 @@
 package cassandra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Table_ClusteringKeyColumn AWS CloudFormation Resource (AWS::Cassandra::Table.ClusteringKeyColumn)
diff --git a/goformation/cloudformation/cassandra/aws-cassandra-table_column.go b/pkg/goformation/cloudformation/cassandra/aws-cassandra-table_column.go
similarity index 92%
rename from goformation/cloudformation/cassandra/aws-cassandra-table_column.go
rename to pkg/goformation/cloudformation/cassandra/aws-cassandra-table_column.go
index 3f7556cf8a..2dcff95396 100644
--- a/goformation/cloudformation/cassandra/aws-cassandra-table_column.go
+++ b/pkg/goformation/cloudformation/cassandra/aws-cassandra-table_column.go
@@ -1,9 +1,9 @@
 package cassandra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Table_Column AWS CloudFormation Resource (AWS::Cassandra::Table.Column)
diff --git a/goformation/cloudformation/cassandra/aws-cassandra-table_encryptionspecification.go b/pkg/goformation/cloudformation/cassandra/aws-cassandra-table_encryptionspecification.go
similarity index 93%
rename from goformation/cloudformation/cassandra/aws-cassandra-table_encryptionspecification.go
rename to pkg/goformation/cloudformation/cassandra/aws-cassandra-table_encryptionspecification.go
index 959bcb5bd3..f699cfbcf3 100644
--- a/goformation/cloudformation/cassandra/aws-cassandra-table_encryptionspecification.go
+++ b/pkg/goformation/cloudformation/cassandra/aws-cassandra-table_encryptionspecification.go
@@ -1,9 +1,9 @@
 package cassandra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Table_EncryptionSpecification AWS CloudFormation Resource (AWS::Cassandra::Table.EncryptionSpecification)
diff --git a/goformation/cloudformation/cassandra/aws-cassandra-table_provisionedthroughput.go b/pkg/goformation/cloudformation/cassandra/aws-cassandra-table_provisionedthroughput.go
similarity index 93%
rename from goformation/cloudformation/cassandra/aws-cassandra-table_provisionedthroughput.go
rename to pkg/goformation/cloudformation/cassandra/aws-cassandra-table_provisionedthroughput.go
index 9f544c0483..e8b712cf01 100644
--- a/goformation/cloudformation/cassandra/aws-cassandra-table_provisionedthroughput.go
+++ b/pkg/goformation/cloudformation/cassandra/aws-cassandra-table_provisionedthroughput.go
@@ -1,9 +1,9 @@
 package cassandra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Table_ProvisionedThroughput AWS CloudFormation Resource (AWS::Cassandra::Table.ProvisionedThroughput)
diff --git a/goformation/cloudformation/ce/aws-ce-anomalymonitor.go b/pkg/goformation/cloudformation/ce/aws-ce-anomalymonitor.go
similarity index 97%
rename from goformation/cloudformation/ce/aws-ce-anomalymonitor.go
rename to pkg/goformation/cloudformation/ce/aws-ce-anomalymonitor.go
index 95b066f190..1df1c3aa43 100644
--- a/goformation/cloudformation/ce/aws-ce-anomalymonitor.go
+++ b/pkg/goformation/cloudformation/ce/aws-ce-anomalymonitor.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AnomalyMonitor AWS CloudFormation Resource (AWS::CE::AnomalyMonitor)
diff --git a/goformation/cloudformation/ce/aws-ce-anomalysubscription.go b/pkg/goformation/cloudformation/ce/aws-ce-anomalysubscription.go
similarity index 97%
rename from goformation/cloudformation/ce/aws-ce-anomalysubscription.go
rename to pkg/goformation/cloudformation/ce/aws-ce-anomalysubscription.go
index 887963c074..1339588095 100644
--- a/goformation/cloudformation/ce/aws-ce-anomalysubscription.go
+++ b/pkg/goformation/cloudformation/ce/aws-ce-anomalysubscription.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AnomalySubscription AWS CloudFormation Resource (AWS::CE::AnomalySubscription)
diff --git a/goformation/cloudformation/ce/aws-ce-anomalysubscription_subscriber.go b/pkg/goformation/cloudformation/ce/aws-ce-anomalysubscription_subscriber.go
similarity index 93%
rename from goformation/cloudformation/ce/aws-ce-anomalysubscription_subscriber.go
rename to pkg/goformation/cloudformation/ce/aws-ce-anomalysubscription_subscriber.go
index 27e2280388..c3e164bc11 100644
--- a/goformation/cloudformation/ce/aws-ce-anomalysubscription_subscriber.go
+++ b/pkg/goformation/cloudformation/ce/aws-ce-anomalysubscription_subscriber.go
@@ -1,9 +1,9 @@
 package ce
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AnomalySubscription_Subscriber AWS CloudFormation Resource (AWS::CE::AnomalySubscription.Subscriber)
diff --git a/goformation/cloudformation/ce/aws-ce-costcategory.go b/pkg/goformation/cloudformation/ce/aws-ce-costcategory.go
similarity index 97%
rename from goformation/cloudformation/ce/aws-ce-costcategory.go
rename to pkg/goformation/cloudformation/ce/aws-ce-costcategory.go
index b7f90fedb4..d5579610ba 100644
--- a/goformation/cloudformation/ce/aws-ce-costcategory.go
+++ b/pkg/goformation/cloudformation/ce/aws-ce-costcategory.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CostCategory AWS CloudFormation Resource (AWS::CE::CostCategory)
diff --git a/goformation/cloudformation/certificatemanager/aws-certificatemanager-account.go b/pkg/goformation/cloudformation/certificatemanager/aws-certificatemanager-account.go
similarity index 98%
rename from goformation/cloudformation/certificatemanager/aws-certificatemanager-account.go
rename to pkg/goformation/cloudformation/certificatemanager/aws-certificatemanager-account.go
index 245b5fd1b6..8b4256ab33 100644
--- a/goformation/cloudformation/certificatemanager/aws-certificatemanager-account.go
+++ b/pkg/goformation/cloudformation/certificatemanager/aws-certificatemanager-account.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Account AWS CloudFormation Resource (AWS::CertificateManager::Account)
diff --git a/goformation/cloudformation/certificatemanager/aws-certificatemanager-account_expiryeventsconfiguration.go b/pkg/goformation/cloudformation/certificatemanager/aws-certificatemanager-account_expiryeventsconfiguration.go
similarity index 92%
rename from goformation/cloudformation/certificatemanager/aws-certificatemanager-account_expiryeventsconfiguration.go
rename to pkg/goformation/cloudformation/certificatemanager/aws-certificatemanager-account_expiryeventsconfiguration.go
index 7871fa32ef..679c988824 100644
--- a/goformation/cloudformation/certificatemanager/aws-certificatemanager-account_expiryeventsconfiguration.go
+++ b/pkg/goformation/cloudformation/certificatemanager/aws-certificatemanager-account_expiryeventsconfiguration.go
@@ -1,9 +1,9 @@
 package certificatemanager
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Account_ExpiryEventsConfiguration AWS CloudFormation Resource (AWS::CertificateManager::Account.ExpiryEventsConfiguration)
diff --git a/goformation/cloudformation/certificatemanager/aws-certificatemanager-certificate.go b/pkg/goformation/cloudformation/certificatemanager/aws-certificatemanager-certificate.go
similarity index 96%
rename from goformation/cloudformation/certificatemanager/aws-certificatemanager-certificate.go
rename to pkg/goformation/cloudformation/certificatemanager/aws-certificatemanager-certificate.go
index 23cd599a7f..13cf8cf353 100644
--- a/goformation/cloudformation/certificatemanager/aws-certificatemanager-certificate.go
+++ b/pkg/goformation/cloudformation/certificatemanager/aws-certificatemanager-certificate.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Certificate AWS CloudFormation Resource (AWS::CertificateManager::Certificate)
diff --git a/goformation/cloudformation/certificatemanager/aws-certificatemanager-certificate_domainvalidationoption.go b/pkg/goformation/cloudformation/certificatemanager/aws-certificatemanager-certificate_domainvalidationoption.go
similarity index 94%
rename from goformation/cloudformation/certificatemanager/aws-certificatemanager-certificate_domainvalidationoption.go
rename to pkg/goformation/cloudformation/certificatemanager/aws-certificatemanager-certificate_domainvalidationoption.go
index 34c331f0f6..9aff1cb87a 100644
--- a/goformation/cloudformation/certificatemanager/aws-certificatemanager-certificate_domainvalidationoption.go
+++ b/pkg/goformation/cloudformation/certificatemanager/aws-certificatemanager-certificate_domainvalidationoption.go
@@ -1,9 +1,9 @@
 package certificatemanager
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Certificate_DomainValidationOption AWS CloudFormation Resource (AWS::CertificateManager::Certificate.DomainValidationOption)
diff --git a/goformation/cloudformation/chatbot/aws-chatbot-slackchannelconfiguration.go b/pkg/goformation/cloudformation/chatbot/aws-chatbot-slackchannelconfiguration.go
similarity index 97%
rename from goformation/cloudformation/chatbot/aws-chatbot-slackchannelconfiguration.go
rename to pkg/goformation/cloudformation/chatbot/aws-chatbot-slackchannelconfiguration.go
index 5876fcdd34..dd68c78231 100644
--- a/goformation/cloudformation/chatbot/aws-chatbot-slackchannelconfiguration.go
+++ b/pkg/goformation/cloudformation/chatbot/aws-chatbot-slackchannelconfiguration.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SlackChannelConfiguration AWS CloudFormation Resource (AWS::Chatbot::SlackChannelConfiguration)
diff --git a/goformation/cloudformation/cloud9/aws-cloud9-environmentec2.go b/pkg/goformation/cloudformation/cloud9/aws-cloud9-environmentec2.go
similarity index 96%
rename from goformation/cloudformation/cloud9/aws-cloud9-environmentec2.go
rename to pkg/goformation/cloudformation/cloud9/aws-cloud9-environmentec2.go
index 9c52f6ec00..d9bbbd93a1 100644
--- a/goformation/cloudformation/cloud9/aws-cloud9-environmentec2.go
+++ b/pkg/goformation/cloudformation/cloud9/aws-cloud9-environmentec2.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EnvironmentEC2 AWS CloudFormation Resource (AWS::Cloud9::EnvironmentEC2)
diff --git a/goformation/cloudformation/cloud9/aws-cloud9-environmentec2_repository.go b/pkg/goformation/cloudformation/cloud9/aws-cloud9-environmentec2_repository.go
similarity index 93%
rename from goformation/cloudformation/cloud9/aws-cloud9-environmentec2_repository.go
rename to pkg/goformation/cloudformation/cloud9/aws-cloud9-environmentec2_repository.go
index 9a9052fa5e..7f5264d28e 100644
--- a/goformation/cloudformation/cloud9/aws-cloud9-environmentec2_repository.go
+++ b/pkg/goformation/cloudformation/cloud9/aws-cloud9-environmentec2_repository.go
@@ -1,9 +1,9 @@
 package cloud9
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EnvironmentEC2_Repository AWS CloudFormation Resource (AWS::Cloud9::EnvironmentEC2.Repository)
diff --git a/goformation/cloudformation/cloudformation/aws-cloudformation-customresource.go b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-customresource.go
similarity index 96%
rename from goformation/cloudformation/cloudformation/aws-cloudformation-customresource.go
rename to pkg/goformation/cloudformation/cloudformation/aws-cloudformation-customresource.go
index a236167a57..377b1a27dd 100644
--- a/goformation/cloudformation/cloudformation/aws-cloudformation-customresource.go
+++ b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-customresource.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CustomResource AWS CloudFormation Resource (AWS::CloudFormation::CustomResource)
diff --git a/goformation/cloudformation/cloudformation/aws-cloudformation-macro.go b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-macro.go
similarity index 97%
rename from goformation/cloudformation/cloudformation/aws-cloudformation-macro.go
rename to pkg/goformation/cloudformation/cloudformation/aws-cloudformation-macro.go
index a73c784157..a1a74bb11b 100644
--- a/goformation/cloudformation/cloudformation/aws-cloudformation-macro.go
+++ b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-macro.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Macro AWS CloudFormation Resource (AWS::CloudFormation::Macro)
diff --git a/goformation/cloudformation/cloudformation/aws-cloudformation-moduledefaultversion.go b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-moduledefaultversion.go
similarity index 97%
rename from goformation/cloudformation/cloudformation/aws-cloudformation-moduledefaultversion.go
rename to pkg/goformation/cloudformation/cloudformation/aws-cloudformation-moduledefaultversion.go
index e94dcb998b..29e0a14e6b 100644
--- a/goformation/cloudformation/cloudformation/aws-cloudformation-moduledefaultversion.go
+++ b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-moduledefaultversion.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModuleDefaultVersion AWS CloudFormation Resource (AWS::CloudFormation::ModuleDefaultVersion)
diff --git a/goformation/cloudformation/cloudformation/aws-cloudformation-moduleversion.go b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-moduleversion.go
similarity index 96%
rename from goformation/cloudformation/cloudformation/aws-cloudformation-moduleversion.go
rename to pkg/goformation/cloudformation/cloudformation/aws-cloudformation-moduleversion.go
index 23264fb4f5..bb1d6e2786 100644
--- a/goformation/cloudformation/cloudformation/aws-cloudformation-moduleversion.go
+++ b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-moduleversion.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModuleVersion AWS CloudFormation Resource (AWS::CloudFormation::ModuleVersion)
diff --git a/goformation/cloudformation/cloudformation/aws-cloudformation-publictypeversion.go b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-publictypeversion.go
similarity index 97%
rename from goformation/cloudformation/cloudformation/aws-cloudformation-publictypeversion.go
rename to pkg/goformation/cloudformation/cloudformation/aws-cloudformation-publictypeversion.go
index 5311b9f70b..dd5da9cad5 100644
--- a/goformation/cloudformation/cloudformation/aws-cloudformation-publictypeversion.go
+++ b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-publictypeversion.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PublicTypeVersion AWS CloudFormation Resource (AWS::CloudFormation::PublicTypeVersion)
diff --git a/goformation/cloudformation/cloudformation/aws-cloudformation-publisher.go b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-publisher.go
similarity index 96%
rename from goformation/cloudformation/cloudformation/aws-cloudformation-publisher.go
rename to pkg/goformation/cloudformation/cloudformation/aws-cloudformation-publisher.go
index 548191e492..0780fbb880 100644
--- a/goformation/cloudformation/cloudformation/aws-cloudformation-publisher.go
+++ b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-publisher.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Publisher AWS CloudFormation Resource (AWS::CloudFormation::Publisher)
diff --git a/goformation/cloudformation/cloudformation/aws-cloudformation-resourcedefaultversion.go b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-resourcedefaultversion.go
similarity index 97%
rename from goformation/cloudformation/cloudformation/aws-cloudformation-resourcedefaultversion.go
rename to pkg/goformation/cloudformation/cloudformation/aws-cloudformation-resourcedefaultversion.go
index eb9a9bf055..293c53c202 100644
--- a/goformation/cloudformation/cloudformation/aws-cloudformation-resourcedefaultversion.go
+++ b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-resourcedefaultversion.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceDefaultVersion AWS CloudFormation Resource (AWS::CloudFormation::ResourceDefaultVersion)
diff --git a/goformation/cloudformation/cloudformation/aws-cloudformation-resourceversion.go b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-resourceversion.go
similarity index 97%
rename from goformation/cloudformation/cloudformation/aws-cloudformation-resourceversion.go
rename to pkg/goformation/cloudformation/cloudformation/aws-cloudformation-resourceversion.go
index dc14c5cf91..b45c1a8b2f 100644
--- a/goformation/cloudformation/cloudformation/aws-cloudformation-resourceversion.go
+++ b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-resourceversion.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceVersion AWS CloudFormation Resource (AWS::CloudFormation::ResourceVersion)
diff --git a/goformation/cloudformation/cloudformation/aws-cloudformation-resourceversion_loggingconfig.go b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-resourceversion_loggingconfig.go
similarity index 93%
rename from goformation/cloudformation/cloudformation/aws-cloudformation-resourceversion_loggingconfig.go
rename to pkg/goformation/cloudformation/cloudformation/aws-cloudformation-resourceversion_loggingconfig.go
index 8b9959abec..8454530095 100644
--- a/goformation/cloudformation/cloudformation/aws-cloudformation-resourceversion_loggingconfig.go
+++ b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-resourceversion_loggingconfig.go
@@ -1,9 +1,9 @@
 package cloudformation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceVersion_LoggingConfig AWS CloudFormation Resource (AWS::CloudFormation::ResourceVersion.LoggingConfig)
diff --git a/goformation/cloudformation/cloudformation/aws-cloudformation-stack.go b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-stack.go
similarity index 97%
rename from goformation/cloudformation/cloudformation/aws-cloudformation-stack.go
rename to pkg/goformation/cloudformation/cloudformation/aws-cloudformation-stack.go
index 16a42a41e3..45b344596c 100644
--- a/goformation/cloudformation/cloudformation/aws-cloudformation-stack.go
+++ b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-stack.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Stack AWS CloudFormation Resource (AWS::CloudFormation::Stack)
diff --git a/goformation/cloudformation/cloudformation/aws-cloudformation-stackset.go b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-stackset.go
similarity index 98%
rename from goformation/cloudformation/cloudformation/aws-cloudformation-stackset.go
rename to pkg/goformation/cloudformation/cloudformation/aws-cloudformation-stackset.go
index 038ae43978..c226ca64ec 100644
--- a/goformation/cloudformation/cloudformation/aws-cloudformation-stackset.go
+++ b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-stackset.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StackSet AWS CloudFormation Resource (AWS::CloudFormation::StackSet)
diff --git a/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_autodeployment.go b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_autodeployment.go
similarity index 93%
rename from goformation/cloudformation/cloudformation/aws-cloudformation-stackset_autodeployment.go
rename to pkg/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_autodeployment.go
index 1c22e44ae2..65e5c6fc0b 100644
--- a/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_autodeployment.go
+++ b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_autodeployment.go
@@ -1,9 +1,9 @@
 package cloudformation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StackSet_AutoDeployment AWS CloudFormation Resource (AWS::CloudFormation::StackSet.AutoDeployment)
diff --git a/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_deploymenttargets.go b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_deploymenttargets.go
similarity index 93%
rename from goformation/cloudformation/cloudformation/aws-cloudformation-stackset_deploymenttargets.go
rename to pkg/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_deploymenttargets.go
index fcf6ede667..5dfe1a7059 100644
--- a/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_deploymenttargets.go
+++ b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_deploymenttargets.go
@@ -1,9 +1,9 @@
 package cloudformation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StackSet_DeploymentTargets AWS CloudFormation Resource (AWS::CloudFormation::StackSet.DeploymentTargets)
diff --git a/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_operationpreferences.go b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_operationpreferences.go
similarity index 96%
rename from goformation/cloudformation/cloudformation/aws-cloudformation-stackset_operationpreferences.go
rename to pkg/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_operationpreferences.go
index 227b804a30..4d25d9117d 100644
--- a/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_operationpreferences.go
+++ b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_operationpreferences.go
@@ -1,9 +1,9 @@
 package cloudformation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StackSet_OperationPreferences AWS CloudFormation Resource (AWS::CloudFormation::StackSet.OperationPreferences)
diff --git a/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_parameter.go b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_parameter.go
similarity index 92%
rename from goformation/cloudformation/cloudformation/aws-cloudformation-stackset_parameter.go
rename to pkg/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_parameter.go
index 7b889605f6..fc446a3cf4 100644
--- a/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_parameter.go
+++ b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_parameter.go
@@ -1,9 +1,9 @@
 package cloudformation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StackSet_Parameter AWS CloudFormation Resource (AWS::CloudFormation::StackSet.Parameter)
diff --git a/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_stackinstances.go b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_stackinstances.go
similarity index 94%
rename from goformation/cloudformation/cloudformation/aws-cloudformation-stackset_stackinstances.go
rename to pkg/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_stackinstances.go
index 24b11133c5..93d850a15d 100644
--- a/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_stackinstances.go
+++ b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_stackinstances.go
@@ -1,9 +1,9 @@
 package cloudformation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StackSet_StackInstances AWS CloudFormation Resource (AWS::CloudFormation::StackSet.StackInstances)
diff --git a/goformation/cloudformation/cloudformation/aws-cloudformation-typeactivation.go b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-typeactivation.go
similarity index 97%
rename from goformation/cloudformation/cloudformation/aws-cloudformation-typeactivation.go
rename to pkg/goformation/cloudformation/cloudformation/aws-cloudformation-typeactivation.go
index 39c71accf7..4454685c49 100644
--- a/goformation/cloudformation/cloudformation/aws-cloudformation-typeactivation.go
+++ b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-typeactivation.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TypeActivation AWS CloudFormation Resource (AWS::CloudFormation::TypeActivation)
diff --git a/goformation/cloudformation/cloudformation/aws-cloudformation-typeactivation_loggingconfig.go b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-typeactivation_loggingconfig.go
similarity index 93%
rename from goformation/cloudformation/cloudformation/aws-cloudformation-typeactivation_loggingconfig.go
rename to pkg/goformation/cloudformation/cloudformation/aws-cloudformation-typeactivation_loggingconfig.go
index 878878bd75..8456bc7b55 100644
--- a/goformation/cloudformation/cloudformation/aws-cloudformation-typeactivation_loggingconfig.go
+++ b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-typeactivation_loggingconfig.go
@@ -1,9 +1,9 @@
 package cloudformation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TypeActivation_LoggingConfig AWS CloudFormation Resource (AWS::CloudFormation::TypeActivation.LoggingConfig)
diff --git a/goformation/cloudformation/cloudformation/aws-cloudformation-waitcondition.go b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-waitcondition.go
similarity index 97%
rename from goformation/cloudformation/cloudformation/aws-cloudformation-waitcondition.go
rename to pkg/goformation/cloudformation/cloudformation/aws-cloudformation-waitcondition.go
index 644e47d0fa..b4ad634674 100644
--- a/goformation/cloudformation/cloudformation/aws-cloudformation-waitcondition.go
+++ b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-waitcondition.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WaitCondition AWS CloudFormation Resource (AWS::CloudFormation::WaitCondition)
diff --git a/goformation/cloudformation/cloudformation/aws-cloudformation-waitconditionhandle.go b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-waitconditionhandle.go
similarity index 98%
rename from goformation/cloudformation/cloudformation/aws-cloudformation-waitconditionhandle.go
rename to pkg/goformation/cloudformation/cloudformation/aws-cloudformation-waitconditionhandle.go
index f00de9c9ac..5e0313adce 100644
--- a/goformation/cloudformation/cloudformation/aws-cloudformation-waitconditionhandle.go
+++ b/pkg/goformation/cloudformation/cloudformation/aws-cloudformation-waitconditionhandle.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WaitConditionHandle AWS CloudFormation Resource (AWS::CloudFormation::WaitConditionHandle)
diff --git a/goformation/cloudformation/cloudformation/tag.go b/pkg/goformation/cloudformation/cloudformation/tag.go
similarity index 91%
rename from goformation/cloudformation/cloudformation/tag.go
rename to pkg/goformation/cloudformation/cloudformation/tag.go
index d5b8f14f28..28716b8371 100644
--- a/goformation/cloudformation/cloudformation/tag.go
+++ b/pkg/goformation/cloudformation/cloudformation/tag.go
@@ -1,9 +1,9 @@
 package cloudformation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Tag AWS CloudFormation Resource (Tag)
diff --git a/goformation/cloudformation/cloudformation_suite_test.go b/pkg/goformation/cloudformation/cloudformation_suite_test.go
similarity index 100%
rename from goformation/cloudformation/cloudformation_suite_test.go
rename to pkg/goformation/cloudformation/cloudformation_suite_test.go
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy.go
similarity index 98%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy.go
index 238e86bdd7..03730d9468 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CachePolicy AWS CloudFormation Resource (AWS::CloudFront::CachePolicy)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_cachepolicyconfig.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_cachepolicyconfig.go
similarity index 95%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_cachepolicyconfig.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_cachepolicyconfig.go
index 3ccf7a5b7d..908938db4d 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_cachepolicyconfig.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_cachepolicyconfig.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CachePolicy_CachePolicyConfig AWS CloudFormation Resource (AWS::CloudFront::CachePolicy.CachePolicyConfig)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_cookiesconfig.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_cookiesconfig.go
similarity index 93%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_cookiesconfig.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_cookiesconfig.go
index e70e5387a9..1a2107a4ff 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_cookiesconfig.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_cookiesconfig.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CachePolicy_CookiesConfig AWS CloudFormation Resource (AWS::CloudFront::CachePolicy.CookiesConfig)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_headersconfig.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_headersconfig.go
similarity index 93%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_headersconfig.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_headersconfig.go
index 88871634c1..e1453a4e69 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_headersconfig.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_headersconfig.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CachePolicy_HeadersConfig AWS CloudFormation Resource (AWS::CloudFront::CachePolicy.HeadersConfig)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_parametersincachekeyandforwardedtoorigin.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_parametersincachekeyandforwardedtoorigin.go
similarity index 96%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_parametersincachekeyandforwardedtoorigin.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_parametersincachekeyandforwardedtoorigin.go
index 61352459e7..1b4b075f92 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_parametersincachekeyandforwardedtoorigin.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_parametersincachekeyandforwardedtoorigin.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CachePolicy_ParametersInCacheKeyAndForwardedToOrigin AWS CloudFormation Resource (AWS::CloudFront::CachePolicy.ParametersInCacheKeyAndForwardedToOrigin)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_querystringsconfig.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_querystringsconfig.go
similarity index 93%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_querystringsconfig.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_querystringsconfig.go
index 36d33c9625..bd380ed787 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_querystringsconfig.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_querystringsconfig.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CachePolicy_QueryStringsConfig AWS CloudFormation Resource (AWS::CloudFront::CachePolicy.QueryStringsConfig)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-cloudfrontoriginaccessidentity.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-cloudfrontoriginaccessidentity.go
similarity index 98%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-cloudfrontoriginaccessidentity.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-cloudfrontoriginaccessidentity.go
index 72d7b116c7..09b65d250a 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-cloudfrontoriginaccessidentity.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-cloudfrontoriginaccessidentity.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CloudFrontOriginAccessIdentity AWS CloudFormation Resource (AWS::CloudFront::CloudFrontOriginAccessIdentity)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-cloudfrontoriginaccessidentity_cloudfrontoriginaccessidentityconfig.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-cloudfrontoriginaccessidentity_cloudfrontoriginaccessidentityconfig.go
similarity index 93%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-cloudfrontoriginaccessidentity_cloudfrontoriginaccessidentityconfig.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-cloudfrontoriginaccessidentity_cloudfrontoriginaccessidentityconfig.go
index 78288808db..ec74f57e76 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-cloudfrontoriginaccessidentity_cloudfrontoriginaccessidentityconfig.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-cloudfrontoriginaccessidentity_cloudfrontoriginaccessidentityconfig.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CloudFrontOriginAccessIdentity_CloudFrontOriginAccessIdentityConfig AWS CloudFormation Resource (AWS::CloudFront::CloudFrontOriginAccessIdentity.CloudFrontOriginAccessIdentityConfig)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution.go
similarity index 96%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-distribution.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution.go
index 4e50b1881a..d502e772a6 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution.go
@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Distribution AWS CloudFormation Resource (AWS::CloudFront::Distribution)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_cachebehavior.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_cachebehavior.go
similarity index 98%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-distribution_cachebehavior.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_cachebehavior.go
index e7cb39ac4d..7efcf71f2e 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_cachebehavior.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_cachebehavior.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Distribution_CacheBehavior AWS CloudFormation Resource (AWS::CloudFront::Distribution.CacheBehavior)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_cookies.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_cookies.go
similarity index 92%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-distribution_cookies.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_cookies.go
index 4c28270dfe..c20335dc77 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_cookies.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_cookies.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Distribution_Cookies AWS CloudFormation Resource (AWS::CloudFront::Distribution.Cookies)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_customerrorresponse.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_customerrorresponse.go
similarity index 94%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-distribution_customerrorresponse.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_customerrorresponse.go
index fbbd0b6724..4a69d04639 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_customerrorresponse.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_customerrorresponse.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Distribution_CustomErrorResponse AWS CloudFormation Resource (AWS::CloudFront::Distribution.CustomErrorResponse)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_customoriginconfig.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_customoriginconfig.go
similarity index 95%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-distribution_customoriginconfig.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_customoriginconfig.go
index 56f303555f..2fce469b96 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_customoriginconfig.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_customoriginconfig.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Distribution_CustomOriginConfig AWS CloudFormation Resource (AWS::CloudFront::Distribution.CustomOriginConfig)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_defaultcachebehavior.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_defaultcachebehavior.go
similarity index 98%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-distribution_defaultcachebehavior.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_defaultcachebehavior.go
index a041489481..0cbd509cd7 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_defaultcachebehavior.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_defaultcachebehavior.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Distribution_DefaultCacheBehavior AWS CloudFormation Resource (AWS::CloudFront::Distribution.DefaultCacheBehavior)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_distributionconfig.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_distributionconfig.go
similarity index 98%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-distribution_distributionconfig.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_distributionconfig.go
index 6ecb812f09..4558818710 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_distributionconfig.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_distributionconfig.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Distribution_DistributionConfig AWS CloudFormation Resource (AWS::CloudFront::Distribution.DistributionConfig)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_forwardedvalues.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_forwardedvalues.go
similarity index 94%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-distribution_forwardedvalues.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_forwardedvalues.go
index 6c9dce77bd..c1d042bd08 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_forwardedvalues.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_forwardedvalues.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Distribution_ForwardedValues AWS CloudFormation Resource (AWS::CloudFront::Distribution.ForwardedValues)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_functionassociation.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_functionassociation.go
similarity index 93%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-distribution_functionassociation.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_functionassociation.go
index da0bfb7eb9..1feab2f82b 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_functionassociation.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_functionassociation.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Distribution_FunctionAssociation AWS CloudFormation Resource (AWS::CloudFront::Distribution.FunctionAssociation)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_georestriction.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_georestriction.go
similarity index 93%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-distribution_georestriction.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_georestriction.go
index b6ca64720d..232c90645a 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_georestriction.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_georestriction.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Distribution_GeoRestriction AWS CloudFormation Resource (AWS::CloudFront::Distribution.GeoRestriction)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_lambdafunctionassociation.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_lambdafunctionassociation.go
similarity index 94%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-distribution_lambdafunctionassociation.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_lambdafunctionassociation.go
index bf8929c578..c02a7f1fc3 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_lambdafunctionassociation.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_lambdafunctionassociation.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Distribution_LambdaFunctionAssociation AWS CloudFormation Resource (AWS::CloudFront::Distribution.LambdaFunctionAssociation)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_legacycustomorigin.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_legacycustomorigin.go
similarity index 95%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-distribution_legacycustomorigin.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_legacycustomorigin.go
index c019b0c92d..fe49b714a4 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_legacycustomorigin.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_legacycustomorigin.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Distribution_LegacyCustomOrigin AWS CloudFormation Resource (AWS::CloudFront::Distribution.LegacyCustomOrigin)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_legacys3origin.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_legacys3origin.go
similarity index 93%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-distribution_legacys3origin.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_legacys3origin.go
index 9a9f3b893c..4aaae25309 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_legacys3origin.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_legacys3origin.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Distribution_LegacyS3Origin AWS CloudFormation Resource (AWS::CloudFront::Distribution.LegacyS3Origin)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_logging.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_logging.go
similarity index 93%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-distribution_logging.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_logging.go
index 97e68ea3a1..56b4efa559 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_logging.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_logging.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Distribution_Logging AWS CloudFormation Resource (AWS::CloudFront::Distribution.Logging)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origin.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origin.go
similarity index 96%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origin.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origin.go
index 6ab76131c7..0d078b4933 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origin.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origin.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Distribution_Origin AWS CloudFormation Resource (AWS::CloudFront::Distribution.Origin)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origincustomheader.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origincustomheader.go
similarity index 93%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origincustomheader.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origincustomheader.go
index 313717b8dd..d4c05d5593 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origincustomheader.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origincustomheader.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Distribution_OriginCustomHeader AWS CloudFormation Resource (AWS::CloudFront::Distribution.OriginCustomHeader)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroup.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroup.go
similarity index 93%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroup.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroup.go
index bb50ecf183..979cd5327e 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroup.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroup.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Distribution_OriginGroup AWS CloudFormation Resource (AWS::CloudFront::Distribution.OriginGroup)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupfailovercriteria.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupfailovercriteria.go
similarity index 95%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupfailovercriteria.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupfailovercriteria.go
index 3b420e7940..81896e6d8f 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupfailovercriteria.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupfailovercriteria.go
@@ -1,7 +1,7 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Distribution_OriginGroupFailoverCriteria AWS CloudFormation Resource (AWS::CloudFront::Distribution.OriginGroupFailoverCriteria)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupmember.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupmember.go
similarity index 91%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupmember.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupmember.go
index 363b0eb6f8..b7058665b8 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupmember.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupmember.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Distribution_OriginGroupMember AWS CloudFormation Resource (AWS::CloudFront::Distribution.OriginGroupMember)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupmembers.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupmembers.go
similarity index 93%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupmembers.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupmembers.go
index 81a94a426f..a958bcce0c 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupmembers.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupmembers.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Distribution_OriginGroupMembers AWS CloudFormation Resource (AWS::CloudFront::Distribution.OriginGroupMembers)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroups.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroups.go
similarity index 92%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroups.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroups.go
index 09bf0b054e..021c65326f 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroups.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroups.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Distribution_OriginGroups AWS CloudFormation Resource (AWS::CloudFront::Distribution.OriginGroups)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_originshield.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_originshield.go
similarity index 93%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-distribution_originshield.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_originshield.go
index 8069923efc..f8bc3821ac 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_originshield.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_originshield.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Distribution_OriginShield AWS CloudFormation Resource (AWS::CloudFront::Distribution.OriginShield)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_restrictions.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_restrictions.go
similarity index 95%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-distribution_restrictions.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_restrictions.go
index 82441bcf2f..e9964f5383 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_restrictions.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_restrictions.go
@@ -1,7 +1,7 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Distribution_Restrictions AWS CloudFormation Resource (AWS::CloudFront::Distribution.Restrictions)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_s3originconfig.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_s3originconfig.go
similarity index 92%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-distribution_s3originconfig.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_s3originconfig.go
index 58f5084114..00bc488123 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_s3originconfig.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_s3originconfig.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Distribution_S3OriginConfig AWS CloudFormation Resource (AWS::CloudFront::Distribution.S3OriginConfig)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_statuscodes.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_statuscodes.go
similarity index 92%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-distribution_statuscodes.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_statuscodes.go
index 3dbcc69edc..ea103e0b1e 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_statuscodes.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_statuscodes.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Distribution_StatusCodes AWS CloudFormation Resource (AWS::CloudFront::Distribution.StatusCodes)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_viewercertificate.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_viewercertificate.go
similarity index 95%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-distribution_viewercertificate.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_viewercertificate.go
index f31b33a83f..8b8ef770a3 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_viewercertificate.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_viewercertificate.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Distribution_ViewerCertificate AWS CloudFormation Resource (AWS::CloudFront::Distribution.ViewerCertificate)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-function.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-function.go
similarity index 97%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-function.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-function.go
index e1984e99c2..785ad655fa 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-function.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-function.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function AWS CloudFormation Resource (AWS::CloudFront::Function)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-function_functionconfig.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-function_functionconfig.go
similarity index 92%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-function_functionconfig.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-function_functionconfig.go
index 268fb2f83d..21f1fcfb2e 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-function_functionconfig.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-function_functionconfig.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_FunctionConfig AWS CloudFormation Resource (AWS::CloudFront::Function.FunctionConfig)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-function_functionmetadata.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-function_functionmetadata.go
similarity index 91%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-function_functionmetadata.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-function_functionmetadata.go
index 8f898aca5c..4b8d762d52 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-function_functionmetadata.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-function_functionmetadata.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_FunctionMetadata AWS CloudFormation Resource (AWS::CloudFront::Function.FunctionMetadata)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-keygroup.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-keygroup.go
similarity index 98%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-keygroup.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-keygroup.go
index 92b2ca2396..deb2a81a3d 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-keygroup.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-keygroup.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // KeyGroup AWS CloudFormation Resource (AWS::CloudFront::KeyGroup)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-keygroup_keygroupconfig.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-keygroup_keygroupconfig.go
similarity index 93%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-keygroup_keygroupconfig.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-keygroup_keygroupconfig.go
index 7524448707..8075cdcc78 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-keygroup_keygroupconfig.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-keygroup_keygroupconfig.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // KeyGroup_KeyGroupConfig AWS CloudFormation Resource (AWS::CloudFront::KeyGroup.KeyGroupConfig)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy.go
similarity index 98%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy.go
index bcc82147ea..9b1b85b4ad 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // OriginRequestPolicy AWS CloudFormation Resource (AWS::CloudFront::OriginRequestPolicy)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_cookiesconfig.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_cookiesconfig.go
similarity index 93%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_cookiesconfig.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_cookiesconfig.go
index 970b6783ec..07f240afda 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_cookiesconfig.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_cookiesconfig.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // OriginRequestPolicy_CookiesConfig AWS CloudFormation Resource (AWS::CloudFront::OriginRequestPolicy.CookiesConfig)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_headersconfig.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_headersconfig.go
similarity index 93%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_headersconfig.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_headersconfig.go
index 27d9adaac4..0c94126095 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_headersconfig.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_headersconfig.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // OriginRequestPolicy_HeadersConfig AWS CloudFormation Resource (AWS::CloudFront::OriginRequestPolicy.HeadersConfig)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_originrequestpolicyconfig.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_originrequestpolicyconfig.go
similarity index 95%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_originrequestpolicyconfig.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_originrequestpolicyconfig.go
index 95755e53d8..b5bfbbe019 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_originrequestpolicyconfig.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_originrequestpolicyconfig.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // OriginRequestPolicy_OriginRequestPolicyConfig AWS CloudFormation Resource (AWS::CloudFront::OriginRequestPolicy.OriginRequestPolicyConfig)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_querystringsconfig.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_querystringsconfig.go
similarity index 93%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_querystringsconfig.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_querystringsconfig.go
index 69d530490d..4c04b56f64 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_querystringsconfig.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_querystringsconfig.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // OriginRequestPolicy_QueryStringsConfig AWS CloudFormation Resource (AWS::CloudFront::OriginRequestPolicy.QueryStringsConfig)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-publickey.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-publickey.go
similarity index 98%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-publickey.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-publickey.go
index af98d54fba..bdc60d9916 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-publickey.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-publickey.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PublicKey AWS CloudFormation Resource (AWS::CloudFront::PublicKey)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-publickey_publickeyconfig.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-publickey_publickeyconfig.go
similarity index 94%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-publickey_publickeyconfig.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-publickey_publickeyconfig.go
index 0bed96e25f..3538a7e05b 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-publickey_publickeyconfig.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-publickey_publickeyconfig.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PublicKey_PublicKeyConfig AWS CloudFormation Resource (AWS::CloudFront::PublicKey.PublicKeyConfig)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig.go
similarity index 97%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig.go
index d8576dfa56..d8192c2c99 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RealtimeLogConfig AWS CloudFormation Resource (AWS::CloudFront::RealtimeLogConfig)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig_endpoint.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig_endpoint.go
similarity index 93%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig_endpoint.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig_endpoint.go
index 76c0b5bcc7..4a5d3563b3 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig_endpoint.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig_endpoint.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RealtimeLogConfig_EndPoint AWS CloudFormation Resource (AWS::CloudFront::RealtimeLogConfig.EndPoint)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig_kinesisstreamconfig.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig_kinesisstreamconfig.go
similarity index 93%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig_kinesisstreamconfig.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig_kinesisstreamconfig.go
index 9d2a65f5ce..0ea0590335 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig_kinesisstreamconfig.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig_kinesisstreamconfig.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RealtimeLogConfig_KinesisStreamConfig AWS CloudFormation Resource (AWS::CloudFront::RealtimeLogConfig.KinesisStreamConfig)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy.go
similarity index 98%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy.go
index e72ad6afc4..a90e3b2b6c 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResponseHeadersPolicy AWS CloudFormation Resource (AWS::CloudFront::ResponseHeadersPolicy)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolallowheaders.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolallowheaders.go
similarity index 92%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolallowheaders.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolallowheaders.go
index b80777e96a..3fed6269bb 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolallowheaders.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolallowheaders.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResponseHeadersPolicy_AccessControlAllowHeaders AWS CloudFormation Resource (AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowHeaders)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolallowmethods.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolallowmethods.go
similarity index 92%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolallowmethods.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolallowmethods.go
index 6243f1c38c..653668eebb 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolallowmethods.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolallowmethods.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResponseHeadersPolicy_AccessControlAllowMethods AWS CloudFormation Resource (AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowMethods)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolalloworigins.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolalloworigins.go
similarity index 92%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolalloworigins.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolalloworigins.go
index 17e3758f97..0c5366db82 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolalloworigins.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolalloworigins.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResponseHeadersPolicy_AccessControlAllowOrigins AWS CloudFormation Resource (AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowOrigins)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolexposeheaders.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolexposeheaders.go
similarity index 92%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolexposeheaders.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolexposeheaders.go
index 00cc48b12a..670f83244b 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolexposeheaders.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolexposeheaders.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResponseHeadersPolicy_AccessControlExposeHeaders AWS CloudFormation Resource (AWS::CloudFront::ResponseHeadersPolicy.AccessControlExposeHeaders)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_contentsecuritypolicy.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_contentsecuritypolicy.go
similarity index 93%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_contentsecuritypolicy.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_contentsecuritypolicy.go
index 8caed5abfb..6826e402ab 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_contentsecuritypolicy.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_contentsecuritypolicy.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResponseHeadersPolicy_ContentSecurityPolicy AWS CloudFormation Resource (AWS::CloudFront::ResponseHeadersPolicy.ContentSecurityPolicy)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_contenttypeoptions.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_contenttypeoptions.go
similarity index 92%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_contenttypeoptions.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_contenttypeoptions.go
index b859fbfe03..21452c6a2e 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_contenttypeoptions.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_contenttypeoptions.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResponseHeadersPolicy_ContentTypeOptions AWS CloudFormation Resource (AWS::CloudFront::ResponseHeadersPolicy.ContentTypeOptions)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_corsconfig.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_corsconfig.go
similarity index 96%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_corsconfig.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_corsconfig.go
index 4622c3f2cf..1d2d6bbb7e 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_corsconfig.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_corsconfig.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResponseHeadersPolicy_CorsConfig AWS CloudFormation Resource (AWS::CloudFront::ResponseHeadersPolicy.CorsConfig)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_customheader.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_customheader.go
similarity index 94%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_customheader.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_customheader.go
index 935092d45f..0fa2704422 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_customheader.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_customheader.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResponseHeadersPolicy_CustomHeader AWS CloudFormation Resource (AWS::CloudFront::ResponseHeadersPolicy.CustomHeader)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_customheadersconfig.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_customheadersconfig.go
similarity index 95%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_customheadersconfig.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_customheadersconfig.go
index a36f4501ff..81275c9646 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_customheadersconfig.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_customheadersconfig.go
@@ -1,7 +1,7 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResponseHeadersPolicy_CustomHeadersConfig AWS CloudFormation Resource (AWS::CloudFront::ResponseHeadersPolicy.CustomHeadersConfig)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_frameoptions.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_frameoptions.go
similarity index 93%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_frameoptions.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_frameoptions.go
index 55cac6d249..a5cef66c0c 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_frameoptions.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_frameoptions.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResponseHeadersPolicy_FrameOptions AWS CloudFormation Resource (AWS::CloudFront::ResponseHeadersPolicy.FrameOptions)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_referrerpolicy.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_referrerpolicy.go
similarity index 93%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_referrerpolicy.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_referrerpolicy.go
index 787e0a8b08..2972081936 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_referrerpolicy.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_referrerpolicy.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResponseHeadersPolicy_ReferrerPolicy AWS CloudFormation Resource (AWS::CloudFront::ResponseHeadersPolicy.ReferrerPolicy)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_responseheaderspolicyconfig.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_responseheaderspolicyconfig.go
similarity index 95%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_responseheaderspolicyconfig.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_responseheaderspolicyconfig.go
index cceaf9164e..36d32cd3c4 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_responseheaderspolicyconfig.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_responseheaderspolicyconfig.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResponseHeadersPolicy_ResponseHeadersPolicyConfig AWS CloudFormation Resource (AWS::CloudFront::ResponseHeadersPolicy.ResponseHeadersPolicyConfig)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_securityheadersconfig.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_securityheadersconfig.go
similarity index 98%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_securityheadersconfig.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_securityheadersconfig.go
index d873e548e7..6abefba5bb 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_securityheadersconfig.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_securityheadersconfig.go
@@ -1,7 +1,7 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResponseHeadersPolicy_SecurityHeadersConfig AWS CloudFormation Resource (AWS::CloudFront::ResponseHeadersPolicy.SecurityHeadersConfig)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_stricttransportsecurity.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_stricttransportsecurity.go
similarity index 95%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_stricttransportsecurity.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_stricttransportsecurity.go
index 1b6f837ef9..9ac3838017 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_stricttransportsecurity.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_stricttransportsecurity.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResponseHeadersPolicy_StrictTransportSecurity AWS CloudFormation Resource (AWS::CloudFront::ResponseHeadersPolicy.StrictTransportSecurity)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_xssprotection.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_xssprotection.go
similarity index 94%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_xssprotection.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_xssprotection.go
index 67bfe09ef3..d54a454183 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_xssprotection.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_xssprotection.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResponseHeadersPolicy_XSSProtection AWS CloudFormation Resource (AWS::CloudFront::ResponseHeadersPolicy.XSSProtection)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution.go
similarity index 96%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution.go
index 7f493ea1b0..2d5014264f 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution.go
@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StreamingDistribution AWS CloudFormation Resource (AWS::CloudFront::StreamingDistribution)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_logging.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_logging.go
similarity index 93%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_logging.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_logging.go
index c1d0b0873f..6a5aa94c43 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_logging.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_logging.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StreamingDistribution_Logging AWS CloudFormation Resource (AWS::CloudFront::StreamingDistribution.Logging)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_s3origin.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_s3origin.go
similarity index 93%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_s3origin.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_s3origin.go
index cec7734368..032df483eb 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_s3origin.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_s3origin.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StreamingDistribution_S3Origin AWS CloudFormation Resource (AWS::CloudFront::StreamingDistribution.S3Origin)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_streamingdistributionconfig.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_streamingdistributionconfig.go
similarity index 96%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_streamingdistributionconfig.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_streamingdistributionconfig.go
index f1825bd3bf..b8a8faac65 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_streamingdistributionconfig.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_streamingdistributionconfig.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StreamingDistribution_StreamingDistributionConfig AWS CloudFormation Resource (AWS::CloudFront::StreamingDistribution.StreamingDistributionConfig)
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_trustedsigners.go b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_trustedsigners.go
similarity index 93%
rename from goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_trustedsigners.go
rename to pkg/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_trustedsigners.go
index 884c90771e..ba706fc03a 100644
--- a/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_trustedsigners.go
+++ b/pkg/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_trustedsigners.go
@@ -1,9 +1,9 @@
 package cloudfront
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StreamingDistribution_TrustedSigners AWS CloudFormation Resource (AWS::CloudFront::StreamingDistribution.TrustedSigners)
diff --git a/goformation/cloudformation/cloudtrail/aws-cloudtrail-trail.go b/pkg/goformation/cloudformation/cloudtrail/aws-cloudtrail-trail.go
similarity index 97%
rename from goformation/cloudformation/cloudtrail/aws-cloudtrail-trail.go
rename to pkg/goformation/cloudformation/cloudtrail/aws-cloudtrail-trail.go
index 7eb0d889f5..304ae3a1c4 100644
--- a/goformation/cloudformation/cloudtrail/aws-cloudtrail-trail.go
+++ b/pkg/goformation/cloudformation/cloudtrail/aws-cloudtrail-trail.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Trail AWS CloudFormation Resource (AWS::CloudTrail::Trail)
diff --git a/goformation/cloudformation/cloudtrail/aws-cloudtrail-trail_dataresource.go b/pkg/goformation/cloudformation/cloudtrail/aws-cloudtrail-trail_dataresource.go
similarity index 92%
rename from goformation/cloudformation/cloudtrail/aws-cloudtrail-trail_dataresource.go
rename to pkg/goformation/cloudformation/cloudtrail/aws-cloudtrail-trail_dataresource.go
index 597485a882..54cdacdd7f 100644
--- a/goformation/cloudformation/cloudtrail/aws-cloudtrail-trail_dataresource.go
+++ b/pkg/goformation/cloudformation/cloudtrail/aws-cloudtrail-trail_dataresource.go
@@ -1,9 +1,9 @@
 package cloudtrail
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Trail_DataResource AWS CloudFormation Resource (AWS::CloudTrail::Trail.DataResource)
diff --git a/goformation/cloudformation/cloudtrail/aws-cloudtrail-trail_eventselector.go b/pkg/goformation/cloudformation/cloudtrail/aws-cloudtrail-trail_eventselector.go
similarity index 94%
rename from goformation/cloudformation/cloudtrail/aws-cloudtrail-trail_eventselector.go
rename to pkg/goformation/cloudformation/cloudtrail/aws-cloudtrail-trail_eventselector.go
index 81150bb078..5c002f489f 100644
--- a/goformation/cloudformation/cloudtrail/aws-cloudtrail-trail_eventselector.go
+++ b/pkg/goformation/cloudformation/cloudtrail/aws-cloudtrail-trail_eventselector.go
@@ -1,9 +1,9 @@
 package cloudtrail
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Trail_EventSelector AWS CloudFormation Resource (AWS::CloudTrail::Trail.EventSelector)
diff --git a/goformation/cloudformation/cloudtrail/aws-cloudtrail-trail_insightselector.go b/pkg/goformation/cloudformation/cloudtrail/aws-cloudtrail-trail_insightselector.go
similarity index 91%
rename from goformation/cloudformation/cloudtrail/aws-cloudtrail-trail_insightselector.go
rename to pkg/goformation/cloudformation/cloudtrail/aws-cloudtrail-trail_insightselector.go
index 68aed849cc..48e8c82f1b 100644
--- a/goformation/cloudformation/cloudtrail/aws-cloudtrail-trail_insightselector.go
+++ b/pkg/goformation/cloudformation/cloudtrail/aws-cloudtrail-trail_insightselector.go
@@ -1,9 +1,9 @@
 package cloudtrail
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Trail_InsightSelector AWS CloudFormation Resource (AWS::CloudTrail::Trail.InsightSelector)
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm.go b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm.go
similarity index 98%
rename from goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm.go
rename to pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm.go
index 9039aee7b9..9f0413b40a 100644
--- a/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm.go
+++ b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Alarm AWS CloudFormation Resource (AWS::CloudWatch::Alarm)
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_dimension.go b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_dimension.go
similarity index 92%
rename from goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_dimension.go
rename to pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_dimension.go
index d602ca4654..6bc18ef2b4 100644
--- a/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_dimension.go
+++ b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_dimension.go
@@ -1,9 +1,9 @@
 package cloudwatch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Alarm_Dimension AWS CloudFormation Resource (AWS::CloudWatch::Alarm.Dimension)
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_metric.go b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_metric.go
similarity index 93%
rename from goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_metric.go
rename to pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_metric.go
index 840a960c54..94ee83ae48 100644
--- a/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_metric.go
+++ b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_metric.go
@@ -1,9 +1,9 @@
 package cloudwatch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Alarm_Metric AWS CloudFormation Resource (AWS::CloudWatch::Alarm.Metric)
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_metricdataquery.go b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_metricdataquery.go
similarity index 95%
rename from goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_metricdataquery.go
rename to pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_metricdataquery.go
index e4951c411e..1197bb0de0 100644
--- a/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_metricdataquery.go
+++ b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_metricdataquery.go
@@ -1,9 +1,9 @@
 package cloudwatch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Alarm_MetricDataQuery AWS CloudFormation Resource (AWS::CloudWatch::Alarm.MetricDataQuery)
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_metricstat.go b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_metricstat.go
similarity index 94%
rename from goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_metricstat.go
rename to pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_metricstat.go
index 2426b9504e..bfd1087b33 100644
--- a/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_metricstat.go
+++ b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_metricstat.go
@@ -1,9 +1,9 @@
 package cloudwatch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Alarm_MetricStat AWS CloudFormation Resource (AWS::CloudWatch::Alarm.MetricStat)
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector.go b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector.go
similarity index 97%
rename from goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector.go
rename to pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector.go
index c72e17b6c2..216793defe 100644
--- a/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector.go
+++ b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AnomalyDetector AWS CloudFormation Resource (AWS::CloudWatch::AnomalyDetector)
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_configuration.go b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_configuration.go
similarity index 93%
rename from goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_configuration.go
rename to pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_configuration.go
index 445b2fbfdf..6d4a1fa2aa 100644
--- a/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_configuration.go
+++ b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_configuration.go
@@ -1,9 +1,9 @@
 package cloudwatch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AnomalyDetector_Configuration AWS CloudFormation Resource (AWS::CloudWatch::AnomalyDetector.Configuration)
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_dimension.go b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_dimension.go
similarity index 92%
rename from goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_dimension.go
rename to pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_dimension.go
index 834d2da230..de3c840907 100644
--- a/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_dimension.go
+++ b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_dimension.go
@@ -1,9 +1,9 @@
 package cloudwatch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AnomalyDetector_Dimension AWS CloudFormation Resource (AWS::CloudWatch::AnomalyDetector.Dimension)
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metric.go b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metric.go
similarity index 93%
rename from goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metric.go
rename to pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metric.go
index 1e1ee805c7..2a53b13544 100644
--- a/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metric.go
+++ b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metric.go
@@ -1,9 +1,9 @@
 package cloudwatch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AnomalyDetector_Metric AWS CloudFormation Resource (AWS::CloudWatch::AnomalyDetector.Metric)
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricdataqueries.go b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricdataqueries.go
similarity index 94%
rename from goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricdataqueries.go
rename to pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricdataqueries.go
index 40c7d8e62f..b3b13a4523 100644
--- a/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricdataqueries.go
+++ b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricdataqueries.go
@@ -1,7 +1,7 @@
 package cloudwatch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AnomalyDetector_MetricDataQueries AWS CloudFormation Resource (AWS::CloudWatch::AnomalyDetector.MetricDataQueries)
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricdataquery.go b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricdataquery.go
similarity index 96%
rename from goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricdataquery.go
rename to pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricdataquery.go
index 05e38cbe2b..66f2d07662 100644
--- a/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricdataquery.go
+++ b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricdataquery.go
@@ -1,9 +1,9 @@
 package cloudwatch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AnomalyDetector_MetricDataQuery AWS CloudFormation Resource (AWS::CloudWatch::AnomalyDetector.MetricDataQuery)
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricmathanomalydetector.go b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricmathanomalydetector.go
similarity index 96%
rename from goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricmathanomalydetector.go
rename to pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricmathanomalydetector.go
index 4515d92248..37d4b93569 100644
--- a/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricmathanomalydetector.go
+++ b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricmathanomalydetector.go
@@ -1,7 +1,7 @@
 package cloudwatch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AnomalyDetector_MetricMathAnomalyDetector AWS CloudFormation Resource (AWS::CloudWatch::AnomalyDetector.MetricMathAnomalyDetector)
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricstat.go b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricstat.go
similarity index 94%
rename from goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricstat.go
rename to pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricstat.go
index 08dcbf160f..0c390df881 100644
--- a/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricstat.go
+++ b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricstat.go
@@ -1,9 +1,9 @@
 package cloudwatch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AnomalyDetector_MetricStat AWS CloudFormation Resource (AWS::CloudWatch::AnomalyDetector.MetricStat)
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_range.go b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_range.go
similarity index 92%
rename from goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_range.go
rename to pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_range.go
index 9581e1d800..8dcb3fa69e 100644
--- a/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_range.go
+++ b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_range.go
@@ -1,9 +1,9 @@
 package cloudwatch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AnomalyDetector_Range AWS CloudFormation Resource (AWS::CloudWatch::AnomalyDetector.Range)
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_singlemetricanomalydetector.go b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_singlemetricanomalydetector.go
similarity index 95%
rename from goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_singlemetricanomalydetector.go
rename to pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_singlemetricanomalydetector.go
index 4648de5cbf..7359e8da48 100644
--- a/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_singlemetricanomalydetector.go
+++ b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_singlemetricanomalydetector.go
@@ -1,9 +1,9 @@
 package cloudwatch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AnomalyDetector_SingleMetricAnomalyDetector AWS CloudFormation Resource (AWS::CloudWatch::AnomalyDetector.SingleMetricAnomalyDetector)
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-compositealarm.go b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-compositealarm.go
similarity index 97%
rename from goformation/cloudformation/cloudwatch/aws-cloudwatch-compositealarm.go
rename to pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-compositealarm.go
index 1b16744d98..7944bfa9a8 100644
--- a/goformation/cloudformation/cloudwatch/aws-cloudwatch-compositealarm.go
+++ b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-compositealarm.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CompositeAlarm AWS CloudFormation Resource (AWS::CloudWatch::CompositeAlarm)
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-dashboard.go b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-dashboard.go
similarity index 96%
rename from goformation/cloudformation/cloudwatch/aws-cloudwatch-dashboard.go
rename to pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-dashboard.go
index 4432468b8d..087f539526 100644
--- a/goformation/cloudformation/cloudwatch/aws-cloudwatch-dashboard.go
+++ b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-dashboard.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dashboard AWS CloudFormation Resource (AWS::CloudWatch::Dashboard)
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-insightrule.go b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-insightrule.go
similarity index 97%
rename from goformation/cloudformation/cloudwatch/aws-cloudwatch-insightrule.go
rename to pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-insightrule.go
index db039f2af4..44283dce3f 100644
--- a/goformation/cloudformation/cloudwatch/aws-cloudwatch-insightrule.go
+++ b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-insightrule.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InsightRule AWS CloudFormation Resource (AWS::CloudWatch::InsightRule)
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-insightrule_tags.go b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-insightrule_tags.go
similarity index 94%
rename from goformation/cloudformation/cloudwatch/aws-cloudwatch-insightrule_tags.go
rename to pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-insightrule_tags.go
index 26d952fb18..f18b5036bf 100644
--- a/goformation/cloudformation/cloudwatch/aws-cloudwatch-insightrule_tags.go
+++ b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-insightrule_tags.go
@@ -1,7 +1,7 @@
 package cloudwatch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InsightRule_Tags AWS CloudFormation Resource (AWS::CloudWatch::InsightRule.Tags)
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-metricstream.go b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-metricstream.go
similarity index 96%
rename from goformation/cloudformation/cloudwatch/aws-cloudwatch-metricstream.go
rename to pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-metricstream.go
index d24cc07f42..313493a508 100644
--- a/goformation/cloudformation/cloudwatch/aws-cloudwatch-metricstream.go
+++ b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-metricstream.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MetricStream AWS CloudFormation Resource (AWS::CloudWatch::MetricStream)
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-metricstream_metricstreamfilter.go b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-metricstream_metricstreamfilter.go
similarity index 92%
rename from goformation/cloudformation/cloudwatch/aws-cloudwatch-metricstream_metricstreamfilter.go
rename to pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-metricstream_metricstreamfilter.go
index e1e1900ceb..4b050205c1 100644
--- a/goformation/cloudformation/cloudwatch/aws-cloudwatch-metricstream_metricstreamfilter.go
+++ b/pkg/goformation/cloudformation/cloudwatch/aws-cloudwatch-metricstream_metricstreamfilter.go
@@ -1,9 +1,9 @@
 package cloudwatch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MetricStream_MetricStreamFilter AWS CloudFormation Resource (AWS::CloudWatch::MetricStream.MetricStreamFilter)
diff --git a/goformation/cloudformation/codeartifact/aws-codeartifact-domain.go b/pkg/goformation/cloudformation/codeartifact/aws-codeartifact-domain.go
similarity index 95%
rename from goformation/cloudformation/codeartifact/aws-codeartifact-domain.go
rename to pkg/goformation/cloudformation/codeartifact/aws-codeartifact-domain.go
index 6776d697bd..9679c25bb9 100644
--- a/goformation/cloudformation/codeartifact/aws-codeartifact-domain.go
+++ b/pkg/goformation/cloudformation/codeartifact/aws-codeartifact-domain.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain AWS CloudFormation Resource (AWS::CodeArtifact::Domain)
diff --git a/goformation/cloudformation/codeartifact/aws-codeartifact-repository.go b/pkg/goformation/cloudformation/codeartifact/aws-codeartifact-repository.go
similarity index 96%
rename from goformation/cloudformation/codeartifact/aws-codeartifact-repository.go
rename to pkg/goformation/cloudformation/codeartifact/aws-codeartifact-repository.go
index 165e92dc2a..f884552773 100644
--- a/goformation/cloudformation/codeartifact/aws-codeartifact-repository.go
+++ b/pkg/goformation/cloudformation/codeartifact/aws-codeartifact-repository.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Repository AWS CloudFormation Resource (AWS::CodeArtifact::Repository)
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project.go b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project.go
similarity index 97%
rename from goformation/cloudformation/codebuild/aws-codebuild-project.go
rename to pkg/goformation/cloudformation/codebuild/aws-codebuild-project.go
index 83cd28ac24..ed25f4e259 100644
--- a/goformation/cloudformation/codebuild/aws-codebuild-project.go
+++ b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project AWS CloudFormation Resource (AWS::CodeBuild::Project)
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_artifacts.go b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_artifacts.go
similarity index 96%
rename from goformation/cloudformation/codebuild/aws-codebuild-project_artifacts.go
rename to pkg/goformation/cloudformation/codebuild/aws-codebuild-project_artifacts.go
index e2489f3a59..66c10c6511 100644
--- a/goformation/cloudformation/codebuild/aws-codebuild-project_artifacts.go
+++ b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_artifacts.go
@@ -1,9 +1,9 @@
 package codebuild
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project_Artifacts AWS CloudFormation Resource (AWS::CodeBuild::Project.Artifacts)
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_batchrestrictions.go b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_batchrestrictions.go
similarity index 93%
rename from goformation/cloudformation/codebuild/aws-codebuild-project_batchrestrictions.go
rename to pkg/goformation/cloudformation/codebuild/aws-codebuild-project_batchrestrictions.go
index 04d1db6e30..832db11108 100644
--- a/goformation/cloudformation/codebuild/aws-codebuild-project_batchrestrictions.go
+++ b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_batchrestrictions.go
@@ -1,9 +1,9 @@
 package codebuild
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project_BatchRestrictions AWS CloudFormation Resource (AWS::CodeBuild::Project.BatchRestrictions)
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_buildstatusconfig.go b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_buildstatusconfig.go
similarity index 92%
rename from goformation/cloudformation/codebuild/aws-codebuild-project_buildstatusconfig.go
rename to pkg/goformation/cloudformation/codebuild/aws-codebuild-project_buildstatusconfig.go
index 52bcb0091f..a0cc4f1f6b 100644
--- a/goformation/cloudformation/codebuild/aws-codebuild-project_buildstatusconfig.go
+++ b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_buildstatusconfig.go
@@ -1,9 +1,9 @@
 package codebuild
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project_BuildStatusConfig AWS CloudFormation Resource (AWS::CodeBuild::Project.BuildStatusConfig)
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_cloudwatchlogsconfig.go b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_cloudwatchlogsconfig.go
similarity index 93%
rename from goformation/cloudformation/codebuild/aws-codebuild-project_cloudwatchlogsconfig.go
rename to pkg/goformation/cloudformation/codebuild/aws-codebuild-project_cloudwatchlogsconfig.go
index 69c2bc3b27..a71742a787 100644
--- a/goformation/cloudformation/codebuild/aws-codebuild-project_cloudwatchlogsconfig.go
+++ b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_cloudwatchlogsconfig.go
@@ -1,9 +1,9 @@
 package codebuild
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project_CloudWatchLogsConfig AWS CloudFormation Resource (AWS::CodeBuild::Project.CloudWatchLogsConfig)
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_environment.go b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_environment.go
similarity index 96%
rename from goformation/cloudformation/codebuild/aws-codebuild-project_environment.go
rename to pkg/goformation/cloudformation/codebuild/aws-codebuild-project_environment.go
index e2f2f10a56..5140b5a5c6 100644
--- a/goformation/cloudformation/codebuild/aws-codebuild-project_environment.go
+++ b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_environment.go
@@ -1,9 +1,9 @@
 package codebuild
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project_Environment AWS CloudFormation Resource (AWS::CodeBuild::Project.Environment)
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_environmentvariable.go b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_environmentvariable.go
similarity index 93%
rename from goformation/cloudformation/codebuild/aws-codebuild-project_environmentvariable.go
rename to pkg/goformation/cloudformation/codebuild/aws-codebuild-project_environmentvariable.go
index 85c1da4d4c..7065431e95 100644
--- a/goformation/cloudformation/codebuild/aws-codebuild-project_environmentvariable.go
+++ b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_environmentvariable.go
@@ -1,9 +1,9 @@
 package codebuild
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project_EnvironmentVariable AWS CloudFormation Resource (AWS::CodeBuild::Project.EnvironmentVariable)
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_filtergroup.go b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_filtergroup.go
similarity index 94%
rename from goformation/cloudformation/codebuild/aws-codebuild-project_filtergroup.go
rename to pkg/goformation/cloudformation/codebuild/aws-codebuild-project_filtergroup.go
index 955cdca101..4d2ad2565c 100644
--- a/goformation/cloudformation/codebuild/aws-codebuild-project_filtergroup.go
+++ b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_filtergroup.go
@@ -1,7 +1,7 @@
 package codebuild
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project_FilterGroup AWS CloudFormation Resource (AWS::CodeBuild::Project.FilterGroup)
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_gitsubmodulesconfig.go b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_gitsubmodulesconfig.go
similarity index 91%
rename from goformation/cloudformation/codebuild/aws-codebuild-project_gitsubmodulesconfig.go
rename to pkg/goformation/cloudformation/codebuild/aws-codebuild-project_gitsubmodulesconfig.go
index 0480d0454c..0c1693f4fe 100644
--- a/goformation/cloudformation/codebuild/aws-codebuild-project_gitsubmodulesconfig.go
+++ b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_gitsubmodulesconfig.go
@@ -1,9 +1,9 @@
 package codebuild
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project_GitSubmodulesConfig AWS CloudFormation Resource (AWS::CodeBuild::Project.GitSubmodulesConfig)
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_logsconfig.go b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_logsconfig.go
similarity index 96%
rename from goformation/cloudformation/codebuild/aws-codebuild-project_logsconfig.go
rename to pkg/goformation/cloudformation/codebuild/aws-codebuild-project_logsconfig.go
index 149454b489..6a42fc5bb7 100644
--- a/goformation/cloudformation/codebuild/aws-codebuild-project_logsconfig.go
+++ b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_logsconfig.go
@@ -1,7 +1,7 @@
 package codebuild
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project_LogsConfig AWS CloudFormation Resource (AWS::CodeBuild::Project.LogsConfig)
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_projectbuildbatchconfig.go b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_projectbuildbatchconfig.go
similarity index 95%
rename from goformation/cloudformation/codebuild/aws-codebuild-project_projectbuildbatchconfig.go
rename to pkg/goformation/cloudformation/codebuild/aws-codebuild-project_projectbuildbatchconfig.go
index ad279fd7f0..80751bf465 100644
--- a/goformation/cloudformation/codebuild/aws-codebuild-project_projectbuildbatchconfig.go
+++ b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_projectbuildbatchconfig.go
@@ -1,9 +1,9 @@
 package codebuild
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project_ProjectBuildBatchConfig AWS CloudFormation Resource (AWS::CodeBuild::Project.ProjectBuildBatchConfig)
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_projectcache.go b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_projectcache.go
similarity index 93%
rename from goformation/cloudformation/codebuild/aws-codebuild-project_projectcache.go
rename to pkg/goformation/cloudformation/codebuild/aws-codebuild-project_projectcache.go
index 0fcc30adf3..f44d42ce24 100644
--- a/goformation/cloudformation/codebuild/aws-codebuild-project_projectcache.go
+++ b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_projectcache.go
@@ -1,9 +1,9 @@
 package codebuild
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project_ProjectCache AWS CloudFormation Resource (AWS::CodeBuild::Project.ProjectCache)
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_projectfilesystemlocation.go b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_projectfilesystemlocation.go
similarity index 95%
rename from goformation/cloudformation/codebuild/aws-codebuild-project_projectfilesystemlocation.go
rename to pkg/goformation/cloudformation/codebuild/aws-codebuild-project_projectfilesystemlocation.go
index 6203ab9a41..6e7fb1198a 100644
--- a/goformation/cloudformation/codebuild/aws-codebuild-project_projectfilesystemlocation.go
+++ b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_projectfilesystemlocation.go
@@ -1,9 +1,9 @@
 package codebuild
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project_ProjectFileSystemLocation AWS CloudFormation Resource (AWS::CodeBuild::Project.ProjectFileSystemLocation)
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_projectsourceversion.go b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_projectsourceversion.go
similarity index 93%
rename from goformation/cloudformation/codebuild/aws-codebuild-project_projectsourceversion.go
rename to pkg/goformation/cloudformation/codebuild/aws-codebuild-project_projectsourceversion.go
index d639e18e58..30116f2c2b 100644
--- a/goformation/cloudformation/codebuild/aws-codebuild-project_projectsourceversion.go
+++ b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_projectsourceversion.go
@@ -1,9 +1,9 @@
 package codebuild
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project_ProjectSourceVersion AWS CloudFormation Resource (AWS::CodeBuild::Project.ProjectSourceVersion)
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_projecttriggers.go b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_projecttriggers.go
similarity index 93%
rename from goformation/cloudformation/codebuild/aws-codebuild-project_projecttriggers.go
rename to pkg/goformation/cloudformation/codebuild/aws-codebuild-project_projecttriggers.go
index 5db5922c72..7d79f0fce0 100644
--- a/goformation/cloudformation/codebuild/aws-codebuild-project_projecttriggers.go
+++ b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_projecttriggers.go
@@ -1,9 +1,9 @@
 package codebuild
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project_ProjectTriggers AWS CloudFormation Resource (AWS::CodeBuild::Project.ProjectTriggers)
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_registrycredential.go b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_registrycredential.go
similarity index 93%
rename from goformation/cloudformation/codebuild/aws-codebuild-project_registrycredential.go
rename to pkg/goformation/cloudformation/codebuild/aws-codebuild-project_registrycredential.go
index 683df6a3d9..955aef9bf2 100644
--- a/goformation/cloudformation/codebuild/aws-codebuild-project_registrycredential.go
+++ b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_registrycredential.go
@@ -1,9 +1,9 @@
 package codebuild
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project_RegistryCredential AWS CloudFormation Resource (AWS::CodeBuild::Project.RegistryCredential)
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_s3logsconfig.go b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_s3logsconfig.go
similarity index 93%
rename from goformation/cloudformation/codebuild/aws-codebuild-project_s3logsconfig.go
rename to pkg/goformation/cloudformation/codebuild/aws-codebuild-project_s3logsconfig.go
index 2ed260063e..d689925e6b 100644
--- a/goformation/cloudformation/codebuild/aws-codebuild-project_s3logsconfig.go
+++ b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_s3logsconfig.go
@@ -1,9 +1,9 @@
 package codebuild
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project_S3LogsConfig AWS CloudFormation Resource (AWS::CodeBuild::Project.S3LogsConfig)
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_source.go b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_source.go
similarity index 96%
rename from goformation/cloudformation/codebuild/aws-codebuild-project_source.go
rename to pkg/goformation/cloudformation/codebuild/aws-codebuild-project_source.go
index e1fcaecfa0..2cef8a2c82 100644
--- a/goformation/cloudformation/codebuild/aws-codebuild-project_source.go
+++ b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_source.go
@@ -1,9 +1,9 @@
 package codebuild
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project_Source AWS CloudFormation Resource (AWS::CodeBuild::Project.Source)
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_sourceauth.go b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_sourceauth.go
similarity index 92%
rename from goformation/cloudformation/codebuild/aws-codebuild-project_sourceauth.go
rename to pkg/goformation/cloudformation/codebuild/aws-codebuild-project_sourceauth.go
index b168cf4689..4db1297d50 100644
--- a/goformation/cloudformation/codebuild/aws-codebuild-project_sourceauth.go
+++ b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_sourceauth.go
@@ -1,9 +1,9 @@
 package codebuild
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project_SourceAuth AWS CloudFormation Resource (AWS::CodeBuild::Project.SourceAuth)
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_vpcconfig.go b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_vpcconfig.go
similarity index 93%
rename from goformation/cloudformation/codebuild/aws-codebuild-project_vpcconfig.go
rename to pkg/goformation/cloudformation/codebuild/aws-codebuild-project_vpcconfig.go
index 01bf42f9b5..d928013af4 100644
--- a/goformation/cloudformation/codebuild/aws-codebuild-project_vpcconfig.go
+++ b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_vpcconfig.go
@@ -1,9 +1,9 @@
 package codebuild
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project_VpcConfig AWS CloudFormation Resource (AWS::CodeBuild::Project.VpcConfig)
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_webhookfilter.go b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_webhookfilter.go
similarity index 93%
rename from goformation/cloudformation/codebuild/aws-codebuild-project_webhookfilter.go
rename to pkg/goformation/cloudformation/codebuild/aws-codebuild-project_webhookfilter.go
index 57ea1cd898..5bc839b0cc 100644
--- a/goformation/cloudformation/codebuild/aws-codebuild-project_webhookfilter.go
+++ b/pkg/goformation/cloudformation/codebuild/aws-codebuild-project_webhookfilter.go
@@ -1,9 +1,9 @@
 package codebuild
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project_WebhookFilter AWS CloudFormation Resource (AWS::CodeBuild::Project.WebhookFilter)
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-reportgroup.go b/pkg/goformation/cloudformation/codebuild/aws-codebuild-reportgroup.go
similarity index 95%
rename from goformation/cloudformation/codebuild/aws-codebuild-reportgroup.go
rename to pkg/goformation/cloudformation/codebuild/aws-codebuild-reportgroup.go
index c7c45816ff..46c44d22d2 100644
--- a/goformation/cloudformation/codebuild/aws-codebuild-reportgroup.go
+++ b/pkg/goformation/cloudformation/codebuild/aws-codebuild-reportgroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReportGroup AWS CloudFormation Resource (AWS::CodeBuild::ReportGroup)
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-reportgroup_reportexportconfig.go b/pkg/goformation/cloudformation/codebuild/aws-codebuild-reportgroup_reportexportconfig.go
similarity index 93%
rename from goformation/cloudformation/codebuild/aws-codebuild-reportgroup_reportexportconfig.go
rename to pkg/goformation/cloudformation/codebuild/aws-codebuild-reportgroup_reportexportconfig.go
index 96620754e1..54d3008f93 100644
--- a/goformation/cloudformation/codebuild/aws-codebuild-reportgroup_reportexportconfig.go
+++ b/pkg/goformation/cloudformation/codebuild/aws-codebuild-reportgroup_reportexportconfig.go
@@ -1,9 +1,9 @@
 package codebuild
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReportGroup_ReportExportConfig AWS CloudFormation Resource (AWS::CodeBuild::ReportGroup.ReportExportConfig)
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-reportgroup_s3reportexportconfig.go b/pkg/goformation/cloudformation/codebuild/aws-codebuild-reportgroup_s3reportexportconfig.go
similarity index 95%
rename from goformation/cloudformation/codebuild/aws-codebuild-reportgroup_s3reportexportconfig.go
rename to pkg/goformation/cloudformation/codebuild/aws-codebuild-reportgroup_s3reportexportconfig.go
index 2d13e49715..06f84fdcb4 100644
--- a/goformation/cloudformation/codebuild/aws-codebuild-reportgroup_s3reportexportconfig.go
+++ b/pkg/goformation/cloudformation/codebuild/aws-codebuild-reportgroup_s3reportexportconfig.go
@@ -1,9 +1,9 @@
 package codebuild
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReportGroup_S3ReportExportConfig AWS CloudFormation Resource (AWS::CodeBuild::ReportGroup.S3ReportExportConfig)
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-sourcecredential.go b/pkg/goformation/cloudformation/codebuild/aws-codebuild-sourcecredential.go
similarity index 97%
rename from goformation/cloudformation/codebuild/aws-codebuild-sourcecredential.go
rename to pkg/goformation/cloudformation/codebuild/aws-codebuild-sourcecredential.go
index 01e19e0dd4..62c7cf8115 100644
--- a/goformation/cloudformation/codebuild/aws-codebuild-sourcecredential.go
+++ b/pkg/goformation/cloudformation/codebuild/aws-codebuild-sourcecredential.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SourceCredential AWS CloudFormation Resource (AWS::CodeBuild::SourceCredential)
diff --git a/goformation/cloudformation/codecommit/aws-codecommit-repository.go b/pkg/goformation/cloudformation/codecommit/aws-codecommit-repository.go
similarity index 95%
rename from goformation/cloudformation/codecommit/aws-codecommit-repository.go
rename to pkg/goformation/cloudformation/codecommit/aws-codecommit-repository.go
index ce1bdf593e..db8999713d 100644
--- a/goformation/cloudformation/codecommit/aws-codecommit-repository.go
+++ b/pkg/goformation/cloudformation/codecommit/aws-codecommit-repository.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Repository AWS CloudFormation Resource (AWS::CodeCommit::Repository)
diff --git a/goformation/cloudformation/codecommit/aws-codecommit-repository_code.go b/pkg/goformation/cloudformation/codecommit/aws-codecommit-repository_code.go
similarity index 92%
rename from goformation/cloudformation/codecommit/aws-codecommit-repository_code.go
rename to pkg/goformation/cloudformation/codecommit/aws-codecommit-repository_code.go
index b19f1c5c2d..b57fdb28c2 100644
--- a/goformation/cloudformation/codecommit/aws-codecommit-repository_code.go
+++ b/pkg/goformation/cloudformation/codecommit/aws-codecommit-repository_code.go
@@ -1,9 +1,9 @@
 package codecommit
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Repository_Code AWS CloudFormation Resource (AWS::CodeCommit::Repository.Code)
diff --git a/goformation/cloudformation/codecommit/aws-codecommit-repository_repositorytrigger.go b/pkg/goformation/cloudformation/codecommit/aws-codecommit-repository_repositorytrigger.go
similarity index 95%
rename from goformation/cloudformation/codecommit/aws-codecommit-repository_repositorytrigger.go
rename to pkg/goformation/cloudformation/codecommit/aws-codecommit-repository_repositorytrigger.go
index 0e914626d4..59f80c1930 100644
--- a/goformation/cloudformation/codecommit/aws-codecommit-repository_repositorytrigger.go
+++ b/pkg/goformation/cloudformation/codecommit/aws-codecommit-repository_repositorytrigger.go
@@ -1,9 +1,9 @@
 package codecommit
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Repository_RepositoryTrigger AWS CloudFormation Resource (AWS::CodeCommit::Repository.RepositoryTrigger)
diff --git a/goformation/cloudformation/codecommit/aws-codecommit-repository_s3.go b/pkg/goformation/cloudformation/codecommit/aws-codecommit-repository_s3.go
similarity index 93%
rename from goformation/cloudformation/codecommit/aws-codecommit-repository_s3.go
rename to pkg/goformation/cloudformation/codecommit/aws-codecommit-repository_s3.go
index 9304ee00ff..35d2db73b2 100644
--- a/goformation/cloudformation/codecommit/aws-codecommit-repository_s3.go
+++ b/pkg/goformation/cloudformation/codecommit/aws-codecommit-repository_s3.go
@@ -1,9 +1,9 @@
 package codecommit
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Repository_S3 AWS CloudFormation Resource (AWS::CodeCommit::Repository.S3)
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-application.go b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-application.go
similarity index 95%
rename from goformation/cloudformation/codedeploy/aws-codedeploy-application.go
rename to pkg/goformation/cloudformation/codedeploy/aws-codedeploy-application.go
index 7701df7007..a7a22c60c2 100644
--- a/goformation/cloudformation/codedeploy/aws-codedeploy-application.go
+++ b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-application.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application AWS CloudFormation Resource (AWS::CodeDeploy::Application)
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig.go b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig.go
similarity index 97%
rename from goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig.go
rename to pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig.go
index 4d14d73b9b..32a39cff07 100644
--- a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig.go
+++ b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeploymentConfig AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentConfig)
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_minimumhealthyhosts.go b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_minimumhealthyhosts.go
similarity index 93%
rename from goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_minimumhealthyhosts.go
rename to pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_minimumhealthyhosts.go
index 0c8e739ae7..ee07cdb338 100644
--- a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_minimumhealthyhosts.go
+++ b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_minimumhealthyhosts.go
@@ -1,9 +1,9 @@
 package codedeploy
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeploymentConfig_MinimumHealthyHosts AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentConfig.MinimumHealthyHosts)
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_timebasedcanary.go b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_timebasedcanary.go
similarity index 93%
rename from goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_timebasedcanary.go
rename to pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_timebasedcanary.go
index 4eabb6024b..f36feb4844 100644
--- a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_timebasedcanary.go
+++ b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_timebasedcanary.go
@@ -1,9 +1,9 @@
 package codedeploy
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeploymentConfig_TimeBasedCanary AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentConfig.TimeBasedCanary)
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_timebasedlinear.go b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_timebasedlinear.go
similarity index 93%
rename from goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_timebasedlinear.go
rename to pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_timebasedlinear.go
index 7587e76bbb..0002ab6491 100644
--- a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_timebasedlinear.go
+++ b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_timebasedlinear.go
@@ -1,9 +1,9 @@
 package codedeploy
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeploymentConfig_TimeBasedLinear AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentConfig.TimeBasedLinear)
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_trafficroutingconfig.go b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_trafficroutingconfig.go
similarity index 94%
rename from goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_trafficroutingconfig.go
rename to pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_trafficroutingconfig.go
index 5725a4ded8..9a7aea354a 100644
--- a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_trafficroutingconfig.go
+++ b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_trafficroutingconfig.go
@@ -1,9 +1,9 @@
 package codedeploy
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeploymentConfig_TrafficRoutingConfig AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentConfig.TrafficRoutingConfig)
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup.go b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup.go
similarity index 98%
rename from goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup.go
rename to pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup.go
index c341a6f4fe..c473e27dd4 100644
--- a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup.go
+++ b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeploymentGroup AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup)
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_alarm.go b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_alarm.go
similarity index 91%
rename from goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_alarm.go
rename to pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_alarm.go
index bf08ad6cca..8463325fe3 100644
--- a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_alarm.go
+++ b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_alarm.go
@@ -1,9 +1,9 @@
 package codedeploy
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeploymentGroup_Alarm AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.Alarm)
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_alarmconfiguration.go b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_alarmconfiguration.go
similarity index 94%
rename from goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_alarmconfiguration.go
rename to pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_alarmconfiguration.go
index 2b40403327..885a321f99 100644
--- a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_alarmconfiguration.go
+++ b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_alarmconfiguration.go
@@ -1,9 +1,9 @@
 package codedeploy
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeploymentGroup_AlarmConfiguration AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.AlarmConfiguration)
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_autorollbackconfiguration.go b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_autorollbackconfiguration.go
similarity index 93%
rename from goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_autorollbackconfiguration.go
rename to pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_autorollbackconfiguration.go
index 6544a9dd3c..5d4c900506 100644
--- a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_autorollbackconfiguration.go
+++ b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_autorollbackconfiguration.go
@@ -1,9 +1,9 @@
 package codedeploy
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeploymentGroup_AutoRollbackConfiguration AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.AutoRollbackConfiguration)
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_bluegreendeploymentconfiguration.go b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_bluegreendeploymentconfiguration.go
similarity index 97%
rename from goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_bluegreendeploymentconfiguration.go
rename to pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_bluegreendeploymentconfiguration.go
index 701a321309..7661e639c1 100644
--- a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_bluegreendeploymentconfiguration.go
+++ b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_bluegreendeploymentconfiguration.go
@@ -1,7 +1,7 @@
 package codedeploy
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeploymentGroup_BlueGreenDeploymentConfiguration AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.BlueGreenDeploymentConfiguration)
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_blueinstanceterminationoption.go b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_blueinstanceterminationoption.go
similarity index 93%
rename from goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_blueinstanceterminationoption.go
rename to pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_blueinstanceterminationoption.go
index 3265b45c5a..4c7a83b547 100644
--- a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_blueinstanceterminationoption.go
+++ b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_blueinstanceterminationoption.go
@@ -1,9 +1,9 @@
 package codedeploy
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeploymentGroup_BlueInstanceTerminationOption AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.BlueInstanceTerminationOption)
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deployment.go b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deployment.go
similarity index 94%
rename from goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deployment.go
rename to pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deployment.go
index 2ada7e9142..1aadf2fa76 100644
--- a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deployment.go
+++ b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deployment.go
@@ -1,9 +1,9 @@
 package codedeploy
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeploymentGroup_Deployment AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.Deployment)
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deploymentreadyoption.go b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deploymentreadyoption.go
similarity index 93%
rename from goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deploymentreadyoption.go
rename to pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deploymentreadyoption.go
index 573865febe..5f16b6199a 100644
--- a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deploymentreadyoption.go
+++ b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deploymentreadyoption.go
@@ -1,9 +1,9 @@
 package codedeploy
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeploymentGroup_DeploymentReadyOption AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.DeploymentReadyOption)
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deploymentstyle.go b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deploymentstyle.go
similarity index 93%
rename from goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deploymentstyle.go
rename to pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deploymentstyle.go
index a25297333b..095bb1eb7b 100644
--- a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deploymentstyle.go
+++ b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deploymentstyle.go
@@ -1,9 +1,9 @@
 package codedeploy
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeploymentGroup_DeploymentStyle AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.DeploymentStyle)
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagfilter.go b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagfilter.go
similarity index 93%
rename from goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagfilter.go
rename to pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagfilter.go
index 44b187eb79..d571b0ca93 100644
--- a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagfilter.go
+++ b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagfilter.go
@@ -1,9 +1,9 @@
 package codedeploy
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeploymentGroup_EC2TagFilter AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.EC2TagFilter)
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagset.go b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagset.go
similarity index 95%
rename from goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagset.go
rename to pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagset.go
index f01af4f99e..cb847b73d8 100644
--- a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagset.go
+++ b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagset.go
@@ -1,7 +1,7 @@
 package codedeploy
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeploymentGroup_EC2TagSet AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.EC2TagSet)
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagsetlistobject.go b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagsetlistobject.go
similarity index 95%
rename from goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagsetlistobject.go
rename to pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagsetlistobject.go
index c8777eec99..dc1ec8e8ee 100644
--- a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagsetlistobject.go
+++ b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagsetlistobject.go
@@ -1,7 +1,7 @@
 package codedeploy
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeploymentGroup_EC2TagSetListObject AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.EC2TagSetListObject)
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ecsservice.go b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ecsservice.go
similarity index 93%
rename from goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ecsservice.go
rename to pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ecsservice.go
index 697c12c544..4546181fd7 100644
--- a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ecsservice.go
+++ b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ecsservice.go
@@ -1,9 +1,9 @@
 package codedeploy
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeploymentGroup_ECSService AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.ECSService)
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_elbinfo.go b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_elbinfo.go
similarity index 91%
rename from goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_elbinfo.go
rename to pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_elbinfo.go
index 8cf55ae8e3..0b8189284f 100644
--- a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_elbinfo.go
+++ b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_elbinfo.go
@@ -1,9 +1,9 @@
 package codedeploy
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeploymentGroup_ELBInfo AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.ELBInfo)
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_githublocation.go b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_githublocation.go
similarity index 93%
rename from goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_githublocation.go
rename to pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_githublocation.go
index 1da683d04f..c8aa2a2075 100644
--- a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_githublocation.go
+++ b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_githublocation.go
@@ -1,9 +1,9 @@
 package codedeploy
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeploymentGroup_GitHubLocation AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.GitHubLocation)
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_greenfleetprovisioningoption.go b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_greenfleetprovisioningoption.go
similarity index 92%
rename from goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_greenfleetprovisioningoption.go
rename to pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_greenfleetprovisioningoption.go
index f5cc8d5f1e..2313affa24 100644
--- a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_greenfleetprovisioningoption.go
+++ b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_greenfleetprovisioningoption.go
@@ -1,9 +1,9 @@
 package codedeploy
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeploymentGroup_GreenFleetProvisioningOption AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.GreenFleetProvisioningOption)
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_loadbalancerinfo.go b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_loadbalancerinfo.go
similarity index 96%
rename from goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_loadbalancerinfo.go
rename to pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_loadbalancerinfo.go
index cd3db09eba..0b485de5e6 100644
--- a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_loadbalancerinfo.go
+++ b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_loadbalancerinfo.go
@@ -1,7 +1,7 @@
 package codedeploy
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeploymentGroup_LoadBalancerInfo AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.LoadBalancerInfo)
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_onpremisestagset.go b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_onpremisestagset.go
similarity index 95%
rename from goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_onpremisestagset.go
rename to pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_onpremisestagset.go
index 9270257b81..739b7eebc8 100644
--- a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_onpremisestagset.go
+++ b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_onpremisestagset.go
@@ -1,7 +1,7 @@
 package codedeploy
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeploymentGroup_OnPremisesTagSet AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.OnPremisesTagSet)
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_onpremisestagsetlistobject.go b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_onpremisestagsetlistobject.go
similarity index 96%
rename from goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_onpremisestagsetlistobject.go
rename to pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_onpremisestagsetlistobject.go
index f4b5e38d71..d0b9210452 100644
--- a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_onpremisestagsetlistobject.go
+++ b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_onpremisestagsetlistobject.go
@@ -1,7 +1,7 @@
 package codedeploy
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeploymentGroup_OnPremisesTagSetListObject AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.OnPremisesTagSetListObject)
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_revisionlocation.go b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_revisionlocation.go
similarity index 94%
rename from goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_revisionlocation.go
rename to pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_revisionlocation.go
index 6563df576b..5bb9e7d0aa 100644
--- a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_revisionlocation.go
+++ b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_revisionlocation.go
@@ -1,9 +1,9 @@
 package codedeploy
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeploymentGroup_RevisionLocation AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.RevisionLocation)
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_s3location.go b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_s3location.go
similarity index 95%
rename from goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_s3location.go
rename to pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_s3location.go
index a102b75a97..f3cfa08d73 100644
--- a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_s3location.go
+++ b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_s3location.go
@@ -1,9 +1,9 @@
 package codedeploy
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeploymentGroup_S3Location AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.S3Location)
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_tagfilter.go b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_tagfilter.go
similarity index 93%
rename from goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_tagfilter.go
rename to pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_tagfilter.go
index 7b96288700..895b926cb5 100644
--- a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_tagfilter.go
+++ b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_tagfilter.go
@@ -1,9 +1,9 @@
 package codedeploy
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeploymentGroup_TagFilter AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.TagFilter)
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_targetgroupinfo.go b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_targetgroupinfo.go
similarity index 91%
rename from goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_targetgroupinfo.go
rename to pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_targetgroupinfo.go
index df542b4682..84b2b26398 100644
--- a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_targetgroupinfo.go
+++ b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_targetgroupinfo.go
@@ -1,9 +1,9 @@
 package codedeploy
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeploymentGroup_TargetGroupInfo AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.TargetGroupInfo)
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_triggerconfig.go b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_triggerconfig.go
similarity index 94%
rename from goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_triggerconfig.go
rename to pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_triggerconfig.go
index 61442f5aac..9a236d40b1 100644
--- a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_triggerconfig.go
+++ b/pkg/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_triggerconfig.go
@@ -1,9 +1,9 @@
 package codedeploy
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeploymentGroup_TriggerConfig AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.TriggerConfig)
diff --git a/goformation/cloudformation/codeguruprofiler/aws-codeguruprofiler-profilinggroup.go b/pkg/goformation/cloudformation/codeguruprofiler/aws-codeguruprofiler-profilinggroup.go
similarity index 96%
rename from goformation/cloudformation/codeguruprofiler/aws-codeguruprofiler-profilinggroup.go
rename to pkg/goformation/cloudformation/codeguruprofiler/aws-codeguruprofiler-profilinggroup.go
index 12ce986b0f..724f3748b6 100644
--- a/goformation/cloudformation/codeguruprofiler/aws-codeguruprofiler-profilinggroup.go
+++ b/pkg/goformation/cloudformation/codeguruprofiler/aws-codeguruprofiler-profilinggroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ProfilingGroup AWS CloudFormation Resource (AWS::CodeGuruProfiler::ProfilingGroup)
diff --git a/goformation/cloudformation/codeguruprofiler/aws-codeguruprofiler-profilinggroup_channel.go b/pkg/goformation/cloudformation/codeguruprofiler/aws-codeguruprofiler-profilinggroup_channel.go
similarity index 93%
rename from goformation/cloudformation/codeguruprofiler/aws-codeguruprofiler-profilinggroup_channel.go
rename to pkg/goformation/cloudformation/codeguruprofiler/aws-codeguruprofiler-profilinggroup_channel.go
index c07525bcf8..161ac3921b 100644
--- a/goformation/cloudformation/codeguruprofiler/aws-codeguruprofiler-profilinggroup_channel.go
+++ b/pkg/goformation/cloudformation/codeguruprofiler/aws-codeguruprofiler-profilinggroup_channel.go
@@ -1,9 +1,9 @@
 package codeguruprofiler
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ProfilingGroup_Channel AWS CloudFormation Resource (AWS::CodeGuruProfiler::ProfilingGroup.Channel)
diff --git a/goformation/cloudformation/codegurureviewer/aws-codegurureviewer-repositoryassociation.go b/pkg/goformation/cloudformation/codegurureviewer/aws-codegurureviewer-repositoryassociation.go
similarity index 96%
rename from goformation/cloudformation/codegurureviewer/aws-codegurureviewer-repositoryassociation.go
rename to pkg/goformation/cloudformation/codegurureviewer/aws-codegurureviewer-repositoryassociation.go
index beea9da91e..d8d24991d0 100644
--- a/goformation/cloudformation/codegurureviewer/aws-codegurureviewer-repositoryassociation.go
+++ b/pkg/goformation/cloudformation/codegurureviewer/aws-codegurureviewer-repositoryassociation.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RepositoryAssociation AWS CloudFormation Resource (AWS::CodeGuruReviewer::RepositoryAssociation)
diff --git a/goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype.go b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype.go
similarity index 96%
rename from goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype.go
rename to pkg/goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype.go
index d7f1fb9a02..53b30348f7 100644
--- a/goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype.go
+++ b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CustomActionType AWS CloudFormation Resource (AWS::CodePipeline::CustomActionType)
diff --git a/goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype_artifactdetails.go b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype_artifactdetails.go
similarity index 93%
rename from goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype_artifactdetails.go
rename to pkg/goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype_artifactdetails.go
index 1a51f954d5..688ab5cb46 100644
--- a/goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype_artifactdetails.go
+++ b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype_artifactdetails.go
@@ -1,9 +1,9 @@
 package codepipeline
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CustomActionType_ArtifactDetails AWS CloudFormation Resource (AWS::CodePipeline::CustomActionType.ArtifactDetails)
diff --git a/goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype_configurationproperties.go b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype_configurationproperties.go
similarity index 96%
rename from goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype_configurationproperties.go
rename to pkg/goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype_configurationproperties.go
index dce0182645..17d3f22f1c 100644
--- a/goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype_configurationproperties.go
+++ b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype_configurationproperties.go
@@ -1,9 +1,9 @@
 package codepipeline
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CustomActionType_ConfigurationProperties AWS CloudFormation Resource (AWS::CodePipeline::CustomActionType.ConfigurationProperties)
diff --git a/goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype_settings.go b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype_settings.go
similarity index 94%
rename from goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype_settings.go
rename to pkg/goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype_settings.go
index 884d336223..ab5a996316 100644
--- a/goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype_settings.go
+++ b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype_settings.go
@@ -1,9 +1,9 @@
 package codepipeline
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CustomActionType_Settings AWS CloudFormation Resource (AWS::CodePipeline::CustomActionType.Settings)
diff --git a/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline.go b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline.go
similarity index 96%
rename from goformation/cloudformation/codepipeline/aws-codepipeline-pipeline.go
rename to pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline.go
index 8a7e701cf2..2981f05cc4 100644
--- a/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline.go
+++ b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Pipeline AWS CloudFormation Resource (AWS::CodePipeline::Pipeline)
diff --git a/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_actiondeclaration.go b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_actiondeclaration.go
similarity index 96%
rename from goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_actiondeclaration.go
rename to pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_actiondeclaration.go
index db15d74916..732bac6643 100644
--- a/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_actiondeclaration.go
+++ b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_actiondeclaration.go
@@ -1,9 +1,9 @@
 package codepipeline
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Pipeline_ActionDeclaration AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.ActionDeclaration)
diff --git a/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_actiontypeid.go b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_actiontypeid.go
similarity index 94%
rename from goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_actiontypeid.go
rename to pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_actiontypeid.go
index ffe2430c36..f975c22c91 100644
--- a/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_actiontypeid.go
+++ b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_actiontypeid.go
@@ -1,9 +1,9 @@
 package codepipeline
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Pipeline_ActionTypeId AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.ActionTypeId)
diff --git a/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_artifactstore.go b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_artifactstore.go
similarity index 93%
rename from goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_artifactstore.go
rename to pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_artifactstore.go
index 0c7046522e..2cc42f5a13 100644
--- a/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_artifactstore.go
+++ b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_artifactstore.go
@@ -1,9 +1,9 @@
 package codepipeline
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Pipeline_ArtifactStore AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.ArtifactStore)
diff --git a/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_artifactstoremap.go b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_artifactstoremap.go
similarity index 93%
rename from goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_artifactstoremap.go
rename to pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_artifactstoremap.go
index 89b7525a5c..9cc06c8231 100644
--- a/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_artifactstoremap.go
+++ b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_artifactstoremap.go
@@ -1,9 +1,9 @@
 package codepipeline
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Pipeline_ArtifactStoreMap AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.ArtifactStoreMap)
diff --git a/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_blockerdeclaration.go b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_blockerdeclaration.go
similarity index 92%
rename from goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_blockerdeclaration.go
rename to pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_blockerdeclaration.go
index ddffcf3373..bb58283bf5 100644
--- a/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_blockerdeclaration.go
+++ b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_blockerdeclaration.go
@@ -1,9 +1,9 @@
 package codepipeline
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Pipeline_BlockerDeclaration AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.BlockerDeclaration)
diff --git a/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_encryptionkey.go b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_encryptionkey.go
similarity index 93%
rename from goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_encryptionkey.go
rename to pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_encryptionkey.go
index a7a4ca9d22..ee2e022e14 100644
--- a/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_encryptionkey.go
+++ b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_encryptionkey.go
@@ -1,9 +1,9 @@
 package codepipeline
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Pipeline_EncryptionKey AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.EncryptionKey)
diff --git a/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_inputartifact.go b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_inputartifact.go
similarity index 91%
rename from goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_inputartifact.go
rename to pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_inputartifact.go
index d4cac7b469..77e94cc196 100644
--- a/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_inputartifact.go
+++ b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_inputartifact.go
@@ -1,9 +1,9 @@
 package codepipeline
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Pipeline_InputArtifact AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.InputArtifact)
diff --git a/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_outputartifact.go b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_outputartifact.go
similarity index 91%
rename from goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_outputartifact.go
rename to pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_outputartifact.go
index 3690d16026..388e9a262f 100644
--- a/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_outputartifact.go
+++ b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_outputartifact.go
@@ -1,9 +1,9 @@
 package codepipeline
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Pipeline_OutputArtifact AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.OutputArtifact)
diff --git a/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_stagedeclaration.go b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_stagedeclaration.go
similarity index 93%
rename from goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_stagedeclaration.go
rename to pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_stagedeclaration.go
index 8e41f46cc6..3012f45a7c 100644
--- a/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_stagedeclaration.go
+++ b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_stagedeclaration.go
@@ -1,9 +1,9 @@
 package codepipeline
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Pipeline_StageDeclaration AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.StageDeclaration)
diff --git a/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_stagetransition.go b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_stagetransition.go
similarity index 93%
rename from goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_stagetransition.go
rename to pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_stagetransition.go
index 11559d802b..b272993fb1 100644
--- a/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_stagetransition.go
+++ b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_stagetransition.go
@@ -1,9 +1,9 @@
 package codepipeline
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Pipeline_StageTransition AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.StageTransition)
diff --git a/goformation/cloudformation/codepipeline/aws-codepipeline-webhook.go b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-webhook.go
similarity index 97%
rename from goformation/cloudformation/codepipeline/aws-codepipeline-webhook.go
rename to pkg/goformation/cloudformation/codepipeline/aws-codepipeline-webhook.go
index 0937a13f19..9657d62c18 100644
--- a/goformation/cloudformation/codepipeline/aws-codepipeline-webhook.go
+++ b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-webhook.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Webhook AWS CloudFormation Resource (AWS::CodePipeline::Webhook)
diff --git a/goformation/cloudformation/codepipeline/aws-codepipeline-webhook_webhookauthconfiguration.go b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-webhook_webhookauthconfiguration.go
similarity index 93%
rename from goformation/cloudformation/codepipeline/aws-codepipeline-webhook_webhookauthconfiguration.go
rename to pkg/goformation/cloudformation/codepipeline/aws-codepipeline-webhook_webhookauthconfiguration.go
index 913a21cbc3..45f06d8d35 100644
--- a/goformation/cloudformation/codepipeline/aws-codepipeline-webhook_webhookauthconfiguration.go
+++ b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-webhook_webhookauthconfiguration.go
@@ -1,9 +1,9 @@
 package codepipeline
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Webhook_WebhookAuthConfiguration AWS CloudFormation Resource (AWS::CodePipeline::Webhook.WebhookAuthConfiguration)
diff --git a/goformation/cloudformation/codepipeline/aws-codepipeline-webhook_webhookfilterrule.go b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-webhook_webhookfilterrule.go
similarity index 93%
rename from goformation/cloudformation/codepipeline/aws-codepipeline-webhook_webhookfilterrule.go
rename to pkg/goformation/cloudformation/codepipeline/aws-codepipeline-webhook_webhookfilterrule.go
index 74245e6c60..d2ffe83590 100644
--- a/goformation/cloudformation/codepipeline/aws-codepipeline-webhook_webhookfilterrule.go
+++ b/pkg/goformation/cloudformation/codepipeline/aws-codepipeline-webhook_webhookfilterrule.go
@@ -1,9 +1,9 @@
 package codepipeline
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Webhook_WebhookFilterRule AWS CloudFormation Resource (AWS::CodePipeline::Webhook.WebhookFilterRule)
diff --git a/goformation/cloudformation/codestar/aws-codestar-githubrepository.go b/pkg/goformation/cloudformation/codestar/aws-codestar-githubrepository.go
similarity index 97%
rename from goformation/cloudformation/codestar/aws-codestar-githubrepository.go
rename to pkg/goformation/cloudformation/codestar/aws-codestar-githubrepository.go
index b272a864ef..464a0108d9 100644
--- a/goformation/cloudformation/codestar/aws-codestar-githubrepository.go
+++ b/pkg/goformation/cloudformation/codestar/aws-codestar-githubrepository.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GitHubRepository AWS CloudFormation Resource (AWS::CodeStar::GitHubRepository)
diff --git a/goformation/cloudformation/codestar/aws-codestar-githubrepository_code.go b/pkg/goformation/cloudformation/codestar/aws-codestar-githubrepository_code.go
similarity index 95%
rename from goformation/cloudformation/codestar/aws-codestar-githubrepository_code.go
rename to pkg/goformation/cloudformation/codestar/aws-codestar-githubrepository_code.go
index 14ce49eb40..cd9161d8a2 100644
--- a/goformation/cloudformation/codestar/aws-codestar-githubrepository_code.go
+++ b/pkg/goformation/cloudformation/codestar/aws-codestar-githubrepository_code.go
@@ -1,7 +1,7 @@
 package codestar
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GitHubRepository_Code AWS CloudFormation Resource (AWS::CodeStar::GitHubRepository.Code)
diff --git a/goformation/cloudformation/codestar/aws-codestar-githubrepository_s3.go b/pkg/goformation/cloudformation/codestar/aws-codestar-githubrepository_s3.go
similarity index 93%
rename from goformation/cloudformation/codestar/aws-codestar-githubrepository_s3.go
rename to pkg/goformation/cloudformation/codestar/aws-codestar-githubrepository_s3.go
index a301cb6c10..2f169b0721 100644
--- a/goformation/cloudformation/codestar/aws-codestar-githubrepository_s3.go
+++ b/pkg/goformation/cloudformation/codestar/aws-codestar-githubrepository_s3.go
@@ -1,9 +1,9 @@
 package codestar
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GitHubRepository_S3 AWS CloudFormation Resource (AWS::CodeStar::GitHubRepository.S3)
diff --git a/goformation/cloudformation/codestarconnections/aws-codestarconnections-connection.go b/pkg/goformation/cloudformation/codestarconnections/aws-codestarconnections-connection.go
similarity index 95%
rename from goformation/cloudformation/codestarconnections/aws-codestarconnections-connection.go
rename to pkg/goformation/cloudformation/codestarconnections/aws-codestarconnections-connection.go
index d2e5826aa6..6eff3e679b 100644
--- a/goformation/cloudformation/codestarconnections/aws-codestarconnections-connection.go
+++ b/pkg/goformation/cloudformation/codestarconnections/aws-codestarconnections-connection.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Connection AWS CloudFormation Resource (AWS::CodeStarConnections::Connection)
diff --git a/goformation/cloudformation/codestarnotifications/aws-codestarnotifications-notificationrule.go b/pkg/goformation/cloudformation/codestarnotifications/aws-codestarnotifications-notificationrule.go
similarity index 97%
rename from goformation/cloudformation/codestarnotifications/aws-codestarnotifications-notificationrule.go
rename to pkg/goformation/cloudformation/codestarnotifications/aws-codestarnotifications-notificationrule.go
index 01c312b348..e8616db638 100644
--- a/goformation/cloudformation/codestarnotifications/aws-codestarnotifications-notificationrule.go
+++ b/pkg/goformation/cloudformation/codestarnotifications/aws-codestarnotifications-notificationrule.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NotificationRule AWS CloudFormation Resource (AWS::CodeStarNotifications::NotificationRule)
diff --git a/goformation/cloudformation/codestarnotifications/aws-codestarnotifications-notificationrule_target.go b/pkg/goformation/cloudformation/codestarnotifications/aws-codestarnotifications-notificationrule_target.go
similarity index 93%
rename from goformation/cloudformation/codestarnotifications/aws-codestarnotifications-notificationrule_target.go
rename to pkg/goformation/cloudformation/codestarnotifications/aws-codestarnotifications-notificationrule_target.go
index 3c15b18abd..1640cdc388 100644
--- a/goformation/cloudformation/codestarnotifications/aws-codestarnotifications-notificationrule_target.go
+++ b/pkg/goformation/cloudformation/codestarnotifications/aws-codestarnotifications-notificationrule_target.go
@@ -1,9 +1,9 @@
 package codestarnotifications
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NotificationRule_Target AWS CloudFormation Resource (AWS::CodeStarNotifications::NotificationRule.Target)
diff --git a/goformation/cloudformation/cognito/aws-cognito-identitypool.go b/pkg/goformation/cloudformation/cognito/aws-cognito-identitypool.go
similarity index 98%
rename from goformation/cloudformation/cognito/aws-cognito-identitypool.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-identitypool.go
index 9099990239..6d92d4a7af 100644
--- a/goformation/cloudformation/cognito/aws-cognito-identitypool.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-identitypool.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // IdentityPool AWS CloudFormation Resource (AWS::Cognito::IdentityPool)
diff --git a/goformation/cloudformation/cognito/aws-cognito-identitypool_cognitoidentityprovider.go b/pkg/goformation/cloudformation/cognito/aws-cognito-identitypool_cognitoidentityprovider.go
similarity index 94%
rename from goformation/cloudformation/cognito/aws-cognito-identitypool_cognitoidentityprovider.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-identitypool_cognitoidentityprovider.go
index 28046fc279..005df15b67 100644
--- a/goformation/cloudformation/cognito/aws-cognito-identitypool_cognitoidentityprovider.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-identitypool_cognitoidentityprovider.go
@@ -1,9 +1,9 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // IdentityPool_CognitoIdentityProvider AWS CloudFormation Resource (AWS::Cognito::IdentityPool.CognitoIdentityProvider)
diff --git a/goformation/cloudformation/cognito/aws-cognito-identitypool_cognitostreams.go b/pkg/goformation/cloudformation/cognito/aws-cognito-identitypool_cognitostreams.go
similarity index 93%
rename from goformation/cloudformation/cognito/aws-cognito-identitypool_cognitostreams.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-identitypool_cognitostreams.go
index 921271e7b1..642acc30ce 100644
--- a/goformation/cloudformation/cognito/aws-cognito-identitypool_cognitostreams.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-identitypool_cognitostreams.go
@@ -1,9 +1,9 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // IdentityPool_CognitoStreams AWS CloudFormation Resource (AWS::Cognito::IdentityPool.CognitoStreams)
diff --git a/goformation/cloudformation/cognito/aws-cognito-identitypool_pushsync.go b/pkg/goformation/cloudformation/cognito/aws-cognito-identitypool_pushsync.go
similarity index 92%
rename from goformation/cloudformation/cognito/aws-cognito-identitypool_pushsync.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-identitypool_pushsync.go
index b84710c7c2..fcb8a772d1 100644
--- a/goformation/cloudformation/cognito/aws-cognito-identitypool_pushsync.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-identitypool_pushsync.go
@@ -1,9 +1,9 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // IdentityPool_PushSync AWS CloudFormation Resource (AWS::Cognito::IdentityPool.PushSync)
diff --git a/goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment.go b/pkg/goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment.go
similarity index 97%
rename from goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment.go
index 0f2af95cc9..3c99f27729 100644
--- a/goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // IdentityPoolRoleAttachment AWS CloudFormation Resource (AWS::Cognito::IdentityPoolRoleAttachment)
diff --git a/goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment_mappingrule.go b/pkg/goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment_mappingrule.go
similarity index 94%
rename from goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment_mappingrule.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment_mappingrule.go
index b4a43c2448..7a0c99e614 100644
--- a/goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment_mappingrule.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment_mappingrule.go
@@ -1,9 +1,9 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // IdentityPoolRoleAttachment_MappingRule AWS CloudFormation Resource (AWS::Cognito::IdentityPoolRoleAttachment.MappingRule)
diff --git a/goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment_rolemapping.go b/pkg/goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment_rolemapping.go
similarity index 95%
rename from goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment_rolemapping.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment_rolemapping.go
index e64356285e..ba18e6901a 100644
--- a/goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment_rolemapping.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment_rolemapping.go
@@ -1,9 +1,9 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // IdentityPoolRoleAttachment_RoleMapping AWS CloudFormation Resource (AWS::Cognito::IdentityPoolRoleAttachment.RoleMapping)
diff --git a/goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment_rulesconfigurationtype.go b/pkg/goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment_rulesconfigurationtype.go
similarity index 96%
rename from goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment_rulesconfigurationtype.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment_rulesconfigurationtype.go
index 694b2a430e..c54863a2c2 100644
--- a/goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment_rulesconfigurationtype.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment_rulesconfigurationtype.go
@@ -1,7 +1,7 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // IdentityPoolRoleAttachment_RulesConfigurationType AWS CloudFormation Resource (AWS::Cognito::IdentityPoolRoleAttachment.RulesConfigurationType)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool.go
similarity index 98%
rename from goformation/cloudformation/cognito/aws-cognito-userpool.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpool.go
index f419624bfd..fdb8979ca7 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpool.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPool AWS CloudFormation Resource (AWS::Cognito::UserPool)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_accountrecoverysetting.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_accountrecoverysetting.go
similarity index 95%
rename from goformation/cloudformation/cognito/aws-cognito-userpool_accountrecoverysetting.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpool_accountrecoverysetting.go
index 8ed9061ed5..572737327e 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpool_accountrecoverysetting.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_accountrecoverysetting.go
@@ -1,7 +1,7 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPool_AccountRecoverySetting AWS CloudFormation Resource (AWS::Cognito::UserPool.AccountRecoverySetting)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_admincreateuserconfig.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_admincreateuserconfig.go
similarity index 94%
rename from goformation/cloudformation/cognito/aws-cognito-userpool_admincreateuserconfig.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpool_admincreateuserconfig.go
index 7538f8eeb4..84f4def41c 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpool_admincreateuserconfig.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_admincreateuserconfig.go
@@ -1,9 +1,9 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPool_AdminCreateUserConfig AWS CloudFormation Resource (AWS::Cognito::UserPool.AdminCreateUserConfig)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_customemailsender.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_customemailsender.go
similarity index 93%
rename from goformation/cloudformation/cognito/aws-cognito-userpool_customemailsender.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpool_customemailsender.go
index 3ae8807180..f9a79f7714 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpool_customemailsender.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_customemailsender.go
@@ -1,9 +1,9 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPool_CustomEmailSender AWS CloudFormation Resource (AWS::Cognito::UserPool.CustomEmailSender)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_customsmssender.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_customsmssender.go
similarity index 92%
rename from goformation/cloudformation/cognito/aws-cognito-userpool_customsmssender.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpool_customsmssender.go
index ceda46d24a..3d8e48c57b 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpool_customsmssender.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_customsmssender.go
@@ -1,9 +1,9 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPool_CustomSMSSender AWS CloudFormation Resource (AWS::Cognito::UserPool.CustomSMSSender)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_deviceconfiguration.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_deviceconfiguration.go
similarity index 93%
rename from goformation/cloudformation/cognito/aws-cognito-userpool_deviceconfiguration.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpool_deviceconfiguration.go
index b125362cec..8504162e95 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpool_deviceconfiguration.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_deviceconfiguration.go
@@ -1,9 +1,9 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPool_DeviceConfiguration AWS CloudFormation Resource (AWS::Cognito::UserPool.DeviceConfiguration)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_emailconfiguration.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_emailconfiguration.go
similarity index 95%
rename from goformation/cloudformation/cognito/aws-cognito-userpool_emailconfiguration.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpool_emailconfiguration.go
index f5a7bd02c8..10f7d01ef1 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpool_emailconfiguration.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_emailconfiguration.go
@@ -1,9 +1,9 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPool_EmailConfiguration AWS CloudFormation Resource (AWS::Cognito::UserPool.EmailConfiguration)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_invitemessagetemplate.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_invitemessagetemplate.go
similarity index 94%
rename from goformation/cloudformation/cognito/aws-cognito-userpool_invitemessagetemplate.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpool_invitemessagetemplate.go
index d405ac0d96..60c4b1deee 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpool_invitemessagetemplate.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_invitemessagetemplate.go
@@ -1,9 +1,9 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPool_InviteMessageTemplate AWS CloudFormation Resource (AWS::Cognito::UserPool.InviteMessageTemplate)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_lambdaconfig.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_lambdaconfig.go
similarity index 97%
rename from goformation/cloudformation/cognito/aws-cognito-userpool_lambdaconfig.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpool_lambdaconfig.go
index 8b5dac43e7..550b885c30 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpool_lambdaconfig.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_lambdaconfig.go
@@ -1,9 +1,9 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPool_LambdaConfig AWS CloudFormation Resource (AWS::Cognito::UserPool.LambdaConfig)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_numberattributeconstraints.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_numberattributeconstraints.go
similarity index 93%
rename from goformation/cloudformation/cognito/aws-cognito-userpool_numberattributeconstraints.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpool_numberattributeconstraints.go
index 4c78231291..17278530fa 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpool_numberattributeconstraints.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_numberattributeconstraints.go
@@ -1,9 +1,9 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPool_NumberAttributeConstraints AWS CloudFormation Resource (AWS::Cognito::UserPool.NumberAttributeConstraints)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_passwordpolicy.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_passwordpolicy.go
similarity index 95%
rename from goformation/cloudformation/cognito/aws-cognito-userpool_passwordpolicy.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpool_passwordpolicy.go
index 415c37daa9..e9b04c3baf 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpool_passwordpolicy.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_passwordpolicy.go
@@ -1,9 +1,9 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPool_PasswordPolicy AWS CloudFormation Resource (AWS::Cognito::UserPool.PasswordPolicy)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_policies.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_policies.go
similarity index 95%
rename from goformation/cloudformation/cognito/aws-cognito-userpool_policies.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpool_policies.go
index b4b6366cd5..18b9c01925 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpool_policies.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_policies.go
@@ -1,7 +1,7 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPool_Policies AWS CloudFormation Resource (AWS::Cognito::UserPool.Policies)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_recoveryoption.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_recoveryoption.go
similarity index 92%
rename from goformation/cloudformation/cognito/aws-cognito-userpool_recoveryoption.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpool_recoveryoption.go
index 2840fbfd3b..badc9a207a 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpool_recoveryoption.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_recoveryoption.go
@@ -1,9 +1,9 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPool_RecoveryOption AWS CloudFormation Resource (AWS::Cognito::UserPool.RecoveryOption)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_schemaattribute.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_schemaattribute.go
similarity index 96%
rename from goformation/cloudformation/cognito/aws-cognito-userpool_schemaattribute.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpool_schemaattribute.go
index 5d97ded1b8..b6575f11b3 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpool_schemaattribute.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_schemaattribute.go
@@ -1,9 +1,9 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPool_SchemaAttribute AWS CloudFormation Resource (AWS::Cognito::UserPool.SchemaAttribute)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_smsconfiguration.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_smsconfiguration.go
similarity index 92%
rename from goformation/cloudformation/cognito/aws-cognito-userpool_smsconfiguration.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpool_smsconfiguration.go
index 3161639027..b997d5a2f3 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpool_smsconfiguration.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_smsconfiguration.go
@@ -1,9 +1,9 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPool_SmsConfiguration AWS CloudFormation Resource (AWS::Cognito::UserPool.SmsConfiguration)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_stringattributeconstraints.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_stringattributeconstraints.go
similarity index 93%
rename from goformation/cloudformation/cognito/aws-cognito-userpool_stringattributeconstraints.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpool_stringattributeconstraints.go
index bd5cf39528..c6eb126f07 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpool_stringattributeconstraints.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_stringattributeconstraints.go
@@ -1,9 +1,9 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPool_StringAttributeConstraints AWS CloudFormation Resource (AWS::Cognito::UserPool.StringAttributeConstraints)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_usernameconfiguration.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_usernameconfiguration.go
similarity index 91%
rename from goformation/cloudformation/cognito/aws-cognito-userpool_usernameconfiguration.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpool_usernameconfiguration.go
index 8c5b6ab0ae..be7e99f6d2 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpool_usernameconfiguration.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_usernameconfiguration.go
@@ -1,9 +1,9 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPool_UsernameConfiguration AWS CloudFormation Resource (AWS::Cognito::UserPool.UsernameConfiguration)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_userpooladdons.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_userpooladdons.go
similarity index 91%
rename from goformation/cloudformation/cognito/aws-cognito-userpool_userpooladdons.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpool_userpooladdons.go
index 91c5723a5b..e030b5d379 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpool_userpooladdons.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_userpooladdons.go
@@ -1,9 +1,9 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPool_UserPoolAddOns AWS CloudFormation Resource (AWS::Cognito::UserPool.UserPoolAddOns)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_verificationmessagetemplate.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_verificationmessagetemplate.go
similarity index 95%
rename from goformation/cloudformation/cognito/aws-cognito-userpool_verificationmessagetemplate.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpool_verificationmessagetemplate.go
index fe498ecb93..f39af5330b 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpool_verificationmessagetemplate.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpool_verificationmessagetemplate.go
@@ -1,9 +1,9 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPool_VerificationMessageTemplate AWS CloudFormation Resource (AWS::Cognito::UserPool.VerificationMessageTemplate)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpoolclient.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolclient.go
similarity index 98%
rename from goformation/cloudformation/cognito/aws-cognito-userpoolclient.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpoolclient.go
index 588ce3a536..59accd96d5 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpoolclient.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolclient.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPoolClient AWS CloudFormation Resource (AWS::Cognito::UserPoolClient)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpoolclient_analyticsconfiguration.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolclient_analyticsconfiguration.go
similarity index 95%
rename from goformation/cloudformation/cognito/aws-cognito-userpoolclient_analyticsconfiguration.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpoolclient_analyticsconfiguration.go
index 18ec3cf0c3..bf77941c9d 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpoolclient_analyticsconfiguration.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolclient_analyticsconfiguration.go
@@ -1,9 +1,9 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPoolClient_AnalyticsConfiguration AWS CloudFormation Resource (AWS::Cognito::UserPoolClient.AnalyticsConfiguration)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpoolclient_tokenvalidityunits.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolclient_tokenvalidityunits.go
similarity index 94%
rename from goformation/cloudformation/cognito/aws-cognito-userpoolclient_tokenvalidityunits.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpoolclient_tokenvalidityunits.go
index a67c21d8c8..55fe7d3a8e 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpoolclient_tokenvalidityunits.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolclient_tokenvalidityunits.go
@@ -1,9 +1,9 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPoolClient_TokenValidityUnits AWS CloudFormation Resource (AWS::Cognito::UserPoolClient.TokenValidityUnits)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpooldomain.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpooldomain.go
similarity index 96%
rename from goformation/cloudformation/cognito/aws-cognito-userpooldomain.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpooldomain.go
index 3b855f6e2e..d29361072b 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpooldomain.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpooldomain.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPoolDomain AWS CloudFormation Resource (AWS::Cognito::UserPoolDomain)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpooldomain_customdomainconfigtype.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpooldomain_customdomainconfigtype.go
similarity index 92%
rename from goformation/cloudformation/cognito/aws-cognito-userpooldomain_customdomainconfigtype.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpooldomain_customdomainconfigtype.go
index b160c13530..8672c07c13 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpooldomain_customdomainconfigtype.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpooldomain_customdomainconfigtype.go
@@ -1,9 +1,9 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPoolDomain_CustomDomainConfigType AWS CloudFormation Resource (AWS::Cognito::UserPoolDomain.CustomDomainConfigType)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpoolgroup.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolgroup.go
similarity index 97%
rename from goformation/cloudformation/cognito/aws-cognito-userpoolgroup.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpoolgroup.go
index 2f2312aea0..6a1262adfe 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpoolgroup.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolgroup.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPoolGroup AWS CloudFormation Resource (AWS::Cognito::UserPoolGroup)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpoolidentityprovider.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolidentityprovider.go
similarity index 97%
rename from goformation/cloudformation/cognito/aws-cognito-userpoolidentityprovider.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpoolidentityprovider.go
index 7aa86450b8..6dc4666375 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpoolidentityprovider.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolidentityprovider.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPoolIdentityProvider AWS CloudFormation Resource (AWS::Cognito::UserPoolIdentityProvider)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpoolresourceserver.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolresourceserver.go
similarity index 97%
rename from goformation/cloudformation/cognito/aws-cognito-userpoolresourceserver.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpoolresourceserver.go
index 950dbfdd4e..cd9167f526 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpoolresourceserver.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolresourceserver.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPoolResourceServer AWS CloudFormation Resource (AWS::Cognito::UserPoolResourceServer)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpoolresourceserver_resourceserverscopetype.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolresourceserver_resourceserverscopetype.go
similarity index 93%
rename from goformation/cloudformation/cognito/aws-cognito-userpoolresourceserver_resourceserverscopetype.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpoolresourceserver_resourceserverscopetype.go
index 6991175bfb..173f98ec7d 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpoolresourceserver_resourceserverscopetype.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolresourceserver_resourceserverscopetype.go
@@ -1,9 +1,9 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPoolResourceServer_ResourceServerScopeType AWS CloudFormation Resource (AWS::Cognito::UserPoolResourceServer.ResourceServerScopeType)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment.go
similarity index 97%
rename from goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment.go
index d73d830665..2f52bbf837 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPoolRiskConfigurationAttachment AWS CloudFormation Resource (AWS::Cognito::UserPoolRiskConfigurationAttachment)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoveractionstype.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoveractionstype.go
similarity index 97%
rename from goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoveractionstype.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoveractionstype.go
index b48dd2cae7..116f39b3df 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoveractionstype.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoveractionstype.go
@@ -1,7 +1,7 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPoolRiskConfigurationAttachment_AccountTakeoverActionsType AWS CloudFormation Resource (AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverActionsType)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoveractiontype.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoveractiontype.go
similarity index 93%
rename from goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoveractiontype.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoveractiontype.go
index 858bd7320a..d6e1c6f0ce 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoveractiontype.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoveractiontype.go
@@ -1,9 +1,9 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPoolRiskConfigurationAttachment_AccountTakeoverActionType AWS CloudFormation Resource (AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverActionType)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoverriskconfigurationtype.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoverriskconfigurationtype.go
similarity index 97%
rename from goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoverriskconfigurationtype.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoverriskconfigurationtype.go
index 07bfe99c94..f30f539e5e 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoverriskconfigurationtype.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoverriskconfigurationtype.go
@@ -1,7 +1,7 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPoolRiskConfigurationAttachment_AccountTakeoverRiskConfigurationType AWS CloudFormation Resource (AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverRiskConfigurationType)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_compromisedcredentialsactionstype.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_compromisedcredentialsactionstype.go
similarity index 93%
rename from goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_compromisedcredentialsactionstype.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_compromisedcredentialsactionstype.go
index 1bfb91a9a3..50e59eeae4 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_compromisedcredentialsactionstype.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_compromisedcredentialsactionstype.go
@@ -1,9 +1,9 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPoolRiskConfigurationAttachment_CompromisedCredentialsActionsType AWS CloudFormation Resource (AWS::Cognito::UserPoolRiskConfigurationAttachment.CompromisedCredentialsActionsType)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_compromisedcredentialsriskconfigurationtype.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_compromisedcredentialsriskconfigurationtype.go
similarity index 94%
rename from goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_compromisedcredentialsriskconfigurationtype.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_compromisedcredentialsriskconfigurationtype.go
index 9aba95c1aa..29249e18df 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_compromisedcredentialsriskconfigurationtype.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_compromisedcredentialsriskconfigurationtype.go
@@ -1,9 +1,9 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPoolRiskConfigurationAttachment_CompromisedCredentialsRiskConfigurationType AWS CloudFormation Resource (AWS::Cognito::UserPoolRiskConfigurationAttachment.CompromisedCredentialsRiskConfigurationType)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_notifyconfigurationtype.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_notifyconfigurationtype.go
similarity index 96%
rename from goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_notifyconfigurationtype.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_notifyconfigurationtype.go
index 1e759e9a7e..c060d355a0 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_notifyconfigurationtype.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_notifyconfigurationtype.go
@@ -1,9 +1,9 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPoolRiskConfigurationAttachment_NotifyConfigurationType AWS CloudFormation Resource (AWS::Cognito::UserPoolRiskConfigurationAttachment.NotifyConfigurationType)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_notifyemailtype.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_notifyemailtype.go
similarity index 94%
rename from goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_notifyemailtype.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_notifyemailtype.go
index 6deb037bca..6f40b82b45 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_notifyemailtype.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_notifyemailtype.go
@@ -1,9 +1,9 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPoolRiskConfigurationAttachment_NotifyEmailType AWS CloudFormation Resource (AWS::Cognito::UserPoolRiskConfigurationAttachment.NotifyEmailType)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_riskexceptionconfigurationtype.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_riskexceptionconfigurationtype.go
similarity index 94%
rename from goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_riskexceptionconfigurationtype.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_riskexceptionconfigurationtype.go
index 78fc9a34ab..a854fb9f26 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_riskexceptionconfigurationtype.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_riskexceptionconfigurationtype.go
@@ -1,9 +1,9 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPoolRiskConfigurationAttachment_RiskExceptionConfigurationType AWS CloudFormation Resource (AWS::Cognito::UserPoolRiskConfigurationAttachment.RiskExceptionConfigurationType)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpooluicustomizationattachment.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpooluicustomizationattachment.go
similarity index 97%
rename from goformation/cloudformation/cognito/aws-cognito-userpooluicustomizationattachment.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpooluicustomizationattachment.go
index e5726ac96d..8b8fd12bfd 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpooluicustomizationattachment.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpooluicustomizationattachment.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPoolUICustomizationAttachment AWS CloudFormation Resource (AWS::Cognito::UserPoolUICustomizationAttachment)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpooluser.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpooluser.go
similarity index 97%
rename from goformation/cloudformation/cognito/aws-cognito-userpooluser.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpooluser.go
index 9550d7cacc..fa82932c2b 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpooluser.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpooluser.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPoolUser AWS CloudFormation Resource (AWS::Cognito::UserPoolUser)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpooluser_attributetype.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpooluser_attributetype.go
similarity index 92%
rename from goformation/cloudformation/cognito/aws-cognito-userpooluser_attributetype.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpooluser_attributetype.go
index 1ec67b66d7..23118819d0 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpooluser_attributetype.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpooluser_attributetype.go
@@ -1,9 +1,9 @@
 package cognito
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPoolUser_AttributeType AWS CloudFormation Resource (AWS::Cognito::UserPoolUser.AttributeType)
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpoolusertogroupattachment.go b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolusertogroupattachment.go
similarity index 97%
rename from goformation/cloudformation/cognito/aws-cognito-userpoolusertogroupattachment.go
rename to pkg/goformation/cloudformation/cognito/aws-cognito-userpoolusertogroupattachment.go
index e69f2707ee..8eb4859056 100644
--- a/goformation/cloudformation/cognito/aws-cognito-userpoolusertogroupattachment.go
+++ b/pkg/goformation/cloudformation/cognito/aws-cognito-userpoolusertogroupattachment.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserPoolUserToGroupAttachment AWS CloudFormation Resource (AWS::Cognito::UserPoolUserToGroupAttachment)
diff --git a/goformation/cloudformation/config/aws-config-aggregationauthorization.go b/pkg/goformation/cloudformation/config/aws-config-aggregationauthorization.go
similarity index 95%
rename from goformation/cloudformation/config/aws-config-aggregationauthorization.go
rename to pkg/goformation/cloudformation/config/aws-config-aggregationauthorization.go
index 081b3090c6..d5a4be7dfc 100644
--- a/goformation/cloudformation/config/aws-config-aggregationauthorization.go
+++ b/pkg/goformation/cloudformation/config/aws-config-aggregationauthorization.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AggregationAuthorization AWS CloudFormation Resource (AWS::Config::AggregationAuthorization)
diff --git a/goformation/cloudformation/config/aws-config-configrule.go b/pkg/goformation/cloudformation/config/aws-config-configrule.go
similarity index 97%
rename from goformation/cloudformation/config/aws-config-configrule.go
rename to pkg/goformation/cloudformation/config/aws-config-configrule.go
index 891b0aace6..c2bda04f63 100644
--- a/goformation/cloudformation/config/aws-config-configrule.go
+++ b/pkg/goformation/cloudformation/config/aws-config-configrule.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigRule AWS CloudFormation Resource (AWS::Config::ConfigRule)
diff --git a/goformation/cloudformation/config/aws-config-configrule_scope.go b/pkg/goformation/cloudformation/config/aws-config-configrule_scope.go
similarity index 94%
rename from goformation/cloudformation/config/aws-config-configrule_scope.go
rename to pkg/goformation/cloudformation/config/aws-config-configrule_scope.go
index 45b560c843..000c9f5aaf 100644
--- a/goformation/cloudformation/config/aws-config-configrule_scope.go
+++ b/pkg/goformation/cloudformation/config/aws-config-configrule_scope.go
@@ -1,9 +1,9 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigRule_Scope AWS CloudFormation Resource (AWS::Config::ConfigRule.Scope)
diff --git a/goformation/cloudformation/config/aws-config-configrule_source.go b/pkg/goformation/cloudformation/config/aws-config-configrule_source.go
similarity index 93%
rename from goformation/cloudformation/config/aws-config-configrule_source.go
rename to pkg/goformation/cloudformation/config/aws-config-configrule_source.go
index e6ad84f11c..f0c646bab1 100644
--- a/goformation/cloudformation/config/aws-config-configrule_source.go
+++ b/pkg/goformation/cloudformation/config/aws-config-configrule_source.go
@@ -1,9 +1,9 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigRule_Source AWS CloudFormation Resource (AWS::Config::ConfigRule.Source)
diff --git a/goformation/cloudformation/config/aws-config-configrule_sourcedetail.go b/pkg/goformation/cloudformation/config/aws-config-configrule_sourcedetail.go
similarity index 94%
rename from goformation/cloudformation/config/aws-config-configrule_sourcedetail.go
rename to pkg/goformation/cloudformation/config/aws-config-configrule_sourcedetail.go
index 18d1c5c737..00544dfc84 100644
--- a/goformation/cloudformation/config/aws-config-configrule_sourcedetail.go
+++ b/pkg/goformation/cloudformation/config/aws-config-configrule_sourcedetail.go
@@ -1,9 +1,9 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigRule_SourceDetail AWS CloudFormation Resource (AWS::Config::ConfigRule.SourceDetail)
diff --git a/goformation/cloudformation/config/aws-config-configurationaggregator.go b/pkg/goformation/cloudformation/config/aws-config-configurationaggregator.go
similarity index 95%
rename from goformation/cloudformation/config/aws-config-configurationaggregator.go
rename to pkg/goformation/cloudformation/config/aws-config-configurationaggregator.go
index 29b1845da9..185cc1dbba 100644
--- a/goformation/cloudformation/config/aws-config-configurationaggregator.go
+++ b/pkg/goformation/cloudformation/config/aws-config-configurationaggregator.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigurationAggregator AWS CloudFormation Resource (AWS::Config::ConfigurationAggregator)
diff --git a/goformation/cloudformation/config/aws-config-configurationaggregator_accountaggregationsource.go b/pkg/goformation/cloudformation/config/aws-config-configurationaggregator_accountaggregationsource.go
similarity index 94%
rename from goformation/cloudformation/config/aws-config-configurationaggregator_accountaggregationsource.go
rename to pkg/goformation/cloudformation/config/aws-config-configurationaggregator_accountaggregationsource.go
index 8833415227..808a3ff266 100644
--- a/goformation/cloudformation/config/aws-config-configurationaggregator_accountaggregationsource.go
+++ b/pkg/goformation/cloudformation/config/aws-config-configurationaggregator_accountaggregationsource.go
@@ -1,9 +1,9 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigurationAggregator_AccountAggregationSource AWS CloudFormation Resource (AWS::Config::ConfigurationAggregator.AccountAggregationSource)
diff --git a/goformation/cloudformation/config/aws-config-configurationaggregator_organizationaggregationsource.go b/pkg/goformation/cloudformation/config/aws-config-configurationaggregator_organizationaggregationsource.go
similarity index 94%
rename from goformation/cloudformation/config/aws-config-configurationaggregator_organizationaggregationsource.go
rename to pkg/goformation/cloudformation/config/aws-config-configurationaggregator_organizationaggregationsource.go
index b3cdb0b2d7..6039ae957c 100644
--- a/goformation/cloudformation/config/aws-config-configurationaggregator_organizationaggregationsource.go
+++ b/pkg/goformation/cloudformation/config/aws-config-configurationaggregator_organizationaggregationsource.go
@@ -1,9 +1,9 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigurationAggregator_OrganizationAggregationSource AWS CloudFormation Resource (AWS::Config::ConfigurationAggregator.OrganizationAggregationSource)
diff --git a/goformation/cloudformation/config/aws-config-configurationrecorder.go b/pkg/goformation/cloudformation/config/aws-config-configurationrecorder.go
similarity index 97%
rename from goformation/cloudformation/config/aws-config-configurationrecorder.go
rename to pkg/goformation/cloudformation/config/aws-config-configurationrecorder.go
index bc5c02099b..512f07bb5e 100644
--- a/goformation/cloudformation/config/aws-config-configurationrecorder.go
+++ b/pkg/goformation/cloudformation/config/aws-config-configurationrecorder.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigurationRecorder AWS CloudFormation Resource (AWS::Config::ConfigurationRecorder)
diff --git a/goformation/cloudformation/config/aws-config-configurationrecorder_recordinggroup.go b/pkg/goformation/cloudformation/config/aws-config-configurationrecorder_recordinggroup.go
similarity index 94%
rename from goformation/cloudformation/config/aws-config-configurationrecorder_recordinggroup.go
rename to pkg/goformation/cloudformation/config/aws-config-configurationrecorder_recordinggroup.go
index 8bacbbef64..41e10cf8ec 100644
--- a/goformation/cloudformation/config/aws-config-configurationrecorder_recordinggroup.go
+++ b/pkg/goformation/cloudformation/config/aws-config-configurationrecorder_recordinggroup.go
@@ -1,9 +1,9 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigurationRecorder_RecordingGroup AWS CloudFormation Resource (AWS::Config::ConfigurationRecorder.RecordingGroup)
diff --git a/goformation/cloudformation/config/aws-config-conformancepack.go b/pkg/goformation/cloudformation/config/aws-config-conformancepack.go
similarity index 97%
rename from goformation/cloudformation/config/aws-config-conformancepack.go
rename to pkg/goformation/cloudformation/config/aws-config-conformancepack.go
index 242b830050..29cf21f19b 100644
--- a/goformation/cloudformation/config/aws-config-conformancepack.go
+++ b/pkg/goformation/cloudformation/config/aws-config-conformancepack.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConformancePack AWS CloudFormation Resource (AWS::Config::ConformancePack)
diff --git a/goformation/cloudformation/config/aws-config-conformancepack_conformancepackinputparameter.go b/pkg/goformation/cloudformation/config/aws-config-conformancepack_conformancepackinputparameter.go
similarity index 93%
rename from goformation/cloudformation/config/aws-config-conformancepack_conformancepackinputparameter.go
rename to pkg/goformation/cloudformation/config/aws-config-conformancepack_conformancepackinputparameter.go
index 1749ffc12f..15aa718a25 100644
--- a/goformation/cloudformation/config/aws-config-conformancepack_conformancepackinputparameter.go
+++ b/pkg/goformation/cloudformation/config/aws-config-conformancepack_conformancepackinputparameter.go
@@ -1,9 +1,9 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConformancePack_ConformancePackInputParameter AWS CloudFormation Resource (AWS::Config::ConformancePack.ConformancePackInputParameter)
diff --git a/goformation/cloudformation/config/aws-config-deliverychannel.go b/pkg/goformation/cloudformation/config/aws-config-deliverychannel.go
similarity index 97%
rename from goformation/cloudformation/config/aws-config-deliverychannel.go
rename to pkg/goformation/cloudformation/config/aws-config-deliverychannel.go
index 8a704226b1..520f2df6fd 100644
--- a/goformation/cloudformation/config/aws-config-deliverychannel.go
+++ b/pkg/goformation/cloudformation/config/aws-config-deliverychannel.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryChannel AWS CloudFormation Resource (AWS::Config::DeliveryChannel)
diff --git a/goformation/cloudformation/config/aws-config-deliverychannel_configsnapshotdeliveryproperties.go b/pkg/goformation/cloudformation/config/aws-config-deliverychannel_configsnapshotdeliveryproperties.go
similarity index 92%
rename from goformation/cloudformation/config/aws-config-deliverychannel_configsnapshotdeliveryproperties.go
rename to pkg/goformation/cloudformation/config/aws-config-deliverychannel_configsnapshotdeliveryproperties.go
index 9b5174eca0..896b36610d 100644
--- a/goformation/cloudformation/config/aws-config-deliverychannel_configsnapshotdeliveryproperties.go
+++ b/pkg/goformation/cloudformation/config/aws-config-deliverychannel_configsnapshotdeliveryproperties.go
@@ -1,9 +1,9 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryChannel_ConfigSnapshotDeliveryProperties AWS CloudFormation Resource (AWS::Config::DeliveryChannel.ConfigSnapshotDeliveryProperties)
diff --git a/goformation/cloudformation/config/aws-config-organizationconfigrule.go b/pkg/goformation/cloudformation/config/aws-config-organizationconfigrule.go
similarity index 97%
rename from goformation/cloudformation/config/aws-config-organizationconfigrule.go
rename to pkg/goformation/cloudformation/config/aws-config-organizationconfigrule.go
index f11fbbae52..8d80aaf935 100644
--- a/goformation/cloudformation/config/aws-config-organizationconfigrule.go
+++ b/pkg/goformation/cloudformation/config/aws-config-organizationconfigrule.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // OrganizationConfigRule AWS CloudFormation Resource (AWS::Config::OrganizationConfigRule)
diff --git a/goformation/cloudformation/config/aws-config-organizationconfigrule_organizationcustomrulemetadata.go b/pkg/goformation/cloudformation/config/aws-config-organizationconfigrule_organizationcustomrulemetadata.go
similarity index 97%
rename from goformation/cloudformation/config/aws-config-organizationconfigrule_organizationcustomrulemetadata.go
rename to pkg/goformation/cloudformation/config/aws-config-organizationconfigrule_organizationcustomrulemetadata.go
index ba10ed6d7e..6dcdbced4d 100644
--- a/goformation/cloudformation/config/aws-config-organizationconfigrule_organizationcustomrulemetadata.go
+++ b/pkg/goformation/cloudformation/config/aws-config-organizationconfigrule_organizationcustomrulemetadata.go
@@ -1,9 +1,9 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // OrganizationConfigRule_OrganizationCustomRuleMetadata AWS CloudFormation Resource (AWS::Config::OrganizationConfigRule.OrganizationCustomRuleMetadata)
diff --git a/goformation/cloudformation/config/aws-config-organizationconfigrule_organizationmanagedrulemetadata.go b/pkg/goformation/cloudformation/config/aws-config-organizationconfigrule_organizationmanagedrulemetadata.go
similarity index 96%
rename from goformation/cloudformation/config/aws-config-organizationconfigrule_organizationmanagedrulemetadata.go
rename to pkg/goformation/cloudformation/config/aws-config-organizationconfigrule_organizationmanagedrulemetadata.go
index 09ad1766c5..50d7724741 100644
--- a/goformation/cloudformation/config/aws-config-organizationconfigrule_organizationmanagedrulemetadata.go
+++ b/pkg/goformation/cloudformation/config/aws-config-organizationconfigrule_organizationmanagedrulemetadata.go
@@ -1,9 +1,9 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // OrganizationConfigRule_OrganizationManagedRuleMetadata AWS CloudFormation Resource (AWS::Config::OrganizationConfigRule.OrganizationManagedRuleMetadata)
diff --git a/goformation/cloudformation/config/aws-config-organizationconformancepack.go b/pkg/goformation/cloudformation/config/aws-config-organizationconformancepack.go
similarity index 97%
rename from goformation/cloudformation/config/aws-config-organizationconformancepack.go
rename to pkg/goformation/cloudformation/config/aws-config-organizationconformancepack.go
index 6bb966508a..73574919ea 100644
--- a/goformation/cloudformation/config/aws-config-organizationconformancepack.go
+++ b/pkg/goformation/cloudformation/config/aws-config-organizationconformancepack.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // OrganizationConformancePack AWS CloudFormation Resource (AWS::Config::OrganizationConformancePack)
diff --git a/goformation/cloudformation/config/aws-config-organizationconformancepack_conformancepackinputparameter.go b/pkg/goformation/cloudformation/config/aws-config-organizationconformancepack_conformancepackinputparameter.go
similarity index 93%
rename from goformation/cloudformation/config/aws-config-organizationconformancepack_conformancepackinputparameter.go
rename to pkg/goformation/cloudformation/config/aws-config-organizationconformancepack_conformancepackinputparameter.go
index 04f942b460..c0e688f3a3 100644
--- a/goformation/cloudformation/config/aws-config-organizationconformancepack_conformancepackinputparameter.go
+++ b/pkg/goformation/cloudformation/config/aws-config-organizationconformancepack_conformancepackinputparameter.go
@@ -1,9 +1,9 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // OrganizationConformancePack_ConformancePackInputParameter AWS CloudFormation Resource (AWS::Config::OrganizationConformancePack.ConformancePackInputParameter)
diff --git a/goformation/cloudformation/config/aws-config-remediationconfiguration.go b/pkg/goformation/cloudformation/config/aws-config-remediationconfiguration.go
similarity index 97%
rename from goformation/cloudformation/config/aws-config-remediationconfiguration.go
rename to pkg/goformation/cloudformation/config/aws-config-remediationconfiguration.go
index feb33f2581..df4b654ec2 100644
--- a/goformation/cloudformation/config/aws-config-remediationconfiguration.go
+++ b/pkg/goformation/cloudformation/config/aws-config-remediationconfiguration.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RemediationConfiguration AWS CloudFormation Resource (AWS::Config::RemediationConfiguration)
diff --git a/goformation/cloudformation/config/aws-config-remediationconfiguration_executioncontrols.go b/pkg/goformation/cloudformation/config/aws-config-remediationconfiguration_executioncontrols.go
similarity index 95%
rename from goformation/cloudformation/config/aws-config-remediationconfiguration_executioncontrols.go
rename to pkg/goformation/cloudformation/config/aws-config-remediationconfiguration_executioncontrols.go
index ee2196f476..82928cee24 100644
--- a/goformation/cloudformation/config/aws-config-remediationconfiguration_executioncontrols.go
+++ b/pkg/goformation/cloudformation/config/aws-config-remediationconfiguration_executioncontrols.go
@@ -1,7 +1,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RemediationConfiguration_ExecutionControls AWS CloudFormation Resource (AWS::Config::RemediationConfiguration.ExecutionControls)
diff --git a/goformation/cloudformation/config/aws-config-remediationconfiguration_remediationparametervalue.go b/pkg/goformation/cloudformation/config/aws-config-remediationconfiguration_remediationparametervalue.go
similarity index 96%
rename from goformation/cloudformation/config/aws-config-remediationconfiguration_remediationparametervalue.go
rename to pkg/goformation/cloudformation/config/aws-config-remediationconfiguration_remediationparametervalue.go
index cd57efb7d0..b4895e8db4 100644
--- a/goformation/cloudformation/config/aws-config-remediationconfiguration_remediationparametervalue.go
+++ b/pkg/goformation/cloudformation/config/aws-config-remediationconfiguration_remediationparametervalue.go
@@ -1,7 +1,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RemediationConfiguration_RemediationParameterValue AWS CloudFormation Resource (AWS::Config::RemediationConfiguration.RemediationParameterValue)
diff --git a/goformation/cloudformation/config/aws-config-remediationconfiguration_resourcevalue.go b/pkg/goformation/cloudformation/config/aws-config-remediationconfiguration_resourcevalue.go
similarity index 92%
rename from goformation/cloudformation/config/aws-config-remediationconfiguration_resourcevalue.go
rename to pkg/goformation/cloudformation/config/aws-config-remediationconfiguration_resourcevalue.go
index c8eace1504..1c6401791c 100644
--- a/goformation/cloudformation/config/aws-config-remediationconfiguration_resourcevalue.go
+++ b/pkg/goformation/cloudformation/config/aws-config-remediationconfiguration_resourcevalue.go
@@ -1,9 +1,9 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RemediationConfiguration_ResourceValue AWS CloudFormation Resource (AWS::Config::RemediationConfiguration.ResourceValue)
diff --git a/goformation/cloudformation/config/aws-config-remediationconfiguration_ssmcontrols.go b/pkg/goformation/cloudformation/config/aws-config-remediationconfiguration_ssmcontrols.go
similarity index 93%
rename from goformation/cloudformation/config/aws-config-remediationconfiguration_ssmcontrols.go
rename to pkg/goformation/cloudformation/config/aws-config-remediationconfiguration_ssmcontrols.go
index 008b29b797..d113b3a4b4 100644
--- a/goformation/cloudformation/config/aws-config-remediationconfiguration_ssmcontrols.go
+++ b/pkg/goformation/cloudformation/config/aws-config-remediationconfiguration_ssmcontrols.go
@@ -1,9 +1,9 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RemediationConfiguration_SsmControls AWS CloudFormation Resource (AWS::Config::RemediationConfiguration.SsmControls)
diff --git a/goformation/cloudformation/config/aws-config-remediationconfiguration_staticvalue.go b/pkg/goformation/cloudformation/config/aws-config-remediationconfiguration_staticvalue.go
similarity index 92%
rename from goformation/cloudformation/config/aws-config-remediationconfiguration_staticvalue.go
rename to pkg/goformation/cloudformation/config/aws-config-remediationconfiguration_staticvalue.go
index 05876dc811..8af69eb403 100644
--- a/goformation/cloudformation/config/aws-config-remediationconfiguration_staticvalue.go
+++ b/pkg/goformation/cloudformation/config/aws-config-remediationconfiguration_staticvalue.go
@@ -1,9 +1,9 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RemediationConfiguration_StaticValue AWS CloudFormation Resource (AWS::Config::RemediationConfiguration.StaticValue)
diff --git a/goformation/cloudformation/config/aws-config-storedquery.go b/pkg/goformation/cloudformation/config/aws-config-storedquery.go
similarity index 95%
rename from goformation/cloudformation/config/aws-config-storedquery.go
rename to pkg/goformation/cloudformation/config/aws-config-storedquery.go
index 30e75ff91f..db3e01d216 100644
--- a/goformation/cloudformation/config/aws-config-storedquery.go
+++ b/pkg/goformation/cloudformation/config/aws-config-storedquery.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StoredQuery AWS CloudFormation Resource (AWS::Config::StoredQuery)
diff --git a/goformation/cloudformation/connect/aws-connect-contactflow.go b/pkg/goformation/cloudformation/connect/aws-connect-contactflow.go
similarity index 96%
rename from goformation/cloudformation/connect/aws-connect-contactflow.go
rename to pkg/goformation/cloudformation/connect/aws-connect-contactflow.go
index c9fc483e20..07173af682 100644
--- a/goformation/cloudformation/connect/aws-connect-contactflow.go
+++ b/pkg/goformation/cloudformation/connect/aws-connect-contactflow.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ContactFlow AWS CloudFormation Resource (AWS::Connect::ContactFlow)
diff --git a/goformation/cloudformation/connect/aws-connect-contactflowmodule.go b/pkg/goformation/cloudformation/connect/aws-connect-contactflowmodule.go
similarity index 96%
rename from goformation/cloudformation/connect/aws-connect-contactflowmodule.go
rename to pkg/goformation/cloudformation/connect/aws-connect-contactflowmodule.go
index ed0bc31afb..fd7ff4bf0b 100644
--- a/goformation/cloudformation/connect/aws-connect-contactflowmodule.go
+++ b/pkg/goformation/cloudformation/connect/aws-connect-contactflowmodule.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ContactFlowModule AWS CloudFormation Resource (AWS::Connect::ContactFlowModule)
diff --git a/goformation/cloudformation/connect/aws-connect-hoursofoperation.go b/pkg/goformation/cloudformation/connect/aws-connect-hoursofoperation.go
similarity index 96%
rename from goformation/cloudformation/connect/aws-connect-hoursofoperation.go
rename to pkg/goformation/cloudformation/connect/aws-connect-hoursofoperation.go
index 9d5e20b2d4..3b62d0e9e9 100644
--- a/goformation/cloudformation/connect/aws-connect-hoursofoperation.go
+++ b/pkg/goformation/cloudformation/connect/aws-connect-hoursofoperation.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // HoursOfOperation AWS CloudFormation Resource (AWS::Connect::HoursOfOperation)
diff --git a/goformation/cloudformation/connect/aws-connect-hoursofoperation_hoursofoperationconfig.go b/pkg/goformation/cloudformation/connect/aws-connect-hoursofoperation_hoursofoperationconfig.go
similarity index 94%
rename from goformation/cloudformation/connect/aws-connect-hoursofoperation_hoursofoperationconfig.go
rename to pkg/goformation/cloudformation/connect/aws-connect-hoursofoperation_hoursofoperationconfig.go
index ad21c8cf39..ab70bb5d21 100644
--- a/goformation/cloudformation/connect/aws-connect-hoursofoperation_hoursofoperationconfig.go
+++ b/pkg/goformation/cloudformation/connect/aws-connect-hoursofoperation_hoursofoperationconfig.go
@@ -1,9 +1,9 @@
 package connect
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // HoursOfOperation_HoursOfOperationConfig AWS CloudFormation Resource (AWS::Connect::HoursOfOperation.HoursOfOperationConfig)
diff --git a/goformation/cloudformation/connect/aws-connect-hoursofoperation_hoursofoperationtimeslice.go b/pkg/goformation/cloudformation/connect/aws-connect-hoursofoperation_hoursofoperationtimeslice.go
similarity index 93%
rename from goformation/cloudformation/connect/aws-connect-hoursofoperation_hoursofoperationtimeslice.go
rename to pkg/goformation/cloudformation/connect/aws-connect-hoursofoperation_hoursofoperationtimeslice.go
index c72f83e78a..c438b406a8 100644
--- a/goformation/cloudformation/connect/aws-connect-hoursofoperation_hoursofoperationtimeslice.go
+++ b/pkg/goformation/cloudformation/connect/aws-connect-hoursofoperation_hoursofoperationtimeslice.go
@@ -1,9 +1,9 @@
 package connect
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // HoursOfOperation_HoursOfOperationTimeSlice AWS CloudFormation Resource (AWS::Connect::HoursOfOperation.HoursOfOperationTimeSlice)
diff --git a/goformation/cloudformation/connect/aws-connect-quickconnect.go b/pkg/goformation/cloudformation/connect/aws-connect-quickconnect.go
similarity index 95%
rename from goformation/cloudformation/connect/aws-connect-quickconnect.go
rename to pkg/goformation/cloudformation/connect/aws-connect-quickconnect.go
index be7e596422..38561d00cc 100644
--- a/goformation/cloudformation/connect/aws-connect-quickconnect.go
+++ b/pkg/goformation/cloudformation/connect/aws-connect-quickconnect.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // QuickConnect AWS CloudFormation Resource (AWS::Connect::QuickConnect)
diff --git a/goformation/cloudformation/connect/aws-connect-quickconnect_phonenumberquickconnectconfig.go b/pkg/goformation/cloudformation/connect/aws-connect-quickconnect_phonenumberquickconnectconfig.go
similarity index 92%
rename from goformation/cloudformation/connect/aws-connect-quickconnect_phonenumberquickconnectconfig.go
rename to pkg/goformation/cloudformation/connect/aws-connect-quickconnect_phonenumberquickconnectconfig.go
index 50f78727e4..ae1a2b3c60 100644
--- a/goformation/cloudformation/connect/aws-connect-quickconnect_phonenumberquickconnectconfig.go
+++ b/pkg/goformation/cloudformation/connect/aws-connect-quickconnect_phonenumberquickconnectconfig.go
@@ -1,9 +1,9 @@
 package connect
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // QuickConnect_PhoneNumberQuickConnectConfig AWS CloudFormation Resource (AWS::Connect::QuickConnect.PhoneNumberQuickConnectConfig)
diff --git a/goformation/cloudformation/connect/aws-connect-quickconnect_queuequickconnectconfig.go b/pkg/goformation/cloudformation/connect/aws-connect-quickconnect_queuequickconnectconfig.go
similarity index 93%
rename from goformation/cloudformation/connect/aws-connect-quickconnect_queuequickconnectconfig.go
rename to pkg/goformation/cloudformation/connect/aws-connect-quickconnect_queuequickconnectconfig.go
index 7d99bfd128..1a57704b1b 100644
--- a/goformation/cloudformation/connect/aws-connect-quickconnect_queuequickconnectconfig.go
+++ b/pkg/goformation/cloudformation/connect/aws-connect-quickconnect_queuequickconnectconfig.go
@@ -1,9 +1,9 @@
 package connect
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // QuickConnect_QueueQuickConnectConfig AWS CloudFormation Resource (AWS::Connect::QuickConnect.QueueQuickConnectConfig)
diff --git a/goformation/cloudformation/connect/aws-connect-quickconnect_quickconnectconfig.go b/pkg/goformation/cloudformation/connect/aws-connect-quickconnect_quickconnectconfig.go
similarity index 94%
rename from goformation/cloudformation/connect/aws-connect-quickconnect_quickconnectconfig.go
rename to pkg/goformation/cloudformation/connect/aws-connect-quickconnect_quickconnectconfig.go
index 47911bfa80..0991ef9245 100644
--- a/goformation/cloudformation/connect/aws-connect-quickconnect_quickconnectconfig.go
+++ b/pkg/goformation/cloudformation/connect/aws-connect-quickconnect_quickconnectconfig.go
@@ -1,9 +1,9 @@
 package connect
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // QuickConnect_QuickConnectConfig AWS CloudFormation Resource (AWS::Connect::QuickConnect.QuickConnectConfig)
diff --git a/goformation/cloudformation/connect/aws-connect-quickconnect_userquickconnectconfig.go b/pkg/goformation/cloudformation/connect/aws-connect-quickconnect_userquickconnectconfig.go
similarity index 93%
rename from goformation/cloudformation/connect/aws-connect-quickconnect_userquickconnectconfig.go
rename to pkg/goformation/cloudformation/connect/aws-connect-quickconnect_userquickconnectconfig.go
index 6712003787..02a5d915ad 100644
--- a/goformation/cloudformation/connect/aws-connect-quickconnect_userquickconnectconfig.go
+++ b/pkg/goformation/cloudformation/connect/aws-connect-quickconnect_userquickconnectconfig.go
@@ -1,9 +1,9 @@
 package connect
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // QuickConnect_UserQuickConnectConfig AWS CloudFormation Resource (AWS::Connect::QuickConnect.UserQuickConnectConfig)
diff --git a/goformation/cloudformation/connect/aws-connect-user.go b/pkg/goformation/cloudformation/connect/aws-connect-user.go
similarity index 96%
rename from goformation/cloudformation/connect/aws-connect-user.go
rename to pkg/goformation/cloudformation/connect/aws-connect-user.go
index 813e29adc9..e19ddf82e9 100644
--- a/goformation/cloudformation/connect/aws-connect-user.go
+++ b/pkg/goformation/cloudformation/connect/aws-connect-user.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // User AWS CloudFormation Resource (AWS::Connect::User)
diff --git a/goformation/cloudformation/connect/aws-connect-user_useridentityinfo.go b/pkg/goformation/cloudformation/connect/aws-connect-user_useridentityinfo.go
similarity index 93%
rename from goformation/cloudformation/connect/aws-connect-user_useridentityinfo.go
rename to pkg/goformation/cloudformation/connect/aws-connect-user_useridentityinfo.go
index ce41e0c48e..5086f3e03c 100644
--- a/goformation/cloudformation/connect/aws-connect-user_useridentityinfo.go
+++ b/pkg/goformation/cloudformation/connect/aws-connect-user_useridentityinfo.go
@@ -1,9 +1,9 @@
 package connect
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // User_UserIdentityInfo AWS CloudFormation Resource (AWS::Connect::User.UserIdentityInfo)
diff --git a/goformation/cloudformation/connect/aws-connect-user_userphoneconfig.go b/pkg/goformation/cloudformation/connect/aws-connect-user_userphoneconfig.go
similarity index 94%
rename from goformation/cloudformation/connect/aws-connect-user_userphoneconfig.go
rename to pkg/goformation/cloudformation/connect/aws-connect-user_userphoneconfig.go
index fc082e8037..fb4b8a0a8c 100644
--- a/goformation/cloudformation/connect/aws-connect-user_userphoneconfig.go
+++ b/pkg/goformation/cloudformation/connect/aws-connect-user_userphoneconfig.go
@@ -1,9 +1,9 @@
 package connect
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // User_UserPhoneConfig AWS CloudFormation Resource (AWS::Connect::User.UserPhoneConfig)
diff --git a/goformation/cloudformation/connect/aws-connect-userhierarchygroup.go b/pkg/goformation/cloudformation/connect/aws-connect-userhierarchygroup.go
similarity index 97%
rename from goformation/cloudformation/connect/aws-connect-userhierarchygroup.go
rename to pkg/goformation/cloudformation/connect/aws-connect-userhierarchygroup.go
index 588df43c82..b4531758dd 100644
--- a/goformation/cloudformation/connect/aws-connect-userhierarchygroup.go
+++ b/pkg/goformation/cloudformation/connect/aws-connect-userhierarchygroup.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserHierarchyGroup AWS CloudFormation Resource (AWS::Connect::UserHierarchyGroup)
diff --git a/goformation/cloudformation/cur/aws-cur-reportdefinition.go b/pkg/goformation/cloudformation/cur/aws-cur-reportdefinition.go
similarity index 98%
rename from goformation/cloudformation/cur/aws-cur-reportdefinition.go
rename to pkg/goformation/cloudformation/cur/aws-cur-reportdefinition.go
index 23c902d695..31719e91b9 100644
--- a/goformation/cloudformation/cur/aws-cur-reportdefinition.go
+++ b/pkg/goformation/cloudformation/cur/aws-cur-reportdefinition.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReportDefinition AWS CloudFormation Resource (AWS::CUR::ReportDefinition)
diff --git a/goformation/cloudformation/custom_resource.go b/pkg/goformation/cloudformation/custom_resource.go
similarity index 97%
rename from goformation/cloudformation/custom_resource.go
rename to pkg/goformation/cloudformation/custom_resource.go
index be119601c1..653aa576f9 100644
--- a/goformation/cloudformation/custom_resource.go
+++ b/pkg/goformation/cloudformation/custom_resource.go
@@ -3,7 +3,7 @@ package cloudformation
 import (
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // See: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cfn-customresource.html
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-domain.go b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-domain.go
similarity index 95%
rename from goformation/cloudformation/customerprofiles/aws-customerprofiles-domain.go
rename to pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-domain.go
index dd85dc14d3..934290785b 100644
--- a/goformation/cloudformation/customerprofiles/aws-customerprofiles-domain.go
+++ b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-domain.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain AWS CloudFormation Resource (AWS::CustomerProfiles::Domain)
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration.go b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration.go
similarity index 95%
rename from goformation/cloudformation/customerprofiles/aws-customerprofiles-integration.go
rename to pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration.go
index ca574e5d8b..6927de020c 100644
--- a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration.go
+++ b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Integration AWS CloudFormation Resource (AWS::CustomerProfiles::Integration)
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_connectoroperator.go b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_connectoroperator.go
similarity index 95%
rename from goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_connectoroperator.go
rename to pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_connectoroperator.go
index ba5a546fe7..28b298eb88 100644
--- a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_connectoroperator.go
+++ b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_connectoroperator.go
@@ -1,9 +1,9 @@
 package customerprofiles
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Integration_ConnectorOperator AWS CloudFormation Resource (AWS::CustomerProfiles::Integration.ConnectorOperator)
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_flowdefinition.go b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_flowdefinition.go
similarity index 95%
rename from goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_flowdefinition.go
rename to pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_flowdefinition.go
index 8856f186b0..af85792439 100644
--- a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_flowdefinition.go
+++ b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_flowdefinition.go
@@ -1,9 +1,9 @@
 package customerprofiles
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Integration_FlowDefinition AWS CloudFormation Resource (AWS::CustomerProfiles::Integration.FlowDefinition)
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_incrementalpullconfig.go b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_incrementalpullconfig.go
similarity index 92%
rename from goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_incrementalpullconfig.go
rename to pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_incrementalpullconfig.go
index f9fbc408ba..9e8e76afc6 100644
--- a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_incrementalpullconfig.go
+++ b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_incrementalpullconfig.go
@@ -1,9 +1,9 @@
 package customerprofiles
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Integration_IncrementalPullConfig AWS CloudFormation Resource (AWS::CustomerProfiles::Integration.IncrementalPullConfig)
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_marketosourceproperties.go b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_marketosourceproperties.go
similarity index 92%
rename from goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_marketosourceproperties.go
rename to pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_marketosourceproperties.go
index bb2043672b..dfe67e46ff 100644
--- a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_marketosourceproperties.go
+++ b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_marketosourceproperties.go
@@ -1,9 +1,9 @@
 package customerprofiles
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Integration_MarketoSourceProperties AWS CloudFormation Resource (AWS::CustomerProfiles::Integration.MarketoSourceProperties)
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_s3sourceproperties.go b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_s3sourceproperties.go
similarity index 93%
rename from goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_s3sourceproperties.go
rename to pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_s3sourceproperties.go
index 717b911b2f..76ac05d452 100644
--- a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_s3sourceproperties.go
+++ b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_s3sourceproperties.go
@@ -1,9 +1,9 @@
 package customerprofiles
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Integration_S3SourceProperties AWS CloudFormation Resource (AWS::CustomerProfiles::Integration.S3SourceProperties)
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_salesforcesourceproperties.go b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_salesforcesourceproperties.go
similarity index 94%
rename from goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_salesforcesourceproperties.go
rename to pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_salesforcesourceproperties.go
index 3e27bb430f..ac0edc91df 100644
--- a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_salesforcesourceproperties.go
+++ b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_salesforcesourceproperties.go
@@ -1,9 +1,9 @@
 package customerprofiles
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Integration_SalesforceSourceProperties AWS CloudFormation Resource (AWS::CustomerProfiles::Integration.SalesforceSourceProperties)
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_scheduledtriggerproperties.go b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_scheduledtriggerproperties.go
similarity index 96%
rename from goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_scheduledtriggerproperties.go
rename to pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_scheduledtriggerproperties.go
index 9caa405b47..dbc9f33844 100644
--- a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_scheduledtriggerproperties.go
+++ b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_scheduledtriggerproperties.go
@@ -1,9 +1,9 @@
 package customerprofiles
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Integration_ScheduledTriggerProperties AWS CloudFormation Resource (AWS::CustomerProfiles::Integration.ScheduledTriggerProperties)
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_servicenowsourceproperties.go b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_servicenowsourceproperties.go
similarity index 92%
rename from goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_servicenowsourceproperties.go
rename to pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_servicenowsourceproperties.go
index f0c9067245..740f0fad14 100644
--- a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_servicenowsourceproperties.go
+++ b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_servicenowsourceproperties.go
@@ -1,9 +1,9 @@
 package customerprofiles
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Integration_ServiceNowSourceProperties AWS CloudFormation Resource (AWS::CustomerProfiles::Integration.ServiceNowSourceProperties)
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_sourceconnectorproperties.go b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_sourceconnectorproperties.go
similarity index 97%
rename from goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_sourceconnectorproperties.go
rename to pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_sourceconnectorproperties.go
index 4f9dc125d0..a6b3905a63 100644
--- a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_sourceconnectorproperties.go
+++ b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_sourceconnectorproperties.go
@@ -1,7 +1,7 @@
 package customerprofiles
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Integration_SourceConnectorProperties AWS CloudFormation Resource (AWS::CustomerProfiles::Integration.SourceConnectorProperties)
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_sourceflowconfig.go b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_sourceflowconfig.go
similarity index 95%
rename from goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_sourceflowconfig.go
rename to pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_sourceflowconfig.go
index e7dcab5fb3..bbb4ed0acb 100644
--- a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_sourceflowconfig.go
+++ b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_sourceflowconfig.go
@@ -1,9 +1,9 @@
 package customerprofiles
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Integration_SourceFlowConfig AWS CloudFormation Resource (AWS::CustomerProfiles::Integration.SourceFlowConfig)
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_task.go b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_task.go
similarity index 95%
rename from goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_task.go
rename to pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_task.go
index 91dfa4c083..d0012286cd 100644
--- a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_task.go
+++ b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_task.go
@@ -1,9 +1,9 @@
 package customerprofiles
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Integration_Task AWS CloudFormation Resource (AWS::CustomerProfiles::Integration.Task)
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_taskpropertiesmap.go b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_taskpropertiesmap.go
similarity index 93%
rename from goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_taskpropertiesmap.go
rename to pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_taskpropertiesmap.go
index 078bc4cb5b..99487943be 100644
--- a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_taskpropertiesmap.go
+++ b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_taskpropertiesmap.go
@@ -1,9 +1,9 @@
 package customerprofiles
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Integration_TaskPropertiesMap AWS CloudFormation Resource (AWS::CustomerProfiles::Integration.TaskPropertiesMap)
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_triggerconfig.go b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_triggerconfig.go
similarity index 93%
rename from goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_triggerconfig.go
rename to pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_triggerconfig.go
index 12a3278658..f747fd9820 100644
--- a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_triggerconfig.go
+++ b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_triggerconfig.go
@@ -1,9 +1,9 @@
 package customerprofiles
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Integration_TriggerConfig AWS CloudFormation Resource (AWS::CustomerProfiles::Integration.TriggerConfig)
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_triggerproperties.go b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_triggerproperties.go
similarity index 95%
rename from goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_triggerproperties.go
rename to pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_triggerproperties.go
index 74fc83f612..d309c6c860 100644
--- a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_triggerproperties.go
+++ b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_triggerproperties.go
@@ -1,7 +1,7 @@
 package customerprofiles
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Integration_TriggerProperties AWS CloudFormation Resource (AWS::CustomerProfiles::Integration.TriggerProperties)
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_zendesksourceproperties.go b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_zendesksourceproperties.go
similarity index 92%
rename from goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_zendesksourceproperties.go
rename to pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_zendesksourceproperties.go
index cc72ea3ea3..622e775705 100644
--- a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_zendesksourceproperties.go
+++ b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_zendesksourceproperties.go
@@ -1,9 +1,9 @@
 package customerprofiles
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Integration_ZendeskSourceProperties AWS CloudFormation Resource (AWS::CustomerProfiles::Integration.ZendeskSourceProperties)
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype.go b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype.go
similarity index 96%
rename from goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype.go
rename to pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype.go
index 0d5ecabdc1..2112107f0e 100644
--- a/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype.go
+++ b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ObjectType AWS CloudFormation Resource (AWS::CustomerProfiles::ObjectType)
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_fieldmap.go b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_fieldmap.go
similarity index 93%
rename from goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_fieldmap.go
rename to pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_fieldmap.go
index e2c9be49d8..b3638238dc 100644
--- a/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_fieldmap.go
+++ b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_fieldmap.go
@@ -1,9 +1,9 @@
 package customerprofiles
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ObjectType_FieldMap AWS CloudFormation Resource (AWS::CustomerProfiles::ObjectType.FieldMap)
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_keymap.go b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_keymap.go
similarity index 92%
rename from goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_keymap.go
rename to pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_keymap.go
index 3fd8e86ec8..2171d34469 100644
--- a/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_keymap.go
+++ b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_keymap.go
@@ -1,9 +1,9 @@
 package customerprofiles
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ObjectType_KeyMap AWS CloudFormation Resource (AWS::CustomerProfiles::ObjectType.KeyMap)
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_objecttypefield.go b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_objecttypefield.go
similarity index 94%
rename from goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_objecttypefield.go
rename to pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_objecttypefield.go
index 671d32e176..4bf56e4258 100644
--- a/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_objecttypefield.go
+++ b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_objecttypefield.go
@@ -1,9 +1,9 @@
 package customerprofiles
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ObjectType_ObjectTypeField AWS CloudFormation Resource (AWS::CustomerProfiles::ObjectType.ObjectTypeField)
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_objecttypekey.go b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_objecttypekey.go
similarity index 93%
rename from goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_objecttypekey.go
rename to pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_objecttypekey.go
index 7ec8a6418f..ed8f9a5cb1 100644
--- a/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_objecttypekey.go
+++ b/pkg/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_objecttypekey.go
@@ -1,9 +1,9 @@
 package customerprofiles
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ObjectType_ObjectTypeKey AWS CloudFormation Resource (AWS::CustomerProfiles::ObjectType.ObjectTypeKey)
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset.go b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset.go
similarity index 95%
rename from goformation/cloudformation/databrew/aws-databrew-dataset.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-dataset.go
index e4140d70ef..803f981c5d 100644
--- a/goformation/cloudformation/databrew/aws-databrew-dataset.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset AWS CloudFormation Resource (AWS::DataBrew::Dataset)
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset_csvoptions.go b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset_csvoptions.go
similarity index 92%
rename from goformation/cloudformation/databrew/aws-databrew-dataset_csvoptions.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-dataset_csvoptions.go
index 1e57169396..da9293acb4 100644
--- a/goformation/cloudformation/databrew/aws-databrew-dataset_csvoptions.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset_csvoptions.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_CsvOptions AWS CloudFormation Resource (AWS::DataBrew::Dataset.CsvOptions)
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset_databaseinputdefinition.go b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset_databaseinputdefinition.go
similarity index 94%
rename from goformation/cloudformation/databrew/aws-databrew-dataset_databaseinputdefinition.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-dataset_databaseinputdefinition.go
index 4561c859e3..5dd82af545 100644
--- a/goformation/cloudformation/databrew/aws-databrew-dataset_databaseinputdefinition.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset_databaseinputdefinition.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_DatabaseInputDefinition AWS CloudFormation Resource (AWS::DataBrew::Dataset.DatabaseInputDefinition)
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset_datacataloginputdefinition.go b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset_datacataloginputdefinition.go
similarity index 94%
rename from goformation/cloudformation/databrew/aws-databrew-dataset_datacataloginputdefinition.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-dataset_datacataloginputdefinition.go
index fd00c8bfdd..20567e41c7 100644
--- a/goformation/cloudformation/databrew/aws-databrew-dataset_datacataloginputdefinition.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset_datacataloginputdefinition.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_DataCatalogInputDefinition AWS CloudFormation Resource (AWS::DataBrew::Dataset.DataCatalogInputDefinition)
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset_datasetparameter.go b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset_datasetparameter.go
similarity index 95%
rename from goformation/cloudformation/databrew/aws-databrew-dataset_datasetparameter.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-dataset_datasetparameter.go
index 0f57e989b3..9eb341555b 100644
--- a/goformation/cloudformation/databrew/aws-databrew-dataset_datasetparameter.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset_datasetparameter.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_DatasetParameter AWS CloudFormation Resource (AWS::DataBrew::Dataset.DatasetParameter)
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset_datetimeoptions.go b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset_datetimeoptions.go
similarity index 93%
rename from goformation/cloudformation/databrew/aws-databrew-dataset_datetimeoptions.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-dataset_datetimeoptions.go
index 27936197f6..3ece29c153 100644
--- a/goformation/cloudformation/databrew/aws-databrew-dataset_datetimeoptions.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset_datetimeoptions.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_DatetimeOptions AWS CloudFormation Resource (AWS::DataBrew::Dataset.DatetimeOptions)
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset_exceloptions.go b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset_exceloptions.go
similarity index 93%
rename from goformation/cloudformation/databrew/aws-databrew-dataset_exceloptions.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-dataset_exceloptions.go
index 097908d5b8..0e766f87c2 100644
--- a/goformation/cloudformation/databrew/aws-databrew-dataset_exceloptions.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset_exceloptions.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_ExcelOptions AWS CloudFormation Resource (AWS::DataBrew::Dataset.ExcelOptions)
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset_fileslimit.go b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset_fileslimit.go
similarity index 93%
rename from goformation/cloudformation/databrew/aws-databrew-dataset_fileslimit.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-dataset_fileslimit.go
index e4b04794ed..df81ac553a 100644
--- a/goformation/cloudformation/databrew/aws-databrew-dataset_fileslimit.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset_fileslimit.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_FilesLimit AWS CloudFormation Resource (AWS::DataBrew::Dataset.FilesLimit)
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset_filterexpression.go b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset_filterexpression.go
similarity index 92%
rename from goformation/cloudformation/databrew/aws-databrew-dataset_filterexpression.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-dataset_filterexpression.go
index eb55648a29..b32c4a7870 100644
--- a/goformation/cloudformation/databrew/aws-databrew-dataset_filterexpression.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset_filterexpression.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_FilterExpression AWS CloudFormation Resource (AWS::DataBrew::Dataset.FilterExpression)
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset_filtervalue.go b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset_filtervalue.go
similarity index 92%
rename from goformation/cloudformation/databrew/aws-databrew-dataset_filtervalue.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-dataset_filtervalue.go
index ab9a26c91b..831dd62fa1 100644
--- a/goformation/cloudformation/databrew/aws-databrew-dataset_filtervalue.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset_filtervalue.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_FilterValue AWS CloudFormation Resource (AWS::DataBrew::Dataset.FilterValue)
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset_formatoptions.go b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset_formatoptions.go
similarity index 96%
rename from goformation/cloudformation/databrew/aws-databrew-dataset_formatoptions.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-dataset_formatoptions.go
index e467b054a0..992ccc5f26 100644
--- a/goformation/cloudformation/databrew/aws-databrew-dataset_formatoptions.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset_formatoptions.go
@@ -1,7 +1,7 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_FormatOptions AWS CloudFormation Resource (AWS::DataBrew::Dataset.FormatOptions)
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset_input.go b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset_input.go
similarity index 97%
rename from goformation/cloudformation/databrew/aws-databrew-dataset_input.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-dataset_input.go
index 03aca4da2c..485ab4a96a 100644
--- a/goformation/cloudformation/databrew/aws-databrew-dataset_input.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset_input.go
@@ -1,7 +1,7 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_Input AWS CloudFormation Resource (AWS::DataBrew::Dataset.Input)
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset_jsonoptions.go b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset_jsonoptions.go
similarity index 91%
rename from goformation/cloudformation/databrew/aws-databrew-dataset_jsonoptions.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-dataset_jsonoptions.go
index 4c5b7c2084..c66a8ef61a 100644
--- a/goformation/cloudformation/databrew/aws-databrew-dataset_jsonoptions.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset_jsonoptions.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_JsonOptions AWS CloudFormation Resource (AWS::DataBrew::Dataset.JsonOptions)
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset_metadata.go b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset_metadata.go
similarity index 91%
rename from goformation/cloudformation/databrew/aws-databrew-dataset_metadata.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-dataset_metadata.go
index debec8a3c8..070da0fd5e 100644
--- a/goformation/cloudformation/databrew/aws-databrew-dataset_metadata.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset_metadata.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_Metadata AWS CloudFormation Resource (AWS::DataBrew::Dataset.Metadata)
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset_pathoptions.go b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset_pathoptions.go
similarity index 96%
rename from goformation/cloudformation/databrew/aws-databrew-dataset_pathoptions.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-dataset_pathoptions.go
index d27bda5d1a..bf8a6ecb01 100644
--- a/goformation/cloudformation/databrew/aws-databrew-dataset_pathoptions.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset_pathoptions.go
@@ -1,7 +1,7 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_PathOptions AWS CloudFormation Resource (AWS::DataBrew::Dataset.PathOptions)
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset_pathparameter.go b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset_pathparameter.go
similarity index 93%
rename from goformation/cloudformation/databrew/aws-databrew-dataset_pathparameter.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-dataset_pathparameter.go
index 67e9d16a92..ecae3441fc 100644
--- a/goformation/cloudformation/databrew/aws-databrew-dataset_pathparameter.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset_pathparameter.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_PathParameter AWS CloudFormation Resource (AWS::DataBrew::Dataset.PathParameter)
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset_s3location.go b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset_s3location.go
similarity index 92%
rename from goformation/cloudformation/databrew/aws-databrew-dataset_s3location.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-dataset_s3location.go
index bc16c65dde..5474dd878e 100644
--- a/goformation/cloudformation/databrew/aws-databrew-dataset_s3location.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-dataset_s3location.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_S3Location AWS CloudFormation Resource (AWS::DataBrew::Dataset.S3Location)
diff --git a/goformation/cloudformation/databrew/aws-databrew-job.go b/pkg/goformation/cloudformation/databrew/aws-databrew-job.go
similarity index 97%
rename from goformation/cloudformation/databrew/aws-databrew-job.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-job.go
index 0445337b5e..f7b97c5620 100644
--- a/goformation/cloudformation/databrew/aws-databrew-job.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-job.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Job AWS CloudFormation Resource (AWS::DataBrew::Job)
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_allowedstatistics.go b/pkg/goformation/cloudformation/databrew/aws-databrew-job_allowedstatistics.go
similarity index 91%
rename from goformation/cloudformation/databrew/aws-databrew-job_allowedstatistics.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-job_allowedstatistics.go
index d24ca6ced0..d6fcf5a3de 100644
--- a/goformation/cloudformation/databrew/aws-databrew-job_allowedstatistics.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-job_allowedstatistics.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Job_AllowedStatistics AWS CloudFormation Resource (AWS::DataBrew::Job.AllowedStatistics)
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_columnselector.go b/pkg/goformation/cloudformation/databrew/aws-databrew-job_columnselector.go
similarity index 92%
rename from goformation/cloudformation/databrew/aws-databrew-job_columnselector.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-job_columnselector.go
index a0ef20f31b..1fae3bc1d4 100644
--- a/goformation/cloudformation/databrew/aws-databrew-job_columnselector.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-job_columnselector.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Job_ColumnSelector AWS CloudFormation Resource (AWS::DataBrew::Job.ColumnSelector)
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_columnstatisticsconfiguration.go b/pkg/goformation/cloudformation/databrew/aws-databrew-job_columnstatisticsconfiguration.go
similarity index 96%
rename from goformation/cloudformation/databrew/aws-databrew-job_columnstatisticsconfiguration.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-job_columnstatisticsconfiguration.go
index ce88ebbfa4..bcd1f9261b 100644
--- a/goformation/cloudformation/databrew/aws-databrew-job_columnstatisticsconfiguration.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-job_columnstatisticsconfiguration.go
@@ -1,7 +1,7 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Job_ColumnStatisticsConfiguration AWS CloudFormation Resource (AWS::DataBrew::Job.ColumnStatisticsConfiguration)
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_csvoutputoptions.go b/pkg/goformation/cloudformation/databrew/aws-databrew-job_csvoutputoptions.go
similarity index 91%
rename from goformation/cloudformation/databrew/aws-databrew-job_csvoutputoptions.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-job_csvoutputoptions.go
index 0bb9091b98..dcee83a550 100644
--- a/goformation/cloudformation/databrew/aws-databrew-job_csvoutputoptions.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-job_csvoutputoptions.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Job_CsvOutputOptions AWS CloudFormation Resource (AWS::DataBrew::Job.CsvOutputOptions)
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_databaseoutput.go b/pkg/goformation/cloudformation/databrew/aws-databrew-job_databaseoutput.go
similarity index 93%
rename from goformation/cloudformation/databrew/aws-databrew-job_databaseoutput.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-job_databaseoutput.go
index 001ecc0c43..92e7e2800a 100644
--- a/goformation/cloudformation/databrew/aws-databrew-job_databaseoutput.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-job_databaseoutput.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Job_DatabaseOutput AWS CloudFormation Resource (AWS::DataBrew::Job.DatabaseOutput)
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_databasetableoutputoptions.go b/pkg/goformation/cloudformation/databrew/aws-databrew-job_databasetableoutputoptions.go
similarity index 93%
rename from goformation/cloudformation/databrew/aws-databrew-job_databasetableoutputoptions.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-job_databasetableoutputoptions.go
index 2789a8cc10..c1d65d5df4 100644
--- a/goformation/cloudformation/databrew/aws-databrew-job_databasetableoutputoptions.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-job_databasetableoutputoptions.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Job_DatabaseTableOutputOptions AWS CloudFormation Resource (AWS::DataBrew::Job.DatabaseTableOutputOptions)
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_datacatalogoutput.go b/pkg/goformation/cloudformation/databrew/aws-databrew-job_datacatalogoutput.go
similarity index 95%
rename from goformation/cloudformation/databrew/aws-databrew-job_datacatalogoutput.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-job_datacatalogoutput.go
index 4671c77343..238f3036b0 100644
--- a/goformation/cloudformation/databrew/aws-databrew-job_datacatalogoutput.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-job_datacatalogoutput.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Job_DataCatalogOutput AWS CloudFormation Resource (AWS::DataBrew::Job.DataCatalogOutput)
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_entitydetectorconfiguration.go b/pkg/goformation/cloudformation/databrew/aws-databrew-job_entitydetectorconfiguration.go
similarity index 93%
rename from goformation/cloudformation/databrew/aws-databrew-job_entitydetectorconfiguration.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-job_entitydetectorconfiguration.go
index 606b33ecce..48f0fc5b7f 100644
--- a/goformation/cloudformation/databrew/aws-databrew-job_entitydetectorconfiguration.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-job_entitydetectorconfiguration.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Job_EntityDetectorConfiguration AWS CloudFormation Resource (AWS::DataBrew::Job.EntityDetectorConfiguration)
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_jobsample.go b/pkg/goformation/cloudformation/databrew/aws-databrew-job_jobsample.go
similarity index 92%
rename from goformation/cloudformation/databrew/aws-databrew-job_jobsample.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-job_jobsample.go
index 1d0038c357..85eb7cecf1 100644
--- a/goformation/cloudformation/databrew/aws-databrew-job_jobsample.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-job_jobsample.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Job_JobSample AWS CloudFormation Resource (AWS::DataBrew::Job.JobSample)
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_output.go b/pkg/goformation/cloudformation/databrew/aws-databrew-job_output.go
similarity index 95%
rename from goformation/cloudformation/databrew/aws-databrew-job_output.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-job_output.go
index ea8c6996d8..37752dab79 100644
--- a/goformation/cloudformation/databrew/aws-databrew-job_output.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-job_output.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Job_Output AWS CloudFormation Resource (AWS::DataBrew::Job.Output)
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_outputformatoptions.go b/pkg/goformation/cloudformation/databrew/aws-databrew-job_outputformatoptions.go
similarity index 95%
rename from goformation/cloudformation/databrew/aws-databrew-job_outputformatoptions.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-job_outputformatoptions.go
index b124d4d842..d88d519167 100644
--- a/goformation/cloudformation/databrew/aws-databrew-job_outputformatoptions.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-job_outputformatoptions.go
@@ -1,7 +1,7 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Job_OutputFormatOptions AWS CloudFormation Resource (AWS::DataBrew::Job.OutputFormatOptions)
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_outputlocation.go b/pkg/goformation/cloudformation/databrew/aws-databrew-job_outputlocation.go
similarity index 92%
rename from goformation/cloudformation/databrew/aws-databrew-job_outputlocation.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-job_outputlocation.go
index b00ac670eb..32379cc6e0 100644
--- a/goformation/cloudformation/databrew/aws-databrew-job_outputlocation.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-job_outputlocation.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Job_OutputLocation AWS CloudFormation Resource (AWS::DataBrew::Job.OutputLocation)
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_parametermap.go b/pkg/goformation/cloudformation/databrew/aws-databrew-job_parametermap.go
similarity index 94%
rename from goformation/cloudformation/databrew/aws-databrew-job_parametermap.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-job_parametermap.go
index 0bc17e0e94..5104c6fb38 100644
--- a/goformation/cloudformation/databrew/aws-databrew-job_parametermap.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-job_parametermap.go
@@ -1,7 +1,7 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Job_ParameterMap AWS CloudFormation Resource (AWS::DataBrew::Job.ParameterMap)
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_profileconfiguration.go b/pkg/goformation/cloudformation/databrew/aws-databrew-job_profileconfiguration.go
similarity index 97%
rename from goformation/cloudformation/databrew/aws-databrew-job_profileconfiguration.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-job_profileconfiguration.go
index 5bc44bb1eb..e9596959cf 100644
--- a/goformation/cloudformation/databrew/aws-databrew-job_profileconfiguration.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-job_profileconfiguration.go
@@ -1,7 +1,7 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Job_ProfileConfiguration AWS CloudFormation Resource (AWS::DataBrew::Job.ProfileConfiguration)
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_recipe.go b/pkg/goformation/cloudformation/databrew/aws-databrew-job_recipe.go
similarity index 92%
rename from goformation/cloudformation/databrew/aws-databrew-job_recipe.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-job_recipe.go
index cd4a4e747a..f25fe8991d 100644
--- a/goformation/cloudformation/databrew/aws-databrew-job_recipe.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-job_recipe.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Job_Recipe AWS CloudFormation Resource (AWS::DataBrew::Job.Recipe)
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_s3location.go b/pkg/goformation/cloudformation/databrew/aws-databrew-job_s3location.go
similarity index 92%
rename from goformation/cloudformation/databrew/aws-databrew-job_s3location.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-job_s3location.go
index ff72ebecc6..534eec728f 100644
--- a/goformation/cloudformation/databrew/aws-databrew-job_s3location.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-job_s3location.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Job_S3Location AWS CloudFormation Resource (AWS::DataBrew::Job.S3Location)
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_s3tableoutputoptions.go b/pkg/goformation/cloudformation/databrew/aws-databrew-job_s3tableoutputoptions.go
similarity index 95%
rename from goformation/cloudformation/databrew/aws-databrew-job_s3tableoutputoptions.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-job_s3tableoutputoptions.go
index ef8c9f4491..c66eccfaba 100644
--- a/goformation/cloudformation/databrew/aws-databrew-job_s3tableoutputoptions.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-job_s3tableoutputoptions.go
@@ -1,7 +1,7 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Job_S3TableOutputOptions AWS CloudFormation Resource (AWS::DataBrew::Job.S3TableOutputOptions)
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_statisticoverride.go b/pkg/goformation/cloudformation/databrew/aws-databrew-job_statisticoverride.go
similarity index 92%
rename from goformation/cloudformation/databrew/aws-databrew-job_statisticoverride.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-job_statisticoverride.go
index 8f6a96b32a..a45adaf18e 100644
--- a/goformation/cloudformation/databrew/aws-databrew-job_statisticoverride.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-job_statisticoverride.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Job_StatisticOverride AWS CloudFormation Resource (AWS::DataBrew::Job.StatisticOverride)
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_statisticsconfiguration.go b/pkg/goformation/cloudformation/databrew/aws-databrew-job_statisticsconfiguration.go
similarity index 93%
rename from goformation/cloudformation/databrew/aws-databrew-job_statisticsconfiguration.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-job_statisticsconfiguration.go
index b292341b12..a20f7b51ed 100644
--- a/goformation/cloudformation/databrew/aws-databrew-job_statisticsconfiguration.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-job_statisticsconfiguration.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Job_StatisticsConfiguration AWS CloudFormation Resource (AWS::DataBrew::Job.StatisticsConfiguration)
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_validationconfiguration.go b/pkg/goformation/cloudformation/databrew/aws-databrew-job_validationconfiguration.go
similarity index 93%
rename from goformation/cloudformation/databrew/aws-databrew-job_validationconfiguration.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-job_validationconfiguration.go
index 8971588281..0ec006d72d 100644
--- a/goformation/cloudformation/databrew/aws-databrew-job_validationconfiguration.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-job_validationconfiguration.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Job_ValidationConfiguration AWS CloudFormation Resource (AWS::DataBrew::Job.ValidationConfiguration)
diff --git a/goformation/cloudformation/databrew/aws-databrew-project.go b/pkg/goformation/cloudformation/databrew/aws-databrew-project.go
similarity index 95%
rename from goformation/cloudformation/databrew/aws-databrew-project.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-project.go
index 2fb52345ca..ef9216d890 100644
--- a/goformation/cloudformation/databrew/aws-databrew-project.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-project.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project AWS CloudFormation Resource (AWS::DataBrew::Project)
diff --git a/goformation/cloudformation/databrew/aws-databrew-project_sample.go b/pkg/goformation/cloudformation/databrew/aws-databrew-project_sample.go
similarity index 92%
rename from goformation/cloudformation/databrew/aws-databrew-project_sample.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-project_sample.go
index 2c280c387d..8a7b199e5b 100644
--- a/goformation/cloudformation/databrew/aws-databrew-project_sample.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-project_sample.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project_Sample AWS CloudFormation Resource (AWS::DataBrew::Project.Sample)
diff --git a/goformation/cloudformation/databrew/aws-databrew-recipe.go b/pkg/goformation/cloudformation/databrew/aws-databrew-recipe.go
similarity index 95%
rename from goformation/cloudformation/databrew/aws-databrew-recipe.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-recipe.go
index e8b557e2ed..7767418b26 100644
--- a/goformation/cloudformation/databrew/aws-databrew-recipe.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-recipe.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Recipe AWS CloudFormation Resource (AWS::DataBrew::Recipe)
diff --git a/goformation/cloudformation/databrew/aws-databrew-recipe_action.go b/pkg/goformation/cloudformation/databrew/aws-databrew-recipe_action.go
similarity index 92%
rename from goformation/cloudformation/databrew/aws-databrew-recipe_action.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-recipe_action.go
index ac2b9b685c..51a76b817f 100644
--- a/goformation/cloudformation/databrew/aws-databrew-recipe_action.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-recipe_action.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Recipe_Action AWS CloudFormation Resource (AWS::DataBrew::Recipe.Action)
diff --git a/goformation/cloudformation/databrew/aws-databrew-recipe_conditionexpression.go b/pkg/goformation/cloudformation/databrew/aws-databrew-recipe_conditionexpression.go
similarity index 93%
rename from goformation/cloudformation/databrew/aws-databrew-recipe_conditionexpression.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-recipe_conditionexpression.go
index fcdfef3617..af0eec4827 100644
--- a/goformation/cloudformation/databrew/aws-databrew-recipe_conditionexpression.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-recipe_conditionexpression.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Recipe_ConditionExpression AWS CloudFormation Resource (AWS::DataBrew::Recipe.ConditionExpression)
diff --git a/goformation/cloudformation/databrew/aws-databrew-recipe_datacataloginputdefinition.go b/pkg/goformation/cloudformation/databrew/aws-databrew-recipe_datacataloginputdefinition.go
similarity index 94%
rename from goformation/cloudformation/databrew/aws-databrew-recipe_datacataloginputdefinition.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-recipe_datacataloginputdefinition.go
index 4493a3bbdd..2c015db798 100644
--- a/goformation/cloudformation/databrew/aws-databrew-recipe_datacataloginputdefinition.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-recipe_datacataloginputdefinition.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Recipe_DataCatalogInputDefinition AWS CloudFormation Resource (AWS::DataBrew::Recipe.DataCatalogInputDefinition)
diff --git a/goformation/cloudformation/databrew/aws-databrew-recipe_parametermap.go b/pkg/goformation/cloudformation/databrew/aws-databrew-recipe_parametermap.go
similarity index 94%
rename from goformation/cloudformation/databrew/aws-databrew-recipe_parametermap.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-recipe_parametermap.go
index 6c9584dc43..f9ef7466d9 100644
--- a/goformation/cloudformation/databrew/aws-databrew-recipe_parametermap.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-recipe_parametermap.go
@@ -1,7 +1,7 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Recipe_ParameterMap AWS CloudFormation Resource (AWS::DataBrew::Recipe.ParameterMap)
diff --git a/goformation/cloudformation/databrew/aws-databrew-recipe_recipeparameters.go b/pkg/goformation/cloudformation/databrew/aws-databrew-recipe_recipeparameters.go
similarity index 99%
rename from goformation/cloudformation/databrew/aws-databrew-recipe_recipeparameters.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-recipe_recipeparameters.go
index e858cc33c5..abff25ee3d 100644
--- a/goformation/cloudformation/databrew/aws-databrew-recipe_recipeparameters.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-recipe_recipeparameters.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Recipe_RecipeParameters AWS CloudFormation Resource (AWS::DataBrew::Recipe.RecipeParameters)
diff --git a/goformation/cloudformation/databrew/aws-databrew-recipe_recipestep.go b/pkg/goformation/cloudformation/databrew/aws-databrew-recipe_recipestep.go
similarity index 96%
rename from goformation/cloudformation/databrew/aws-databrew-recipe_recipestep.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-recipe_recipestep.go
index 7d5aa1bc8c..f0f16e0324 100644
--- a/goformation/cloudformation/databrew/aws-databrew-recipe_recipestep.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-recipe_recipestep.go
@@ -1,7 +1,7 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Recipe_RecipeStep AWS CloudFormation Resource (AWS::DataBrew::Recipe.RecipeStep)
diff --git a/goformation/cloudformation/databrew/aws-databrew-recipe_s3location.go b/pkg/goformation/cloudformation/databrew/aws-databrew-recipe_s3location.go
similarity index 92%
rename from goformation/cloudformation/databrew/aws-databrew-recipe_s3location.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-recipe_s3location.go
index 1741f8d605..9b2a658357 100644
--- a/goformation/cloudformation/databrew/aws-databrew-recipe_s3location.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-recipe_s3location.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Recipe_S3Location AWS CloudFormation Resource (AWS::DataBrew::Recipe.S3Location)
diff --git a/goformation/cloudformation/databrew/aws-databrew-recipe_secondaryinput.go b/pkg/goformation/cloudformation/databrew/aws-databrew-recipe_secondaryinput.go
similarity index 96%
rename from goformation/cloudformation/databrew/aws-databrew-recipe_secondaryinput.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-recipe_secondaryinput.go
index 58fdae629c..0b0c8977cf 100644
--- a/goformation/cloudformation/databrew/aws-databrew-recipe_secondaryinput.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-recipe_secondaryinput.go
@@ -1,7 +1,7 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Recipe_SecondaryInput AWS CloudFormation Resource (AWS::DataBrew::Recipe.SecondaryInput)
diff --git a/goformation/cloudformation/databrew/aws-databrew-ruleset.go b/pkg/goformation/cloudformation/databrew/aws-databrew-ruleset.go
similarity index 95%
rename from goformation/cloudformation/databrew/aws-databrew-ruleset.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-ruleset.go
index 5879a716b5..fa686c6cdd 100644
--- a/goformation/cloudformation/databrew/aws-databrew-ruleset.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-ruleset.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Ruleset AWS CloudFormation Resource (AWS::DataBrew::Ruleset)
diff --git a/goformation/cloudformation/databrew/aws-databrew-ruleset_columnselector.go b/pkg/goformation/cloudformation/databrew/aws-databrew-ruleset_columnselector.go
similarity index 92%
rename from goformation/cloudformation/databrew/aws-databrew-ruleset_columnselector.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-ruleset_columnselector.go
index c84d99f0f9..8b52e4ee5d 100644
--- a/goformation/cloudformation/databrew/aws-databrew-ruleset_columnselector.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-ruleset_columnselector.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Ruleset_ColumnSelector AWS CloudFormation Resource (AWS::DataBrew::Ruleset.ColumnSelector)
diff --git a/goformation/cloudformation/databrew/aws-databrew-ruleset_rule.go b/pkg/goformation/cloudformation/databrew/aws-databrew-ruleset_rule.go
similarity index 95%
rename from goformation/cloudformation/databrew/aws-databrew-ruleset_rule.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-ruleset_rule.go
index 0870caa934..60f60af9de 100644
--- a/goformation/cloudformation/databrew/aws-databrew-ruleset_rule.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-ruleset_rule.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Ruleset_Rule AWS CloudFormation Resource (AWS::DataBrew::Ruleset.Rule)
diff --git a/goformation/cloudformation/databrew/aws-databrew-ruleset_substitutionvalue.go b/pkg/goformation/cloudformation/databrew/aws-databrew-ruleset_substitutionvalue.go
similarity index 92%
rename from goformation/cloudformation/databrew/aws-databrew-ruleset_substitutionvalue.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-ruleset_substitutionvalue.go
index 05ece1f73d..30d6736190 100644
--- a/goformation/cloudformation/databrew/aws-databrew-ruleset_substitutionvalue.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-ruleset_substitutionvalue.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Ruleset_SubstitutionValue AWS CloudFormation Resource (AWS::DataBrew::Ruleset.SubstitutionValue)
diff --git a/goformation/cloudformation/databrew/aws-databrew-ruleset_threshold.go b/pkg/goformation/cloudformation/databrew/aws-databrew-ruleset_threshold.go
similarity index 93%
rename from goformation/cloudformation/databrew/aws-databrew-ruleset_threshold.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-ruleset_threshold.go
index 26bc2423d9..e9e1d70421 100644
--- a/goformation/cloudformation/databrew/aws-databrew-ruleset_threshold.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-ruleset_threshold.go
@@ -1,9 +1,9 @@
 package databrew
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Ruleset_Threshold AWS CloudFormation Resource (AWS::DataBrew::Ruleset.Threshold)
diff --git a/goformation/cloudformation/databrew/aws-databrew-schedule.go b/pkg/goformation/cloudformation/databrew/aws-databrew-schedule.go
similarity index 95%
rename from goformation/cloudformation/databrew/aws-databrew-schedule.go
rename to pkg/goformation/cloudformation/databrew/aws-databrew-schedule.go
index 663c835bc9..2e46fee138 100644
--- a/goformation/cloudformation/databrew/aws-databrew-schedule.go
+++ b/pkg/goformation/cloudformation/databrew/aws-databrew-schedule.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Schedule AWS CloudFormation Resource (AWS::DataBrew::Schedule)
diff --git a/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline.go b/pkg/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline.go
similarity index 97%
rename from goformation/cloudformation/datapipeline/aws-datapipeline-pipeline.go
rename to pkg/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline.go
index bb3aacb757..13656cf761 100644
--- a/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline.go
+++ b/pkg/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Pipeline AWS CloudFormation Resource (AWS::DataPipeline::Pipeline)
diff --git a/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_field.go b/pkg/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_field.go
similarity index 93%
rename from goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_field.go
rename to pkg/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_field.go
index 6c10c1c9b9..3a29a4fcb5 100644
--- a/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_field.go
+++ b/pkg/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_field.go
@@ -1,9 +1,9 @@
 package datapipeline
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Pipeline_Field AWS CloudFormation Resource (AWS::DataPipeline::Pipeline.Field)
diff --git a/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_parameterattribute.go b/pkg/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_parameterattribute.go
similarity index 93%
rename from goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_parameterattribute.go
rename to pkg/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_parameterattribute.go
index 9292803a3c..cc64bda3c3 100644
--- a/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_parameterattribute.go
+++ b/pkg/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_parameterattribute.go
@@ -1,9 +1,9 @@
 package datapipeline
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Pipeline_ParameterAttribute AWS CloudFormation Resource (AWS::DataPipeline::Pipeline.ParameterAttribute)
diff --git a/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_parameterobject.go b/pkg/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_parameterobject.go
similarity index 93%
rename from goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_parameterobject.go
rename to pkg/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_parameterobject.go
index 74972f52d6..535ce99f67 100644
--- a/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_parameterobject.go
+++ b/pkg/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_parameterobject.go
@@ -1,9 +1,9 @@
 package datapipeline
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Pipeline_ParameterObject AWS CloudFormation Resource (AWS::DataPipeline::Pipeline.ParameterObject)
diff --git a/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_parametervalue.go b/pkg/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_parametervalue.go
similarity index 92%
rename from goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_parametervalue.go
rename to pkg/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_parametervalue.go
index 203831d0f5..79e8650210 100644
--- a/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_parametervalue.go
+++ b/pkg/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_parametervalue.go
@@ -1,9 +1,9 @@
 package datapipeline
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Pipeline_ParameterValue AWS CloudFormation Resource (AWS::DataPipeline::Pipeline.ParameterValue)
diff --git a/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_pipelineobject.go b/pkg/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_pipelineobject.go
similarity index 93%
rename from goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_pipelineobject.go
rename to pkg/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_pipelineobject.go
index 11c9f1310f..453f25cea5 100644
--- a/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_pipelineobject.go
+++ b/pkg/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_pipelineobject.go
@@ -1,9 +1,9 @@
 package datapipeline
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Pipeline_PipelineObject AWS CloudFormation Resource (AWS::DataPipeline::Pipeline.PipelineObject)
diff --git a/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_pipelinetag.go b/pkg/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_pipelinetag.go
similarity index 92%
rename from goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_pipelinetag.go
rename to pkg/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_pipelinetag.go
index 07f033c572..8d733d7a36 100644
--- a/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_pipelinetag.go
+++ b/pkg/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_pipelinetag.go
@@ -1,9 +1,9 @@
 package datapipeline
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Pipeline_PipelineTag AWS CloudFormation Resource (AWS::DataPipeline::Pipeline.PipelineTag)
diff --git a/goformation/cloudformation/datasync/aws-datasync-agent.go b/pkg/goformation/cloudformation/datasync/aws-datasync-agent.go
similarity index 95%
rename from goformation/cloudformation/datasync/aws-datasync-agent.go
rename to pkg/goformation/cloudformation/datasync/aws-datasync-agent.go
index 0c9d5ab607..b9aaba2959 100644
--- a/goformation/cloudformation/datasync/aws-datasync-agent.go
+++ b/pkg/goformation/cloudformation/datasync/aws-datasync-agent.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Agent AWS CloudFormation Resource (AWS::DataSync::Agent)
diff --git a/goformation/cloudformation/datasync/aws-datasync-locationefs.go b/pkg/goformation/cloudformation/datasync/aws-datasync-locationefs.go
similarity index 95%
rename from goformation/cloudformation/datasync/aws-datasync-locationefs.go
rename to pkg/goformation/cloudformation/datasync/aws-datasync-locationefs.go
index a5c548da97..4d1181edfd 100644
--- a/goformation/cloudformation/datasync/aws-datasync-locationefs.go
+++ b/pkg/goformation/cloudformation/datasync/aws-datasync-locationefs.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LocationEFS AWS CloudFormation Resource (AWS::DataSync::LocationEFS)
diff --git a/goformation/cloudformation/datasync/aws-datasync-locationefs_ec2config.go b/pkg/goformation/cloudformation/datasync/aws-datasync-locationefs_ec2config.go
similarity index 92%
rename from goformation/cloudformation/datasync/aws-datasync-locationefs_ec2config.go
rename to pkg/goformation/cloudformation/datasync/aws-datasync-locationefs_ec2config.go
index 5001246464..0bafe954d9 100644
--- a/goformation/cloudformation/datasync/aws-datasync-locationefs_ec2config.go
+++ b/pkg/goformation/cloudformation/datasync/aws-datasync-locationefs_ec2config.go
@@ -1,9 +1,9 @@
 package datasync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LocationEFS_Ec2Config AWS CloudFormation Resource (AWS::DataSync::LocationEFS.Ec2Config)
diff --git a/goformation/cloudformation/datasync/aws-datasync-locationfsxwindows.go b/pkg/goformation/cloudformation/datasync/aws-datasync-locationfsxwindows.go
similarity index 96%
rename from goformation/cloudformation/datasync/aws-datasync-locationfsxwindows.go
rename to pkg/goformation/cloudformation/datasync/aws-datasync-locationfsxwindows.go
index 07ef9a5b89..ca075a0de2 100644
--- a/goformation/cloudformation/datasync/aws-datasync-locationfsxwindows.go
+++ b/pkg/goformation/cloudformation/datasync/aws-datasync-locationfsxwindows.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LocationFSxWindows AWS CloudFormation Resource (AWS::DataSync::LocationFSxWindows)
diff --git a/goformation/cloudformation/datasync/aws-datasync-locationhdfs.go b/pkg/goformation/cloudformation/datasync/aws-datasync-locationhdfs.go
similarity index 97%
rename from goformation/cloudformation/datasync/aws-datasync-locationhdfs.go
rename to pkg/goformation/cloudformation/datasync/aws-datasync-locationhdfs.go
index 3d1a1dbe12..caaf2cfcf2 100644
--- a/goformation/cloudformation/datasync/aws-datasync-locationhdfs.go
+++ b/pkg/goformation/cloudformation/datasync/aws-datasync-locationhdfs.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LocationHDFS AWS CloudFormation Resource (AWS::DataSync::LocationHDFS)
diff --git a/goformation/cloudformation/datasync/aws-datasync-locationhdfs_namenode.go b/pkg/goformation/cloudformation/datasync/aws-datasync-locationhdfs_namenode.go
similarity index 92%
rename from goformation/cloudformation/datasync/aws-datasync-locationhdfs_namenode.go
rename to pkg/goformation/cloudformation/datasync/aws-datasync-locationhdfs_namenode.go
index bda0c67858..46a2a9a2e4 100644
--- a/goformation/cloudformation/datasync/aws-datasync-locationhdfs_namenode.go
+++ b/pkg/goformation/cloudformation/datasync/aws-datasync-locationhdfs_namenode.go
@@ -1,9 +1,9 @@
 package datasync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LocationHDFS_NameNode AWS CloudFormation Resource (AWS::DataSync::LocationHDFS.NameNode)
diff --git a/goformation/cloudformation/datasync/aws-datasync-locationhdfs_qopconfiguration.go b/pkg/goformation/cloudformation/datasync/aws-datasync-locationhdfs_qopconfiguration.go
similarity index 93%
rename from goformation/cloudformation/datasync/aws-datasync-locationhdfs_qopconfiguration.go
rename to pkg/goformation/cloudformation/datasync/aws-datasync-locationhdfs_qopconfiguration.go
index a5a1c57242..c059642064 100644
--- a/goformation/cloudformation/datasync/aws-datasync-locationhdfs_qopconfiguration.go
+++ b/pkg/goformation/cloudformation/datasync/aws-datasync-locationhdfs_qopconfiguration.go
@@ -1,9 +1,9 @@
 package datasync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LocationHDFS_QopConfiguration AWS CloudFormation Resource (AWS::DataSync::LocationHDFS.QopConfiguration)
diff --git a/goformation/cloudformation/datasync/aws-datasync-locationnfs.go b/pkg/goformation/cloudformation/datasync/aws-datasync-locationnfs.go
similarity index 95%
rename from goformation/cloudformation/datasync/aws-datasync-locationnfs.go
rename to pkg/goformation/cloudformation/datasync/aws-datasync-locationnfs.go
index 920b775385..3aafa56e02 100644
--- a/goformation/cloudformation/datasync/aws-datasync-locationnfs.go
+++ b/pkg/goformation/cloudformation/datasync/aws-datasync-locationnfs.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LocationNFS AWS CloudFormation Resource (AWS::DataSync::LocationNFS)
diff --git a/goformation/cloudformation/datasync/aws-datasync-locationnfs_mountoptions.go b/pkg/goformation/cloudformation/datasync/aws-datasync-locationnfs_mountoptions.go
similarity index 91%
rename from goformation/cloudformation/datasync/aws-datasync-locationnfs_mountoptions.go
rename to pkg/goformation/cloudformation/datasync/aws-datasync-locationnfs_mountoptions.go
index f4dbbd1e07..6b5e1adc7b 100644
--- a/goformation/cloudformation/datasync/aws-datasync-locationnfs_mountoptions.go
+++ b/pkg/goformation/cloudformation/datasync/aws-datasync-locationnfs_mountoptions.go
@@ -1,9 +1,9 @@
 package datasync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LocationNFS_MountOptions AWS CloudFormation Resource (AWS::DataSync::LocationNFS.MountOptions)
diff --git a/goformation/cloudformation/datasync/aws-datasync-locationnfs_onpremconfig.go b/pkg/goformation/cloudformation/datasync/aws-datasync-locationnfs_onpremconfig.go
similarity index 91%
rename from goformation/cloudformation/datasync/aws-datasync-locationnfs_onpremconfig.go
rename to pkg/goformation/cloudformation/datasync/aws-datasync-locationnfs_onpremconfig.go
index 8ead2fc85a..0b60290bb4 100644
--- a/goformation/cloudformation/datasync/aws-datasync-locationnfs_onpremconfig.go
+++ b/pkg/goformation/cloudformation/datasync/aws-datasync-locationnfs_onpremconfig.go
@@ -1,9 +1,9 @@
 package datasync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LocationNFS_OnPremConfig AWS CloudFormation Resource (AWS::DataSync::LocationNFS.OnPremConfig)
diff --git a/goformation/cloudformation/datasync/aws-datasync-locationobjectstorage.go b/pkg/goformation/cloudformation/datasync/aws-datasync-locationobjectstorage.go
similarity index 96%
rename from goformation/cloudformation/datasync/aws-datasync-locationobjectstorage.go
rename to pkg/goformation/cloudformation/datasync/aws-datasync-locationobjectstorage.go
index e7220443a5..a4281d5ec9 100644
--- a/goformation/cloudformation/datasync/aws-datasync-locationobjectstorage.go
+++ b/pkg/goformation/cloudformation/datasync/aws-datasync-locationobjectstorage.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LocationObjectStorage AWS CloudFormation Resource (AWS::DataSync::LocationObjectStorage)
diff --git a/goformation/cloudformation/datasync/aws-datasync-locations3.go b/pkg/goformation/cloudformation/datasync/aws-datasync-locations3.go
similarity index 95%
rename from goformation/cloudformation/datasync/aws-datasync-locations3.go
rename to pkg/goformation/cloudformation/datasync/aws-datasync-locations3.go
index 1cb75642cd..25b0f9d621 100644
--- a/goformation/cloudformation/datasync/aws-datasync-locations3.go
+++ b/pkg/goformation/cloudformation/datasync/aws-datasync-locations3.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LocationS3 AWS CloudFormation Resource (AWS::DataSync::LocationS3)
diff --git a/goformation/cloudformation/datasync/aws-datasync-locations3_s3config.go b/pkg/goformation/cloudformation/datasync/aws-datasync-locations3_s3config.go
similarity index 91%
rename from goformation/cloudformation/datasync/aws-datasync-locations3_s3config.go
rename to pkg/goformation/cloudformation/datasync/aws-datasync-locations3_s3config.go
index 32ee168e8a..c1cb876501 100644
--- a/goformation/cloudformation/datasync/aws-datasync-locations3_s3config.go
+++ b/pkg/goformation/cloudformation/datasync/aws-datasync-locations3_s3config.go
@@ -1,9 +1,9 @@
 package datasync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LocationS3_S3Config AWS CloudFormation Resource (AWS::DataSync::LocationS3.S3Config)
diff --git a/goformation/cloudformation/datasync/aws-datasync-locationsmb.go b/pkg/goformation/cloudformation/datasync/aws-datasync-locationsmb.go
similarity index 96%
rename from goformation/cloudformation/datasync/aws-datasync-locationsmb.go
rename to pkg/goformation/cloudformation/datasync/aws-datasync-locationsmb.go
index d61661f745..5c18896cb7 100644
--- a/goformation/cloudformation/datasync/aws-datasync-locationsmb.go
+++ b/pkg/goformation/cloudformation/datasync/aws-datasync-locationsmb.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LocationSMB AWS CloudFormation Resource (AWS::DataSync::LocationSMB)
diff --git a/goformation/cloudformation/datasync/aws-datasync-locationsmb_mountoptions.go b/pkg/goformation/cloudformation/datasync/aws-datasync-locationsmb_mountoptions.go
similarity index 91%
rename from goformation/cloudformation/datasync/aws-datasync-locationsmb_mountoptions.go
rename to pkg/goformation/cloudformation/datasync/aws-datasync-locationsmb_mountoptions.go
index 97d916b2ce..3ddc9b4078 100644
--- a/goformation/cloudformation/datasync/aws-datasync-locationsmb_mountoptions.go
+++ b/pkg/goformation/cloudformation/datasync/aws-datasync-locationsmb_mountoptions.go
@@ -1,9 +1,9 @@
 package datasync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LocationSMB_MountOptions AWS CloudFormation Resource (AWS::DataSync::LocationSMB.MountOptions)
diff --git a/goformation/cloudformation/datasync/aws-datasync-task.go b/pkg/goformation/cloudformation/datasync/aws-datasync-task.go
similarity index 96%
rename from goformation/cloudformation/datasync/aws-datasync-task.go
rename to pkg/goformation/cloudformation/datasync/aws-datasync-task.go
index 344439ecea..99ca34689f 100644
--- a/goformation/cloudformation/datasync/aws-datasync-task.go
+++ b/pkg/goformation/cloudformation/datasync/aws-datasync-task.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Task AWS CloudFormation Resource (AWS::DataSync::Task)
diff --git a/goformation/cloudformation/datasync/aws-datasync-task_filterrule.go b/pkg/goformation/cloudformation/datasync/aws-datasync-task_filterrule.go
similarity index 92%
rename from goformation/cloudformation/datasync/aws-datasync-task_filterrule.go
rename to pkg/goformation/cloudformation/datasync/aws-datasync-task_filterrule.go
index d586d73a23..2b96a4d7c6 100644
--- a/goformation/cloudformation/datasync/aws-datasync-task_filterrule.go
+++ b/pkg/goformation/cloudformation/datasync/aws-datasync-task_filterrule.go
@@ -1,9 +1,9 @@
 package datasync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Task_FilterRule AWS CloudFormation Resource (AWS::DataSync::Task.FilterRule)
diff --git a/goformation/cloudformation/datasync/aws-datasync-task_options.go b/pkg/goformation/cloudformation/datasync/aws-datasync-task_options.go
similarity index 97%
rename from goformation/cloudformation/datasync/aws-datasync-task_options.go
rename to pkg/goformation/cloudformation/datasync/aws-datasync-task_options.go
index 9de06a692c..f542cb62f6 100644
--- a/goformation/cloudformation/datasync/aws-datasync-task_options.go
+++ b/pkg/goformation/cloudformation/datasync/aws-datasync-task_options.go
@@ -1,9 +1,9 @@
 package datasync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Task_Options AWS CloudFormation Resource (AWS::DataSync::Task.Options)
diff --git a/goformation/cloudformation/datasync/aws-datasync-task_taskschedule.go b/pkg/goformation/cloudformation/datasync/aws-datasync-task_taskschedule.go
similarity index 91%
rename from goformation/cloudformation/datasync/aws-datasync-task_taskschedule.go
rename to pkg/goformation/cloudformation/datasync/aws-datasync-task_taskschedule.go
index c1039a49e7..5992c04c4e 100644
--- a/goformation/cloudformation/datasync/aws-datasync-task_taskschedule.go
+++ b/pkg/goformation/cloudformation/datasync/aws-datasync-task_taskschedule.go
@@ -1,9 +1,9 @@
 package datasync
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Task_TaskSchedule AWS CloudFormation Resource (AWS::DataSync::Task.TaskSchedule)
diff --git a/goformation/cloudformation/dax/aws-dax-cluster.go b/pkg/goformation/cloudformation/dax/aws-dax-cluster.go
similarity index 98%
rename from goformation/cloudformation/dax/aws-dax-cluster.go
rename to pkg/goformation/cloudformation/dax/aws-dax-cluster.go
index 2d8bd01e68..063fbeef9b 100644
--- a/goformation/cloudformation/dax/aws-dax-cluster.go
+++ b/pkg/goformation/cloudformation/dax/aws-dax-cluster.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster AWS CloudFormation Resource (AWS::DAX::Cluster)
diff --git a/goformation/cloudformation/dax/aws-dax-cluster_ssespecification.go b/pkg/goformation/cloudformation/dax/aws-dax-cluster_ssespecification.go
similarity index 91%
rename from goformation/cloudformation/dax/aws-dax-cluster_ssespecification.go
rename to pkg/goformation/cloudformation/dax/aws-dax-cluster_ssespecification.go
index 19774ad500..5b67fbe2f0 100644
--- a/goformation/cloudformation/dax/aws-dax-cluster_ssespecification.go
+++ b/pkg/goformation/cloudformation/dax/aws-dax-cluster_ssespecification.go
@@ -1,9 +1,9 @@
 package dax
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_SSESpecification AWS CloudFormation Resource (AWS::DAX::Cluster.SSESpecification)
diff --git a/goformation/cloudformation/dax/aws-dax-parametergroup.go b/pkg/goformation/cloudformation/dax/aws-dax-parametergroup.go
similarity index 96%
rename from goformation/cloudformation/dax/aws-dax-parametergroup.go
rename to pkg/goformation/cloudformation/dax/aws-dax-parametergroup.go
index 8a4b572e58..652968d433 100644
--- a/goformation/cloudformation/dax/aws-dax-parametergroup.go
+++ b/pkg/goformation/cloudformation/dax/aws-dax-parametergroup.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ParameterGroup AWS CloudFormation Resource (AWS::DAX::ParameterGroup)
diff --git a/goformation/cloudformation/dax/aws-dax-subnetgroup.go b/pkg/goformation/cloudformation/dax/aws-dax-subnetgroup.go
similarity index 96%
rename from goformation/cloudformation/dax/aws-dax-subnetgroup.go
rename to pkg/goformation/cloudformation/dax/aws-dax-subnetgroup.go
index 59432aed5c..70f7177f83 100644
--- a/goformation/cloudformation/dax/aws-dax-subnetgroup.go
+++ b/pkg/goformation/cloudformation/dax/aws-dax-subnetgroup.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SubnetGroup AWS CloudFormation Resource (AWS::DAX::SubnetGroup)
diff --git a/goformation/cloudformation/detective/aws-detective-graph.go b/pkg/goformation/cloudformation/detective/aws-detective-graph.go
similarity index 96%
rename from goformation/cloudformation/detective/aws-detective-graph.go
rename to pkg/goformation/cloudformation/detective/aws-detective-graph.go
index a534e3bd92..619008b4ec 100644
--- a/goformation/cloudformation/detective/aws-detective-graph.go
+++ b/pkg/goformation/cloudformation/detective/aws-detective-graph.go
@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Graph AWS CloudFormation Resource (AWS::Detective::Graph)
diff --git a/goformation/cloudformation/detective/aws-detective-memberinvitation.go b/pkg/goformation/cloudformation/detective/aws-detective-memberinvitation.go
similarity index 97%
rename from goformation/cloudformation/detective/aws-detective-memberinvitation.go
rename to pkg/goformation/cloudformation/detective/aws-detective-memberinvitation.go
index 661c02b6ba..852a79fbb1 100644
--- a/goformation/cloudformation/detective/aws-detective-memberinvitation.go
+++ b/pkg/goformation/cloudformation/detective/aws-detective-memberinvitation.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MemberInvitation AWS CloudFormation Resource (AWS::Detective::MemberInvitation)
diff --git a/goformation/cloudformation/devopsguru/aws-devopsguru-notificationchannel.go b/pkg/goformation/cloudformation/devopsguru/aws-devopsguru-notificationchannel.go
similarity index 98%
rename from goformation/cloudformation/devopsguru/aws-devopsguru-notificationchannel.go
rename to pkg/goformation/cloudformation/devopsguru/aws-devopsguru-notificationchannel.go
index 00afbe2e61..ef85057a67 100644
--- a/goformation/cloudformation/devopsguru/aws-devopsguru-notificationchannel.go
+++ b/pkg/goformation/cloudformation/devopsguru/aws-devopsguru-notificationchannel.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NotificationChannel AWS CloudFormation Resource (AWS::DevOpsGuru::NotificationChannel)
diff --git a/goformation/cloudformation/devopsguru/aws-devopsguru-notificationchannel_notificationchannelconfig.go b/pkg/goformation/cloudformation/devopsguru/aws-devopsguru-notificationchannel_notificationchannelconfig.go
similarity index 96%
rename from goformation/cloudformation/devopsguru/aws-devopsguru-notificationchannel_notificationchannelconfig.go
rename to pkg/goformation/cloudformation/devopsguru/aws-devopsguru-notificationchannel_notificationchannelconfig.go
index a6a0056ed6..0a0187eac0 100644
--- a/goformation/cloudformation/devopsguru/aws-devopsguru-notificationchannel_notificationchannelconfig.go
+++ b/pkg/goformation/cloudformation/devopsguru/aws-devopsguru-notificationchannel_notificationchannelconfig.go
@@ -1,7 +1,7 @@
 package devopsguru
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NotificationChannel_NotificationChannelConfig AWS CloudFormation Resource (AWS::DevOpsGuru::NotificationChannel.NotificationChannelConfig)
diff --git a/goformation/cloudformation/devopsguru/aws-devopsguru-notificationchannel_snschannelconfig.go b/pkg/goformation/cloudformation/devopsguru/aws-devopsguru-notificationchannel_snschannelconfig.go
similarity index 92%
rename from goformation/cloudformation/devopsguru/aws-devopsguru-notificationchannel_snschannelconfig.go
rename to pkg/goformation/cloudformation/devopsguru/aws-devopsguru-notificationchannel_snschannelconfig.go
index 6f3eacf571..34838d7927 100644
--- a/goformation/cloudformation/devopsguru/aws-devopsguru-notificationchannel_snschannelconfig.go
+++ b/pkg/goformation/cloudformation/devopsguru/aws-devopsguru-notificationchannel_snschannelconfig.go
@@ -1,9 +1,9 @@
 package devopsguru
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NotificationChannel_SnsChannelConfig AWS CloudFormation Resource (AWS::DevOpsGuru::NotificationChannel.SnsChannelConfig)
diff --git a/goformation/cloudformation/devopsguru/aws-devopsguru-resourcecollection.go b/pkg/goformation/cloudformation/devopsguru/aws-devopsguru-resourcecollection.go
similarity index 98%
rename from goformation/cloudformation/devopsguru/aws-devopsguru-resourcecollection.go
rename to pkg/goformation/cloudformation/devopsguru/aws-devopsguru-resourcecollection.go
index 3554f3e866..8679b3c1b0 100644
--- a/goformation/cloudformation/devopsguru/aws-devopsguru-resourcecollection.go
+++ b/pkg/goformation/cloudformation/devopsguru/aws-devopsguru-resourcecollection.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceCollection AWS CloudFormation Resource (AWS::DevOpsGuru::ResourceCollection)
diff --git a/goformation/cloudformation/devopsguru/aws-devopsguru-resourcecollection_cloudformationcollectionfilter.go b/pkg/goformation/cloudformation/devopsguru/aws-devopsguru-resourcecollection_cloudformationcollectionfilter.go
similarity index 92%
rename from goformation/cloudformation/devopsguru/aws-devopsguru-resourcecollection_cloudformationcollectionfilter.go
rename to pkg/goformation/cloudformation/devopsguru/aws-devopsguru-resourcecollection_cloudformationcollectionfilter.go
index efb85da5ef..c34bff9c6f 100644
--- a/goformation/cloudformation/devopsguru/aws-devopsguru-resourcecollection_cloudformationcollectionfilter.go
+++ b/pkg/goformation/cloudformation/devopsguru/aws-devopsguru-resourcecollection_cloudformationcollectionfilter.go
@@ -1,9 +1,9 @@
 package devopsguru
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceCollection_CloudFormationCollectionFilter AWS CloudFormation Resource (AWS::DevOpsGuru::ResourceCollection.CloudFormationCollectionFilter)
diff --git a/goformation/cloudformation/devopsguru/aws-devopsguru-resourcecollection_resourcecollectionfilter.go b/pkg/goformation/cloudformation/devopsguru/aws-devopsguru-resourcecollection_resourcecollectionfilter.go
similarity index 96%
rename from goformation/cloudformation/devopsguru/aws-devopsguru-resourcecollection_resourcecollectionfilter.go
rename to pkg/goformation/cloudformation/devopsguru/aws-devopsguru-resourcecollection_resourcecollectionfilter.go
index 8306ea966a..b0706a4e3e 100644
--- a/goformation/cloudformation/devopsguru/aws-devopsguru-resourcecollection_resourcecollectionfilter.go
+++ b/pkg/goformation/cloudformation/devopsguru/aws-devopsguru-resourcecollection_resourcecollectionfilter.go
@@ -1,7 +1,7 @@
 package devopsguru
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceCollection_ResourceCollectionFilter AWS CloudFormation Resource (AWS::DevOpsGuru::ResourceCollection.ResourceCollectionFilter)
diff --git a/goformation/cloudformation/directoryservice/aws-directoryservice-microsoftad.go b/pkg/goformation/cloudformation/directoryservice/aws-directoryservice-microsoftad.go
similarity index 97%
rename from goformation/cloudformation/directoryservice/aws-directoryservice-microsoftad.go
rename to pkg/goformation/cloudformation/directoryservice/aws-directoryservice-microsoftad.go
index 7358ab4c28..5f7f770f24 100644
--- a/goformation/cloudformation/directoryservice/aws-directoryservice-microsoftad.go
+++ b/pkg/goformation/cloudformation/directoryservice/aws-directoryservice-microsoftad.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MicrosoftAD AWS CloudFormation Resource (AWS::DirectoryService::MicrosoftAD)
diff --git a/goformation/cloudformation/directoryservice/aws-directoryservice-microsoftad_vpcsettings.go b/pkg/goformation/cloudformation/directoryservice/aws-directoryservice-microsoftad_vpcsettings.go
similarity index 93%
rename from goformation/cloudformation/directoryservice/aws-directoryservice-microsoftad_vpcsettings.go
rename to pkg/goformation/cloudformation/directoryservice/aws-directoryservice-microsoftad_vpcsettings.go
index 0a7cd44225..a4b8bb4a83 100644
--- a/goformation/cloudformation/directoryservice/aws-directoryservice-microsoftad_vpcsettings.go
+++ b/pkg/goformation/cloudformation/directoryservice/aws-directoryservice-microsoftad_vpcsettings.go
@@ -1,9 +1,9 @@
 package directoryservice
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MicrosoftAD_VpcSettings AWS CloudFormation Resource (AWS::DirectoryService::MicrosoftAD.VpcSettings)
diff --git a/goformation/cloudformation/directoryservice/aws-directoryservice-simplead.go b/pkg/goformation/cloudformation/directoryservice/aws-directoryservice-simplead.go
similarity index 97%
rename from goformation/cloudformation/directoryservice/aws-directoryservice-simplead.go
rename to pkg/goformation/cloudformation/directoryservice/aws-directoryservice-simplead.go
index 3d213e41bf..adfa753346 100644
--- a/goformation/cloudformation/directoryservice/aws-directoryservice-simplead.go
+++ b/pkg/goformation/cloudformation/directoryservice/aws-directoryservice-simplead.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SimpleAD AWS CloudFormation Resource (AWS::DirectoryService::SimpleAD)
diff --git a/goformation/cloudformation/directoryservice/aws-directoryservice-simplead_vpcsettings.go b/pkg/goformation/cloudformation/directoryservice/aws-directoryservice-simplead_vpcsettings.go
similarity index 92%
rename from goformation/cloudformation/directoryservice/aws-directoryservice-simplead_vpcsettings.go
rename to pkg/goformation/cloudformation/directoryservice/aws-directoryservice-simplead_vpcsettings.go
index 8df63281b5..5f152c4f9b 100644
--- a/goformation/cloudformation/directoryservice/aws-directoryservice-simplead_vpcsettings.go
+++ b/pkg/goformation/cloudformation/directoryservice/aws-directoryservice-simplead_vpcsettings.go
@@ -1,9 +1,9 @@
 package directoryservice
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SimpleAD_VpcSettings AWS CloudFormation Resource (AWS::DirectoryService::SimpleAD.VpcSettings)
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy.go b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy.go
similarity index 95%
rename from goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy.go
rename to pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy.go
index ecf95768c6..ab2074ae43 100644
--- a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy.go
+++ b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LifecyclePolicy AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy)
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_action.go b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_action.go
similarity index 92%
rename from goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_action.go
rename to pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_action.go
index 68b7ed8fe4..a48d8cc30e 100644
--- a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_action.go
+++ b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_action.go
@@ -1,9 +1,9 @@
 package dlm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LifecyclePolicy_Action AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy.Action)
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_createrule.go b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_createrule.go
similarity index 95%
rename from goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_createrule.go
rename to pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_createrule.go
index 8b8f16afad..d2bb009400 100644
--- a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_createrule.go
+++ b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_createrule.go
@@ -1,9 +1,9 @@
 package dlm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LifecyclePolicy_CreateRule AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy.CreateRule)
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyaction.go b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyaction.go
similarity index 94%
rename from goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyaction.go
rename to pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyaction.go
index 5ee1429236..ad56f0ee64 100644
--- a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyaction.go
+++ b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyaction.go
@@ -1,9 +1,9 @@
 package dlm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LifecyclePolicy_CrossRegionCopyAction AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy.CrossRegionCopyAction)
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopydeprecaterule.go b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopydeprecaterule.go
similarity index 93%
rename from goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopydeprecaterule.go
rename to pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopydeprecaterule.go
index bf90b92e98..8549bc66f7 100644
--- a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopydeprecaterule.go
+++ b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopydeprecaterule.go
@@ -1,9 +1,9 @@
 package dlm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LifecyclePolicy_CrossRegionCopyDeprecateRule AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy.CrossRegionCopyDeprecateRule)
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyretainrule.go b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyretainrule.go
similarity index 93%
rename from goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyretainrule.go
rename to pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyretainrule.go
index 81f760de65..709d7187b9 100644
--- a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyretainrule.go
+++ b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyretainrule.go
@@ -1,9 +1,9 @@
 package dlm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LifecyclePolicy_CrossRegionCopyRetainRule AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy.CrossRegionCopyRetainRule)
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyrule.go b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyrule.go
similarity index 96%
rename from goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyrule.go
rename to pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyrule.go
index 13a11e31a1..274582c0d0 100644
--- a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyrule.go
+++ b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyrule.go
@@ -1,9 +1,9 @@
 package dlm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LifecyclePolicy_CrossRegionCopyRule AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy.CrossRegionCopyRule)
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_deprecaterule.go b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_deprecaterule.go
similarity index 93%
rename from goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_deprecaterule.go
rename to pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_deprecaterule.go
index f72c18b3c7..5dab9ae6d5 100644
--- a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_deprecaterule.go
+++ b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_deprecaterule.go
@@ -1,9 +1,9 @@
 package dlm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LifecyclePolicy_DeprecateRule AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy.DeprecateRule)
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_encryptionconfiguration.go b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_encryptionconfiguration.go
similarity index 93%
rename from goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_encryptionconfiguration.go
rename to pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_encryptionconfiguration.go
index e473106fdf..fdba029e85 100644
--- a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_encryptionconfiguration.go
+++ b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_encryptionconfiguration.go
@@ -1,9 +1,9 @@
 package dlm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LifecyclePolicy_EncryptionConfiguration AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy.EncryptionConfiguration)
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_eventparameters.go b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_eventparameters.go
similarity index 94%
rename from goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_eventparameters.go
rename to pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_eventparameters.go
index 4e0c357dc9..ff5cdbc51a 100644
--- a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_eventparameters.go
+++ b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_eventparameters.go
@@ -1,9 +1,9 @@
 package dlm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LifecyclePolicy_EventParameters AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy.EventParameters)
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_eventsource.go b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_eventsource.go
similarity index 92%
rename from goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_eventsource.go
rename to pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_eventsource.go
index 8dfc231118..34bda7a425 100644
--- a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_eventsource.go
+++ b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_eventsource.go
@@ -1,9 +1,9 @@
 package dlm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LifecyclePolicy_EventSource AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy.EventSource)
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_fastrestorerule.go b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_fastrestorerule.go
similarity index 94%
rename from goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_fastrestorerule.go
rename to pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_fastrestorerule.go
index f2c53d757d..19e28a197b 100644
--- a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_fastrestorerule.go
+++ b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_fastrestorerule.go
@@ -1,9 +1,9 @@
 package dlm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LifecyclePolicy_FastRestoreRule AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy.FastRestoreRule)
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_parameters.go b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_parameters.go
similarity index 92%
rename from goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_parameters.go
rename to pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_parameters.go
index e1a1a266dd..14855b9b57 100644
--- a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_parameters.go
+++ b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_parameters.go
@@ -1,9 +1,9 @@
 package dlm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LifecyclePolicy_Parameters AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy.Parameters)
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_policydetails.go b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_policydetails.go
similarity index 94%
rename from goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_policydetails.go
rename to pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_policydetails.go
index 48874de26c..8c88ff5b93 100644
--- a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_policydetails.go
+++ b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_policydetails.go
@@ -1,10 +1,10 @@
 package dlm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LifecyclePolicy_PolicyDetails AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy.PolicyDetails)
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_retainrule.go b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_retainrule.go
similarity index 93%
rename from goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_retainrule.go
rename to pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_retainrule.go
index 8c8ccf0154..2839f82e9a 100644
--- a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_retainrule.go
+++ b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_retainrule.go
@@ -1,9 +1,9 @@
 package dlm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LifecyclePolicy_RetainRule AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy.RetainRule)
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_schedule.go b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_schedule.go
similarity index 95%
rename from goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_schedule.go
rename to pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_schedule.go
index cd83f7d8ee..cfc97e01ab 100644
--- a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_schedule.go
+++ b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_schedule.go
@@ -1,10 +1,10 @@
 package dlm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LifecyclePolicy_Schedule AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy.Schedule)
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_sharerule.go b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_sharerule.go
similarity index 93%
rename from goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_sharerule.go
rename to pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_sharerule.go
index 504b5ccb2e..de6f3e13cb 100644
--- a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_sharerule.go
+++ b/pkg/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_sharerule.go
@@ -1,9 +1,9 @@
 package dlm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LifecyclePolicy_ShareRule AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy.ShareRule)
diff --git a/goformation/cloudformation/dms/aws-dms-certificate.go b/pkg/goformation/cloudformation/dms/aws-dms-certificate.go
similarity index 96%
rename from goformation/cloudformation/dms/aws-dms-certificate.go
rename to pkg/goformation/cloudformation/dms/aws-dms-certificate.go
index f443433710..5873511f3b 100644
--- a/goformation/cloudformation/dms/aws-dms-certificate.go
+++ b/pkg/goformation/cloudformation/dms/aws-dms-certificate.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Certificate AWS CloudFormation Resource (AWS::DMS::Certificate)
diff --git a/goformation/cloudformation/dms/aws-dms-endpoint.go b/pkg/goformation/cloudformation/dms/aws-dms-endpoint.go
similarity index 98%
rename from goformation/cloudformation/dms/aws-dms-endpoint.go
rename to pkg/goformation/cloudformation/dms/aws-dms-endpoint.go
index d5a58637e4..7c15b2a8f4 100644
--- a/goformation/cloudformation/dms/aws-dms-endpoint.go
+++ b/pkg/goformation/cloudformation/dms/aws-dms-endpoint.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Endpoint AWS CloudFormation Resource (AWS::DMS::Endpoint)
diff --git a/goformation/cloudformation/dms/aws-dms-endpoint_docdbsettings.go b/pkg/goformation/cloudformation/dms/aws-dms-endpoint_docdbsettings.go
similarity index 93%
rename from goformation/cloudformation/dms/aws-dms-endpoint_docdbsettings.go
rename to pkg/goformation/cloudformation/dms/aws-dms-endpoint_docdbsettings.go
index 0d411cfc1c..358e8f8a11 100644
--- a/goformation/cloudformation/dms/aws-dms-endpoint_docdbsettings.go
+++ b/pkg/goformation/cloudformation/dms/aws-dms-endpoint_docdbsettings.go
@@ -1,9 +1,9 @@
 package dms
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Endpoint_DocDbSettings AWS CloudFormation Resource (AWS::DMS::Endpoint.DocDbSettings)
diff --git a/goformation/cloudformation/dms/aws-dms-endpoint_dynamodbsettings.go b/pkg/goformation/cloudformation/dms/aws-dms-endpoint_dynamodbsettings.go
similarity index 91%
rename from goformation/cloudformation/dms/aws-dms-endpoint_dynamodbsettings.go
rename to pkg/goformation/cloudformation/dms/aws-dms-endpoint_dynamodbsettings.go
index e6b793a96d..af84bd278d 100644
--- a/goformation/cloudformation/dms/aws-dms-endpoint_dynamodbsettings.go
+++ b/pkg/goformation/cloudformation/dms/aws-dms-endpoint_dynamodbsettings.go
@@ -1,9 +1,9 @@
 package dms
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Endpoint_DynamoDbSettings AWS CloudFormation Resource (AWS::DMS::Endpoint.DynamoDbSettings)
diff --git a/goformation/cloudformation/dms/aws-dms-endpoint_elasticsearchsettings.go b/pkg/goformation/cloudformation/dms/aws-dms-endpoint_elasticsearchsettings.go
similarity index 94%
rename from goformation/cloudformation/dms/aws-dms-endpoint_elasticsearchsettings.go
rename to pkg/goformation/cloudformation/dms/aws-dms-endpoint_elasticsearchsettings.go
index a548871653..5ad206e2c7 100644
--- a/goformation/cloudformation/dms/aws-dms-endpoint_elasticsearchsettings.go
+++ b/pkg/goformation/cloudformation/dms/aws-dms-endpoint_elasticsearchsettings.go
@@ -1,9 +1,9 @@
 package dms
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Endpoint_ElasticsearchSettings AWS CloudFormation Resource (AWS::DMS::Endpoint.ElasticsearchSettings)
diff --git a/goformation/cloudformation/dms/aws-dms-endpoint_ibmdb2settings.go b/pkg/goformation/cloudformation/dms/aws-dms-endpoint_ibmdb2settings.go
similarity index 93%
rename from goformation/cloudformation/dms/aws-dms-endpoint_ibmdb2settings.go
rename to pkg/goformation/cloudformation/dms/aws-dms-endpoint_ibmdb2settings.go
index 6ae73ed6d2..5f07854120 100644
--- a/goformation/cloudformation/dms/aws-dms-endpoint_ibmdb2settings.go
+++ b/pkg/goformation/cloudformation/dms/aws-dms-endpoint_ibmdb2settings.go
@@ -1,9 +1,9 @@
 package dms
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Endpoint_IbmDb2Settings AWS CloudFormation Resource (AWS::DMS::Endpoint.IbmDb2Settings)
diff --git a/goformation/cloudformation/dms/aws-dms-endpoint_kafkasettings.go b/pkg/goformation/cloudformation/dms/aws-dms-endpoint_kafkasettings.go
similarity index 97%
rename from goformation/cloudformation/dms/aws-dms-endpoint_kafkasettings.go
rename to pkg/goformation/cloudformation/dms/aws-dms-endpoint_kafkasettings.go
index 8aebe0447f..7cbf2b5487 100644
--- a/goformation/cloudformation/dms/aws-dms-endpoint_kafkasettings.go
+++ b/pkg/goformation/cloudformation/dms/aws-dms-endpoint_kafkasettings.go
@@ -1,9 +1,9 @@
 package dms
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Endpoint_KafkaSettings AWS CloudFormation Resource (AWS::DMS::Endpoint.KafkaSettings)
diff --git a/goformation/cloudformation/dms/aws-dms-endpoint_kinesissettings.go b/pkg/goformation/cloudformation/dms/aws-dms-endpoint_kinesissettings.go
similarity index 96%
rename from goformation/cloudformation/dms/aws-dms-endpoint_kinesissettings.go
rename to pkg/goformation/cloudformation/dms/aws-dms-endpoint_kinesissettings.go
index bc0f8e98da..7d3d9bc184 100644
--- a/goformation/cloudformation/dms/aws-dms-endpoint_kinesissettings.go
+++ b/pkg/goformation/cloudformation/dms/aws-dms-endpoint_kinesissettings.go
@@ -1,9 +1,9 @@
 package dms
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Endpoint_KinesisSettings AWS CloudFormation Resource (AWS::DMS::Endpoint.KinesisSettings)
diff --git a/goformation/cloudformation/dms/aws-dms-endpoint_microsoftsqlserversettings.go b/pkg/goformation/cloudformation/dms/aws-dms-endpoint_microsoftsqlserversettings.go
similarity index 93%
rename from goformation/cloudformation/dms/aws-dms-endpoint_microsoftsqlserversettings.go
rename to pkg/goformation/cloudformation/dms/aws-dms-endpoint_microsoftsqlserversettings.go
index ac59e6c4ab..bcddff1bd0 100644
--- a/goformation/cloudformation/dms/aws-dms-endpoint_microsoftsqlserversettings.go
+++ b/pkg/goformation/cloudformation/dms/aws-dms-endpoint_microsoftsqlserversettings.go
@@ -1,9 +1,9 @@
 package dms
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Endpoint_MicrosoftSqlServerSettings AWS CloudFormation Resource (AWS::DMS::Endpoint.MicrosoftSqlServerSettings)
diff --git a/goformation/cloudformation/dms/aws-dms-endpoint_mongodbsettings.go b/pkg/goformation/cloudformation/dms/aws-dms-endpoint_mongodbsettings.go
similarity index 97%
rename from goformation/cloudformation/dms/aws-dms-endpoint_mongodbsettings.go
rename to pkg/goformation/cloudformation/dms/aws-dms-endpoint_mongodbsettings.go
index 12b7f854be..f85357281e 100644
--- a/goformation/cloudformation/dms/aws-dms-endpoint_mongodbsettings.go
+++ b/pkg/goformation/cloudformation/dms/aws-dms-endpoint_mongodbsettings.go
@@ -1,9 +1,9 @@
 package dms
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Endpoint_MongoDbSettings AWS CloudFormation Resource (AWS::DMS::Endpoint.MongoDbSettings)
diff --git a/goformation/cloudformation/dms/aws-dms-endpoint_mysqlsettings.go b/pkg/goformation/cloudformation/dms/aws-dms-endpoint_mysqlsettings.go
similarity index 93%
rename from goformation/cloudformation/dms/aws-dms-endpoint_mysqlsettings.go
rename to pkg/goformation/cloudformation/dms/aws-dms-endpoint_mysqlsettings.go
index 3b6d9323df..5e321df58c 100644
--- a/goformation/cloudformation/dms/aws-dms-endpoint_mysqlsettings.go
+++ b/pkg/goformation/cloudformation/dms/aws-dms-endpoint_mysqlsettings.go
@@ -1,9 +1,9 @@
 package dms
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Endpoint_MySqlSettings AWS CloudFormation Resource (AWS::DMS::Endpoint.MySqlSettings)
diff --git a/goformation/cloudformation/dms/aws-dms-endpoint_neptunesettings.go b/pkg/goformation/cloudformation/dms/aws-dms-endpoint_neptunesettings.go
similarity index 95%
rename from goformation/cloudformation/dms/aws-dms-endpoint_neptunesettings.go
rename to pkg/goformation/cloudformation/dms/aws-dms-endpoint_neptunesettings.go
index fae36a2928..f795551cdb 100644
--- a/goformation/cloudformation/dms/aws-dms-endpoint_neptunesettings.go
+++ b/pkg/goformation/cloudformation/dms/aws-dms-endpoint_neptunesettings.go
@@ -1,9 +1,9 @@
 package dms
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Endpoint_NeptuneSettings AWS CloudFormation Resource (AWS::DMS::Endpoint.NeptuneSettings)
diff --git a/goformation/cloudformation/dms/aws-dms-endpoint_oraclesettings.go b/pkg/goformation/cloudformation/dms/aws-dms-endpoint_oraclesettings.go
similarity index 94%
rename from goformation/cloudformation/dms/aws-dms-endpoint_oraclesettings.go
rename to pkg/goformation/cloudformation/dms/aws-dms-endpoint_oraclesettings.go
index 9a5fff275a..3660c2358e 100644
--- a/goformation/cloudformation/dms/aws-dms-endpoint_oraclesettings.go
+++ b/pkg/goformation/cloudformation/dms/aws-dms-endpoint_oraclesettings.go
@@ -1,9 +1,9 @@
 package dms
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Endpoint_OracleSettings AWS CloudFormation Resource (AWS::DMS::Endpoint.OracleSettings)
diff --git a/goformation/cloudformation/dms/aws-dms-endpoint_postgresqlsettings.go b/pkg/goformation/cloudformation/dms/aws-dms-endpoint_postgresqlsettings.go
similarity index 93%
rename from goformation/cloudformation/dms/aws-dms-endpoint_postgresqlsettings.go
rename to pkg/goformation/cloudformation/dms/aws-dms-endpoint_postgresqlsettings.go
index 1f67a61c0f..cc42f882b3 100644
--- a/goformation/cloudformation/dms/aws-dms-endpoint_postgresqlsettings.go
+++ b/pkg/goformation/cloudformation/dms/aws-dms-endpoint_postgresqlsettings.go
@@ -1,9 +1,9 @@
 package dms
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Endpoint_PostgreSqlSettings AWS CloudFormation Resource (AWS::DMS::Endpoint.PostgreSqlSettings)
diff --git a/goformation/cloudformation/dms/aws-dms-endpoint_redissettings.go b/pkg/goformation/cloudformation/dms/aws-dms-endpoint_redissettings.go
similarity index 95%
rename from goformation/cloudformation/dms/aws-dms-endpoint_redissettings.go
rename to pkg/goformation/cloudformation/dms/aws-dms-endpoint_redissettings.go
index d117231a3c..10d563deff 100644
--- a/goformation/cloudformation/dms/aws-dms-endpoint_redissettings.go
+++ b/pkg/goformation/cloudformation/dms/aws-dms-endpoint_redissettings.go
@@ -1,9 +1,9 @@
 package dms
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Endpoint_RedisSettings AWS CloudFormation Resource (AWS::DMS::Endpoint.RedisSettings)
diff --git a/goformation/cloudformation/dms/aws-dms-endpoint_redshiftsettings.go b/pkg/goformation/cloudformation/dms/aws-dms-endpoint_redshiftsettings.go
similarity index 93%
rename from goformation/cloudformation/dms/aws-dms-endpoint_redshiftsettings.go
rename to pkg/goformation/cloudformation/dms/aws-dms-endpoint_redshiftsettings.go
index 411f5b3fd8..aaf7bf2517 100644
--- a/goformation/cloudformation/dms/aws-dms-endpoint_redshiftsettings.go
+++ b/pkg/goformation/cloudformation/dms/aws-dms-endpoint_redshiftsettings.go
@@ -1,9 +1,9 @@
 package dms
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Endpoint_RedshiftSettings AWS CloudFormation Resource (AWS::DMS::Endpoint.RedshiftSettings)
diff --git a/goformation/cloudformation/dms/aws-dms-endpoint_s3settings.go b/pkg/goformation/cloudformation/dms/aws-dms-endpoint_s3settings.go
similarity index 95%
rename from goformation/cloudformation/dms/aws-dms-endpoint_s3settings.go
rename to pkg/goformation/cloudformation/dms/aws-dms-endpoint_s3settings.go
index 476fbc6b8a..800d7b0354 100644
--- a/goformation/cloudformation/dms/aws-dms-endpoint_s3settings.go
+++ b/pkg/goformation/cloudformation/dms/aws-dms-endpoint_s3settings.go
@@ -1,9 +1,9 @@
 package dms
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Endpoint_S3Settings AWS CloudFormation Resource (AWS::DMS::Endpoint.S3Settings)
diff --git a/goformation/cloudformation/dms/aws-dms-endpoint_sybasesettings.go b/pkg/goformation/cloudformation/dms/aws-dms-endpoint_sybasesettings.go
similarity index 93%
rename from goformation/cloudformation/dms/aws-dms-endpoint_sybasesettings.go
rename to pkg/goformation/cloudformation/dms/aws-dms-endpoint_sybasesettings.go
index 908b7e6aa1..7058d7818d 100644
--- a/goformation/cloudformation/dms/aws-dms-endpoint_sybasesettings.go
+++ b/pkg/goformation/cloudformation/dms/aws-dms-endpoint_sybasesettings.go
@@ -1,9 +1,9 @@
 package dms
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Endpoint_SybaseSettings AWS CloudFormation Resource (AWS::DMS::Endpoint.SybaseSettings)
diff --git a/goformation/cloudformation/dms/aws-dms-eventsubscription.go b/pkg/goformation/cloudformation/dms/aws-dms-eventsubscription.go
similarity index 96%
rename from goformation/cloudformation/dms/aws-dms-eventsubscription.go
rename to pkg/goformation/cloudformation/dms/aws-dms-eventsubscription.go
index 338c553810..a50803fc2b 100644
--- a/goformation/cloudformation/dms/aws-dms-eventsubscription.go
+++ b/pkg/goformation/cloudformation/dms/aws-dms-eventsubscription.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EventSubscription AWS CloudFormation Resource (AWS::DMS::EventSubscription)
diff --git a/goformation/cloudformation/dms/aws-dms-replicationinstance.go b/pkg/goformation/cloudformation/dms/aws-dms-replicationinstance.go
similarity index 97%
rename from goformation/cloudformation/dms/aws-dms-replicationinstance.go
rename to pkg/goformation/cloudformation/dms/aws-dms-replicationinstance.go
index b6094241de..f46e7491d4 100644
--- a/goformation/cloudformation/dms/aws-dms-replicationinstance.go
+++ b/pkg/goformation/cloudformation/dms/aws-dms-replicationinstance.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReplicationInstance AWS CloudFormation Resource (AWS::DMS::ReplicationInstance)
diff --git a/goformation/cloudformation/dms/aws-dms-replicationsubnetgroup.go b/pkg/goformation/cloudformation/dms/aws-dms-replicationsubnetgroup.go
similarity index 95%
rename from goformation/cloudformation/dms/aws-dms-replicationsubnetgroup.go
rename to pkg/goformation/cloudformation/dms/aws-dms-replicationsubnetgroup.go
index 012ce88d34..d598dc7761 100644
--- a/goformation/cloudformation/dms/aws-dms-replicationsubnetgroup.go
+++ b/pkg/goformation/cloudformation/dms/aws-dms-replicationsubnetgroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReplicationSubnetGroup AWS CloudFormation Resource (AWS::DMS::ReplicationSubnetGroup)
diff --git a/goformation/cloudformation/dms/aws-dms-replicationtask.go b/pkg/goformation/cloudformation/dms/aws-dms-replicationtask.go
similarity index 97%
rename from goformation/cloudformation/dms/aws-dms-replicationtask.go
rename to pkg/goformation/cloudformation/dms/aws-dms-replicationtask.go
index 23924c6f23..b22ad05a41 100644
--- a/goformation/cloudformation/dms/aws-dms-replicationtask.go
+++ b/pkg/goformation/cloudformation/dms/aws-dms-replicationtask.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReplicationTask AWS CloudFormation Resource (AWS::DMS::ReplicationTask)
diff --git a/goformation/cloudformation/docdb/aws-docdb-dbcluster.go b/pkg/goformation/cloudformation/docdb/aws-docdb-dbcluster.go
similarity index 97%
rename from goformation/cloudformation/docdb/aws-docdb-dbcluster.go
rename to pkg/goformation/cloudformation/docdb/aws-docdb-dbcluster.go
index 8aa4d3b556..9fab4175af 100644
--- a/goformation/cloudformation/docdb/aws-docdb-dbcluster.go
+++ b/pkg/goformation/cloudformation/docdb/aws-docdb-dbcluster.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DBCluster AWS CloudFormation Resource (AWS::DocDB::DBCluster)
diff --git a/goformation/cloudformation/docdb/aws-docdb-dbclusterparametergroup.go b/pkg/goformation/cloudformation/docdb/aws-docdb-dbclusterparametergroup.go
similarity index 95%
rename from goformation/cloudformation/docdb/aws-docdb-dbclusterparametergroup.go
rename to pkg/goformation/cloudformation/docdb/aws-docdb-dbclusterparametergroup.go
index d740f4cae3..2b15c3b098 100644
--- a/goformation/cloudformation/docdb/aws-docdb-dbclusterparametergroup.go
+++ b/pkg/goformation/cloudformation/docdb/aws-docdb-dbclusterparametergroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DBClusterParameterGroup AWS CloudFormation Resource (AWS::DocDB::DBClusterParameterGroup)
diff --git a/goformation/cloudformation/docdb/aws-docdb-dbinstance.go b/pkg/goformation/cloudformation/docdb/aws-docdb-dbinstance.go
similarity index 96%
rename from goformation/cloudformation/docdb/aws-docdb-dbinstance.go
rename to pkg/goformation/cloudformation/docdb/aws-docdb-dbinstance.go
index 91a6a75a44..9753ecba5b 100644
--- a/goformation/cloudformation/docdb/aws-docdb-dbinstance.go
+++ b/pkg/goformation/cloudformation/docdb/aws-docdb-dbinstance.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DBInstance AWS CloudFormation Resource (AWS::DocDB::DBInstance)
diff --git a/goformation/cloudformation/docdb/aws-docdb-dbsubnetgroup.go b/pkg/goformation/cloudformation/docdb/aws-docdb-dbsubnetgroup.go
similarity index 95%
rename from goformation/cloudformation/docdb/aws-docdb-dbsubnetgroup.go
rename to pkg/goformation/cloudformation/docdb/aws-docdb-dbsubnetgroup.go
index 89668c248f..b30a895833 100644
--- a/goformation/cloudformation/docdb/aws-docdb-dbsubnetgroup.go
+++ b/pkg/goformation/cloudformation/docdb/aws-docdb-dbsubnetgroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DBSubnetGroup AWS CloudFormation Resource (AWS::DocDB::DBSubnetGroup)
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable.go b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable.go
similarity index 98%
rename from goformation/cloudformation/dynamodb/aws-dynamodb-globaltable.go
rename to pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable.go
index 2275880ac2..589f7eebc2 100644
--- a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable.go
+++ b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GlobalTable AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable)
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_attributedefinition.go b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_attributedefinition.go
similarity index 93%
rename from goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_attributedefinition.go
rename to pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_attributedefinition.go
index c17e52a141..cc03f7999e 100644
--- a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_attributedefinition.go
+++ b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_attributedefinition.go
@@ -1,9 +1,9 @@
 package dynamodb
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GlobalTable_AttributeDefinition AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.AttributeDefinition)
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_capacityautoscalingsettings.go b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_capacityautoscalingsettings.go
similarity index 95%
rename from goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_capacityautoscalingsettings.go
rename to pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_capacityautoscalingsettings.go
index d999378d5c..68e240e0e6 100644
--- a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_capacityautoscalingsettings.go
+++ b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_capacityautoscalingsettings.go
@@ -1,9 +1,9 @@
 package dynamodb
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GlobalTable_CapacityAutoScalingSettings AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.CapacityAutoScalingSettings)
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_contributorinsightsspecification.go b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_contributorinsightsspecification.go
similarity index 92%
rename from goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_contributorinsightsspecification.go
rename to pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_contributorinsightsspecification.go
index 0b75308480..35c09839af 100644
--- a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_contributorinsightsspecification.go
+++ b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_contributorinsightsspecification.go
@@ -1,9 +1,9 @@
 package dynamodb
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GlobalTable_ContributorInsightsSpecification AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.ContributorInsightsSpecification)
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_globalsecondaryindex.go b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_globalsecondaryindex.go
similarity index 95%
rename from goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_globalsecondaryindex.go
rename to pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_globalsecondaryindex.go
index 633931caad..8269c49420 100644
--- a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_globalsecondaryindex.go
+++ b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_globalsecondaryindex.go
@@ -1,9 +1,9 @@
 package dynamodb
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GlobalTable_GlobalSecondaryIndex AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.GlobalSecondaryIndex)
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_keyschema.go b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_keyschema.go
similarity index 92%
rename from goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_keyschema.go
rename to pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_keyschema.go
index d19c82b427..f03514bdbf 100644
--- a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_keyschema.go
+++ b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_keyschema.go
@@ -1,9 +1,9 @@
 package dynamodb
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GlobalTable_KeySchema AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.KeySchema)
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_localsecondaryindex.go b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_localsecondaryindex.go
similarity index 94%
rename from goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_localsecondaryindex.go
rename to pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_localsecondaryindex.go
index a0157c2d59..ee68755cff 100644
--- a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_localsecondaryindex.go
+++ b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_localsecondaryindex.go
@@ -1,9 +1,9 @@
 package dynamodb
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GlobalTable_LocalSecondaryIndex AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.LocalSecondaryIndex)
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_pointintimerecoveryspecification.go b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_pointintimerecoveryspecification.go
similarity index 92%
rename from goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_pointintimerecoveryspecification.go
rename to pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_pointintimerecoveryspecification.go
index e6fd3a66b2..8e81138d81 100644
--- a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_pointintimerecoveryspecification.go
+++ b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_pointintimerecoveryspecification.go
@@ -1,9 +1,9 @@
 package dynamodb
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GlobalTable_PointInTimeRecoverySpecification AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.PointInTimeRecoverySpecification)
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_projection.go b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_projection.go
similarity index 93%
rename from goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_projection.go
rename to pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_projection.go
index be8a3a0cca..3afdc241d5 100644
--- a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_projection.go
+++ b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_projection.go
@@ -1,9 +1,9 @@
 package dynamodb
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GlobalTable_Projection AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.Projection)
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_readprovisionedthroughputsettings.go b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_readprovisionedthroughputsettings.go
similarity index 93%
rename from goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_readprovisionedthroughputsettings.go
rename to pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_readprovisionedthroughputsettings.go
index 53a1ff0e09..8038e72496 100644
--- a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_readprovisionedthroughputsettings.go
+++ b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_readprovisionedthroughputsettings.go
@@ -1,9 +1,9 @@
 package dynamodb
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GlobalTable_ReadProvisionedThroughputSettings AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings)
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_replicaglobalsecondaryindexspecification.go b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_replicaglobalsecondaryindexspecification.go
similarity index 95%
rename from goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_replicaglobalsecondaryindexspecification.go
rename to pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_replicaglobalsecondaryindexspecification.go
index fd9cf05903..0c5b395000 100644
--- a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_replicaglobalsecondaryindexspecification.go
+++ b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_replicaglobalsecondaryindexspecification.go
@@ -1,9 +1,9 @@
 package dynamodb
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GlobalTable_ReplicaGlobalSecondaryIndexSpecification AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.ReplicaGlobalSecondaryIndexSpecification)
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_replicaspecification.go b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_replicaspecification.go
similarity index 94%
rename from goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_replicaspecification.go
rename to pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_replicaspecification.go
index 37dcaeabd6..161aa5dabd 100644
--- a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_replicaspecification.go
+++ b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_replicaspecification.go
@@ -1,10 +1,10 @@
 package dynamodb
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GlobalTable_ReplicaSpecification AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.ReplicaSpecification)
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_replicassespecification.go b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_replicassespecification.go
similarity index 92%
rename from goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_replicassespecification.go
rename to pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_replicassespecification.go
index 6eae891383..b6970e0f62 100644
--- a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_replicassespecification.go
+++ b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_replicassespecification.go
@@ -1,9 +1,9 @@
 package dynamodb
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GlobalTable_ReplicaSSESpecification AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.ReplicaSSESpecification)
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_ssespecification.go b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_ssespecification.go
similarity index 93%
rename from goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_ssespecification.go
rename to pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_ssespecification.go
index 0bb2f25801..72df0a9cdb 100644
--- a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_ssespecification.go
+++ b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_ssespecification.go
@@ -1,9 +1,9 @@
 package dynamodb
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GlobalTable_SSESpecification AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.SSESpecification)
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_streamspecification.go b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_streamspecification.go
similarity index 92%
rename from goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_streamspecification.go
rename to pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_streamspecification.go
index 2b7b8e04b6..d4f6603653 100644
--- a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_streamspecification.go
+++ b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_streamspecification.go
@@ -1,9 +1,9 @@
 package dynamodb
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GlobalTable_StreamSpecification AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.StreamSpecification)
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_targettrackingscalingpolicyconfiguration.go b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_targettrackingscalingpolicyconfiguration.go
similarity index 95%
rename from goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_targettrackingscalingpolicyconfiguration.go
rename to pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_targettrackingscalingpolicyconfiguration.go
index 0168620037..906d7cacec 100644
--- a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_targettrackingscalingpolicyconfiguration.go
+++ b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_targettrackingscalingpolicyconfiguration.go
@@ -1,9 +1,9 @@
 package dynamodb
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GlobalTable_TargetTrackingScalingPolicyConfiguration AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.TargetTrackingScalingPolicyConfiguration)
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_timetolivespecification.go b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_timetolivespecification.go
similarity index 93%
rename from goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_timetolivespecification.go
rename to pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_timetolivespecification.go
index f4b5fc28da..493925fc7d 100644
--- a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_timetolivespecification.go
+++ b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_timetolivespecification.go
@@ -1,9 +1,9 @@
 package dynamodb
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GlobalTable_TimeToLiveSpecification AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.TimeToLiveSpecification)
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_writeprovisionedthroughputsettings.go b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_writeprovisionedthroughputsettings.go
similarity index 96%
rename from goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_writeprovisionedthroughputsettings.go
rename to pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_writeprovisionedthroughputsettings.go
index feed0185e3..eb52ff7224 100644
--- a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_writeprovisionedthroughputsettings.go
+++ b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_writeprovisionedthroughputsettings.go
@@ -1,7 +1,7 @@
 package dynamodb
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GlobalTable_WriteProvisionedThroughputSettings AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings)
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-table.go b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table.go
similarity index 97%
rename from goformation/cloudformation/dynamodb/aws-dynamodb-table.go
rename to pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table.go
index efcbb7598e..88912418ae 100644
--- a/goformation/cloudformation/dynamodb/aws-dynamodb-table.go
+++ b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Table AWS CloudFormation Resource (AWS::DynamoDB::Table)
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-table_attributedefinition.go b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_attributedefinition.go
similarity index 92%
rename from goformation/cloudformation/dynamodb/aws-dynamodb-table_attributedefinition.go
rename to pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_attributedefinition.go
index 3569e65c7e..b81096c137 100644
--- a/goformation/cloudformation/dynamodb/aws-dynamodb-table_attributedefinition.go
+++ b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_attributedefinition.go
@@ -1,9 +1,9 @@
 package dynamodb
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Table_AttributeDefinition AWS CloudFormation Resource (AWS::DynamoDB::Table.AttributeDefinition)
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-table_contributorinsightsspecification.go b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_contributorinsightsspecification.go
similarity index 92%
rename from goformation/cloudformation/dynamodb/aws-dynamodb-table_contributorinsightsspecification.go
rename to pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_contributorinsightsspecification.go
index f69eb5c908..1ee2b24061 100644
--- a/goformation/cloudformation/dynamodb/aws-dynamodb-table_contributorinsightsspecification.go
+++ b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_contributorinsightsspecification.go
@@ -1,9 +1,9 @@
 package dynamodb
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Table_ContributorInsightsSpecification AWS CloudFormation Resource (AWS::DynamoDB::Table.ContributorInsightsSpecification)
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-table_globalsecondaryindex.go b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_globalsecondaryindex.go
similarity index 95%
rename from goformation/cloudformation/dynamodb/aws-dynamodb-table_globalsecondaryindex.go
rename to pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_globalsecondaryindex.go
index 0545d0237d..664c458896 100644
--- a/goformation/cloudformation/dynamodb/aws-dynamodb-table_globalsecondaryindex.go
+++ b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_globalsecondaryindex.go
@@ -1,9 +1,9 @@
 package dynamodb
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Table_GlobalSecondaryIndex AWS CloudFormation Resource (AWS::DynamoDB::Table.GlobalSecondaryIndex)
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-table_keyschema.go b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_keyschema.go
similarity index 92%
rename from goformation/cloudformation/dynamodb/aws-dynamodb-table_keyschema.go
rename to pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_keyschema.go
index c204875984..c575a80b31 100644
--- a/goformation/cloudformation/dynamodb/aws-dynamodb-table_keyschema.go
+++ b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_keyschema.go
@@ -1,9 +1,9 @@
 package dynamodb
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Table_KeySchema AWS CloudFormation Resource (AWS::DynamoDB::Table.KeySchema)
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-table_kinesisstreamspecification.go b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_kinesisstreamspecification.go
similarity index 91%
rename from goformation/cloudformation/dynamodb/aws-dynamodb-table_kinesisstreamspecification.go
rename to pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_kinesisstreamspecification.go
index f4a27828fa..f9fbe972f6 100644
--- a/goformation/cloudformation/dynamodb/aws-dynamodb-table_kinesisstreamspecification.go
+++ b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_kinesisstreamspecification.go
@@ -1,9 +1,9 @@
 package dynamodb
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Table_KinesisStreamSpecification AWS CloudFormation Resource (AWS::DynamoDB::Table.KinesisStreamSpecification)
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-table_localsecondaryindex.go b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_localsecondaryindex.go
similarity index 93%
rename from goformation/cloudformation/dynamodb/aws-dynamodb-table_localsecondaryindex.go
rename to pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_localsecondaryindex.go
index 11135453a4..fc2782801f 100644
--- a/goformation/cloudformation/dynamodb/aws-dynamodb-table_localsecondaryindex.go
+++ b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_localsecondaryindex.go
@@ -1,9 +1,9 @@
 package dynamodb
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Table_LocalSecondaryIndex AWS CloudFormation Resource (AWS::DynamoDB::Table.LocalSecondaryIndex)
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-table_pointintimerecoveryspecification.go b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_pointintimerecoveryspecification.go
similarity index 92%
rename from goformation/cloudformation/dynamodb/aws-dynamodb-table_pointintimerecoveryspecification.go
rename to pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_pointintimerecoveryspecification.go
index b85dcca77c..a106545f2a 100644
--- a/goformation/cloudformation/dynamodb/aws-dynamodb-table_pointintimerecoveryspecification.go
+++ b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_pointintimerecoveryspecification.go
@@ -1,9 +1,9 @@
 package dynamodb
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Table_PointInTimeRecoverySpecification AWS CloudFormation Resource (AWS::DynamoDB::Table.PointInTimeRecoverySpecification)
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-table_projection.go b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_projection.go
similarity index 92%
rename from goformation/cloudformation/dynamodb/aws-dynamodb-table_projection.go
rename to pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_projection.go
index 898b757467..887fb28f3a 100644
--- a/goformation/cloudformation/dynamodb/aws-dynamodb-table_projection.go
+++ b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_projection.go
@@ -1,9 +1,9 @@
 package dynamodb
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Table_Projection AWS CloudFormation Resource (AWS::DynamoDB::Table.Projection)
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-table_provisionedthroughput.go b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_provisionedthroughput.go
similarity index 93%
rename from goformation/cloudformation/dynamodb/aws-dynamodb-table_provisionedthroughput.go
rename to pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_provisionedthroughput.go
index 2c6f5f6737..e0a34cbae6 100644
--- a/goformation/cloudformation/dynamodb/aws-dynamodb-table_provisionedthroughput.go
+++ b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_provisionedthroughput.go
@@ -1,9 +1,9 @@
 package dynamodb
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Table_ProvisionedThroughput AWS CloudFormation Resource (AWS::DynamoDB::Table.ProvisionedThroughput)
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-table_ssespecification.go b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_ssespecification.go
similarity index 93%
rename from goformation/cloudformation/dynamodb/aws-dynamodb-table_ssespecification.go
rename to pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_ssespecification.go
index 3af9102a92..f7f0372291 100644
--- a/goformation/cloudformation/dynamodb/aws-dynamodb-table_ssespecification.go
+++ b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_ssespecification.go
@@ -1,9 +1,9 @@
 package dynamodb
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Table_SSESpecification AWS CloudFormation Resource (AWS::DynamoDB::Table.SSESpecification)
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-table_streamspecification.go b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_streamspecification.go
similarity index 91%
rename from goformation/cloudformation/dynamodb/aws-dynamodb-table_streamspecification.go
rename to pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_streamspecification.go
index 4ddc5bd032..0679199490 100644
--- a/goformation/cloudformation/dynamodb/aws-dynamodb-table_streamspecification.go
+++ b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_streamspecification.go
@@ -1,9 +1,9 @@
 package dynamodb
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Table_StreamSpecification AWS CloudFormation Resource (AWS::DynamoDB::Table.StreamSpecification)
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-table_timetolivespecification.go b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_timetolivespecification.go
similarity index 92%
rename from goformation/cloudformation/dynamodb/aws-dynamodb-table_timetolivespecification.go
rename to pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_timetolivespecification.go
index 7241826e75..6faefaf892 100644
--- a/goformation/cloudformation/dynamodb/aws-dynamodb-table_timetolivespecification.go
+++ b/pkg/goformation/cloudformation/dynamodb/aws-dynamodb-table_timetolivespecification.go
@@ -1,9 +1,9 @@
 package dynamodb
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Table_TimeToLiveSpecification AWS CloudFormation Resource (AWS::DynamoDB::Table.TimeToLiveSpecification)
diff --git a/goformation/cloudformation/ec2/aws-ec2-capacityreservation.go b/pkg/goformation/cloudformation/ec2/aws-ec2-capacityreservation.go
similarity index 98%
rename from goformation/cloudformation/ec2/aws-ec2-capacityreservation.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-capacityreservation.go
index f4a914c102..88524e64ae 100644
--- a/goformation/cloudformation/ec2/aws-ec2-capacityreservation.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-capacityreservation.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CapacityReservation AWS CloudFormation Resource (AWS::EC2::CapacityReservation)
diff --git a/goformation/cloudformation/ec2/aws-ec2-capacityreservation_tagspecification.go b/pkg/goformation/cloudformation/ec2/aws-ec2-capacityreservation_tagspecification.go
similarity index 89%
rename from goformation/cloudformation/ec2/aws-ec2-capacityreservation_tagspecification.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-capacityreservation_tagspecification.go
index 7ac53730d6..9ef6634b3e 100644
--- a/goformation/cloudformation/ec2/aws-ec2-capacityreservation_tagspecification.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-capacityreservation_tagspecification.go
@@ -1,10 +1,10 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CapacityReservation_TagSpecification AWS CloudFormation Resource (AWS::EC2::CapacityReservation.TagSpecification)
diff --git a/goformation/cloudformation/ec2/aws-ec2-capacityreservationfleet.go b/pkg/goformation/cloudformation/ec2/aws-ec2-capacityreservationfleet.go
similarity index 97%
rename from goformation/cloudformation/ec2/aws-ec2-capacityreservationfleet.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-capacityreservationfleet.go
index f1a4dd1630..17f8a7b61c 100644
--- a/goformation/cloudformation/ec2/aws-ec2-capacityreservationfleet.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-capacityreservationfleet.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CapacityReservationFleet AWS CloudFormation Resource (AWS::EC2::CapacityReservationFleet)
diff --git a/goformation/cloudformation/ec2/aws-ec2-capacityreservationfleet_instancetypespecification.go b/pkg/goformation/cloudformation/ec2/aws-ec2-capacityreservationfleet_instancetypespecification.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-capacityreservationfleet_instancetypespecification.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-capacityreservationfleet_instancetypespecification.go
index 661f79e8eb..cf83a1d424 100644
--- a/goformation/cloudformation/ec2/aws-ec2-capacityreservationfleet_instancetypespecification.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-capacityreservationfleet_instancetypespecification.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CapacityReservationFleet_InstanceTypeSpecification AWS CloudFormation Resource (AWS::EC2::CapacityReservationFleet.InstanceTypeSpecification)
diff --git a/goformation/cloudformation/ec2/aws-ec2-capacityreservationfleet_tagspecification.go b/pkg/goformation/cloudformation/ec2/aws-ec2-capacityreservationfleet_tagspecification.go
similarity index 90%
rename from goformation/cloudformation/ec2/aws-ec2-capacityreservationfleet_tagspecification.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-capacityreservationfleet_tagspecification.go
index 8bb299efa2..d1fa695da8 100644
--- a/goformation/cloudformation/ec2/aws-ec2-capacityreservationfleet_tagspecification.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-capacityreservationfleet_tagspecification.go
@@ -1,10 +1,10 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CapacityReservationFleet_TagSpecification AWS CloudFormation Resource (AWS::EC2::CapacityReservationFleet.TagSpecification)
diff --git a/goformation/cloudformation/ec2/aws-ec2-carriergateway.go b/pkg/goformation/cloudformation/ec2/aws-ec2-carriergateway.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-carriergateway.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-carriergateway.go
index e328c6881d..1fe9bf376d 100644
--- a/goformation/cloudformation/ec2/aws-ec2-carriergateway.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-carriergateway.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CarrierGateway AWS CloudFormation Resource (AWS::EC2::CarrierGateway)
diff --git a/goformation/cloudformation/ec2/aws-ec2-carriergateway_tags.go b/pkg/goformation/cloudformation/ec2/aws-ec2-carriergateway_tags.go
similarity index 90%
rename from goformation/cloudformation/ec2/aws-ec2-carriergateway_tags.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-carriergateway_tags.go
index 34243aaa0f..a18cd1e369 100644
--- a/goformation/cloudformation/ec2/aws-ec2-carriergateway_tags.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-carriergateway_tags.go
@@ -1,8 +1,8 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CarrierGateway_Tags AWS CloudFormation Resource (AWS::EC2::CarrierGateway.Tags)
diff --git a/goformation/cloudformation/ec2/aws-ec2-clientvpnauthorizationrule.go b/pkg/goformation/cloudformation/ec2/aws-ec2-clientvpnauthorizationrule.go
similarity index 97%
rename from goformation/cloudformation/ec2/aws-ec2-clientvpnauthorizationrule.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-clientvpnauthorizationrule.go
index fd332b841a..2f0d6eff04 100644
--- a/goformation/cloudformation/ec2/aws-ec2-clientvpnauthorizationrule.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-clientvpnauthorizationrule.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ClientVpnAuthorizationRule AWS CloudFormation Resource (AWS::EC2::ClientVpnAuthorizationRule)
diff --git a/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint.go b/pkg/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint.go
similarity index 98%
rename from goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint.go
index a9f55df78f..2bf32b4231 100644
--- a/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ClientVpnEndpoint AWS CloudFormation Resource (AWS::EC2::ClientVpnEndpoint)
diff --git a/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_certificateauthenticationrequest.go b/pkg/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_certificateauthenticationrequest.go
similarity index 92%
rename from goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_certificateauthenticationrequest.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_certificateauthenticationrequest.go
index 0e44a2b39d..64368dc7c5 100644
--- a/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_certificateauthenticationrequest.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_certificateauthenticationrequest.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ClientVpnEndpoint_CertificateAuthenticationRequest AWS CloudFormation Resource (AWS::EC2::ClientVpnEndpoint.CertificateAuthenticationRequest)
diff --git a/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_clientauthenticationrequest.go b/pkg/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_clientauthenticationrequest.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_clientauthenticationrequest.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_clientauthenticationrequest.go
index 03375c56a2..1030dbfe49 100644
--- a/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_clientauthenticationrequest.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_clientauthenticationrequest.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ClientVpnEndpoint_ClientAuthenticationRequest AWS CloudFormation Resource (AWS::EC2::ClientVpnEndpoint.ClientAuthenticationRequest)
diff --git a/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_clientconnectoptions.go b/pkg/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_clientconnectoptions.go
similarity index 93%
rename from goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_clientconnectoptions.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_clientconnectoptions.go
index 285be5a54c..dc823b34eb 100644
--- a/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_clientconnectoptions.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_clientconnectoptions.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ClientVpnEndpoint_ClientConnectOptions AWS CloudFormation Resource (AWS::EC2::ClientVpnEndpoint.ClientConnectOptions)
diff --git a/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_connectionlogoptions.go b/pkg/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_connectionlogoptions.go
similarity index 94%
rename from goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_connectionlogoptions.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_connectionlogoptions.go
index 68a1b5192f..6adf7df5a6 100644
--- a/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_connectionlogoptions.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_connectionlogoptions.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ClientVpnEndpoint_ConnectionLogOptions AWS CloudFormation Resource (AWS::EC2::ClientVpnEndpoint.ConnectionLogOptions)
diff --git a/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_directoryserviceauthenticationrequest.go b/pkg/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_directoryserviceauthenticationrequest.go
similarity index 92%
rename from goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_directoryserviceauthenticationrequest.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_directoryserviceauthenticationrequest.go
index 42dd56e50b..4798f87b32 100644
--- a/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_directoryserviceauthenticationrequest.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_directoryserviceauthenticationrequest.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ClientVpnEndpoint_DirectoryServiceAuthenticationRequest AWS CloudFormation Resource (AWS::EC2::ClientVpnEndpoint.DirectoryServiceAuthenticationRequest)
diff --git a/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_federatedauthenticationrequest.go b/pkg/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_federatedauthenticationrequest.go
similarity index 93%
rename from goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_federatedauthenticationrequest.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_federatedauthenticationrequest.go
index bfdbe2832c..7ab9031816 100644
--- a/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_federatedauthenticationrequest.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_federatedauthenticationrequest.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ClientVpnEndpoint_FederatedAuthenticationRequest AWS CloudFormation Resource (AWS::EC2::ClientVpnEndpoint.FederatedAuthenticationRequest)
diff --git a/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_tagspecification.go b/pkg/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_tagspecification.go
similarity index 89%
rename from goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_tagspecification.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_tagspecification.go
index bcd98d0764..ad59ed0b39 100644
--- a/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_tagspecification.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_tagspecification.go
@@ -1,10 +1,10 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ClientVpnEndpoint_TagSpecification AWS CloudFormation Resource (AWS::EC2::ClientVpnEndpoint.TagSpecification)
diff --git a/goformation/cloudformation/ec2/aws-ec2-clientvpnroute.go b/pkg/goformation/cloudformation/ec2/aws-ec2-clientvpnroute.go
similarity index 97%
rename from goformation/cloudformation/ec2/aws-ec2-clientvpnroute.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-clientvpnroute.go
index 583c816c6b..2a66f61808 100644
--- a/goformation/cloudformation/ec2/aws-ec2-clientvpnroute.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-clientvpnroute.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ClientVpnRoute AWS CloudFormation Resource (AWS::EC2::ClientVpnRoute)
diff --git a/goformation/cloudformation/ec2/aws-ec2-clientvpntargetnetworkassociation.go b/pkg/goformation/cloudformation/ec2/aws-ec2-clientvpntargetnetworkassociation.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-clientvpntargetnetworkassociation.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-clientvpntargetnetworkassociation.go
index 276e360471..4ed9852b2b 100644
--- a/goformation/cloudformation/ec2/aws-ec2-clientvpntargetnetworkassociation.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-clientvpntargetnetworkassociation.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ClientVpnTargetNetworkAssociation AWS CloudFormation Resource (AWS::EC2::ClientVpnTargetNetworkAssociation)
diff --git a/goformation/cloudformation/ec2/aws-ec2-customergateway.go b/pkg/goformation/cloudformation/ec2/aws-ec2-customergateway.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-customergateway.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-customergateway.go
index 183f50ef11..2567fa6a09 100644
--- a/goformation/cloudformation/ec2/aws-ec2-customergateway.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-customergateway.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CustomerGateway AWS CloudFormation Resource (AWS::EC2::CustomerGateway)
diff --git a/goformation/cloudformation/ec2/aws-ec2-dhcpoptions.go b/pkg/goformation/cloudformation/ec2/aws-ec2-dhcpoptions.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-dhcpoptions.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-dhcpoptions.go
index 8976b1635c..6f5574bbeb 100644
--- a/goformation/cloudformation/ec2/aws-ec2-dhcpoptions.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-dhcpoptions.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DHCPOptions AWS CloudFormation Resource (AWS::EC2::DHCPOptions)
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet.go b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet.go
similarity index 98%
rename from goformation/cloudformation/ec2/aws-ec2-ec2fleet.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet.go
index c703ed2bf7..028ba63981 100644
--- a/goformation/cloudformation/ec2/aws-ec2-ec2fleet.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EC2Fleet AWS CloudFormation Resource (AWS::EC2::EC2Fleet)
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_acceleratorcountrequest.go b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_acceleratorcountrequest.go
similarity index 92%
rename from goformation/cloudformation/ec2/aws-ec2-ec2fleet_acceleratorcountrequest.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_acceleratorcountrequest.go
index e2e3fa5666..f11085dd5c 100644
--- a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_acceleratorcountrequest.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_acceleratorcountrequest.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EC2Fleet_AcceleratorCountRequest AWS CloudFormation Resource (AWS::EC2::EC2Fleet.AcceleratorCountRequest)
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_acceleratortotalmemorymibrequest.go b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_acceleratortotalmemorymibrequest.go
similarity index 93%
rename from goformation/cloudformation/ec2/aws-ec2-ec2fleet_acceleratortotalmemorymibrequest.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_acceleratortotalmemorymibrequest.go
index fb3a4b959b..f5120fff72 100644
--- a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_acceleratortotalmemorymibrequest.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_acceleratortotalmemorymibrequest.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EC2Fleet_AcceleratorTotalMemoryMiBRequest AWS CloudFormation Resource (AWS::EC2::EC2Fleet.AcceleratorTotalMemoryMiBRequest)
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_baselineebsbandwidthmbpsrequest.go b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_baselineebsbandwidthmbpsrequest.go
similarity index 93%
rename from goformation/cloudformation/ec2/aws-ec2-ec2fleet_baselineebsbandwidthmbpsrequest.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_baselineebsbandwidthmbpsrequest.go
index 4439158f79..14a6e8f697 100644
--- a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_baselineebsbandwidthmbpsrequest.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_baselineebsbandwidthmbpsrequest.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EC2Fleet_BaselineEbsBandwidthMbpsRequest AWS CloudFormation Resource (AWS::EC2::EC2Fleet.BaselineEbsBandwidthMbpsRequest)
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_capacityrebalance.go b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_capacityrebalance.go
similarity index 93%
rename from goformation/cloudformation/ec2/aws-ec2-ec2fleet_capacityrebalance.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_capacityrebalance.go
index 36d2fff538..d5e185c899 100644
--- a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_capacityrebalance.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_capacityrebalance.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EC2Fleet_CapacityRebalance AWS CloudFormation Resource (AWS::EC2::EC2Fleet.CapacityRebalance)
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_capacityreservationoptionsrequest.go b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_capacityreservationoptionsrequest.go
similarity index 92%
rename from goformation/cloudformation/ec2/aws-ec2-ec2fleet_capacityreservationoptionsrequest.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_capacityreservationoptionsrequest.go
index 65083deb46..01e4d73699 100644
--- a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_capacityreservationoptionsrequest.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_capacityreservationoptionsrequest.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EC2Fleet_CapacityReservationOptionsRequest AWS CloudFormation Resource (AWS::EC2::EC2Fleet.CapacityReservationOptionsRequest)
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplateconfigrequest.go b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplateconfigrequest.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplateconfigrequest.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplateconfigrequest.go
index 84263a1019..6e6a0ccd07 100644
--- a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplateconfigrequest.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplateconfigrequest.go
@@ -1,7 +1,7 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EC2Fleet_FleetLaunchTemplateConfigRequest AWS CloudFormation Resource (AWS::EC2::EC2Fleet.FleetLaunchTemplateConfigRequest)
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplateoverridesrequest.go b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplateoverridesrequest.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplateoverridesrequest.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplateoverridesrequest.go
index 22b3c0076c..2b3ced8399 100644
--- a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplateoverridesrequest.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplateoverridesrequest.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EC2Fleet_FleetLaunchTemplateOverridesRequest AWS CloudFormation Resource (AWS::EC2::EC2Fleet.FleetLaunchTemplateOverridesRequest)
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplatespecificationrequest.go b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplatespecificationrequest.go
similarity index 94%
rename from goformation/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplatespecificationrequest.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplatespecificationrequest.go
index 4335215be8..eb52e700f4 100644
--- a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplatespecificationrequest.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplatespecificationrequest.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EC2Fleet_FleetLaunchTemplateSpecificationRequest AWS CloudFormation Resource (AWS::EC2::EC2Fleet.FleetLaunchTemplateSpecificationRequest)
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_instancerequirementsrequest.go b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_instancerequirementsrequest.go
similarity index 98%
rename from goformation/cloudformation/ec2/aws-ec2-ec2fleet_instancerequirementsrequest.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_instancerequirementsrequest.go
index c8484618bf..2358f7300c 100644
--- a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_instancerequirementsrequest.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_instancerequirementsrequest.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EC2Fleet_InstanceRequirementsRequest AWS CloudFormation Resource (AWS::EC2::EC2Fleet.InstanceRequirementsRequest)
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_maintenancestrategies.go b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_maintenancestrategies.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-ec2fleet_maintenancestrategies.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_maintenancestrategies.go
index 3f49ec012b..749a4d9018 100644
--- a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_maintenancestrategies.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_maintenancestrategies.go
@@ -1,7 +1,7 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EC2Fleet_MaintenanceStrategies AWS CloudFormation Resource (AWS::EC2::EC2Fleet.MaintenanceStrategies)
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_memorygibpervcpurequest.go b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_memorygibpervcpurequest.go
similarity index 92%
rename from goformation/cloudformation/ec2/aws-ec2-ec2fleet_memorygibpervcpurequest.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_memorygibpervcpurequest.go
index 49d3e07ace..5b9f587ba3 100644
--- a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_memorygibpervcpurequest.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_memorygibpervcpurequest.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EC2Fleet_MemoryGiBPerVCpuRequest AWS CloudFormation Resource (AWS::EC2::EC2Fleet.MemoryGiBPerVCpuRequest)
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_memorymibrequest.go b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_memorymibrequest.go
similarity index 92%
rename from goformation/cloudformation/ec2/aws-ec2-ec2fleet_memorymibrequest.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_memorymibrequest.go
index 9bb7174436..7b2709c6c5 100644
--- a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_memorymibrequest.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_memorymibrequest.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EC2Fleet_MemoryMiBRequest AWS CloudFormation Resource (AWS::EC2::EC2Fleet.MemoryMiBRequest)
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_networkinterfacecountrequest.go b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_networkinterfacecountrequest.go
similarity index 93%
rename from goformation/cloudformation/ec2/aws-ec2-ec2fleet_networkinterfacecountrequest.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_networkinterfacecountrequest.go
index e4194c78c8..38c79be3cb 100644
--- a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_networkinterfacecountrequest.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_networkinterfacecountrequest.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EC2Fleet_NetworkInterfaceCountRequest AWS CloudFormation Resource (AWS::EC2::EC2Fleet.NetworkInterfaceCountRequest)
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_ondemandoptionsrequest.go b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_ondemandoptionsrequest.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-ec2fleet_ondemandoptionsrequest.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_ondemandoptionsrequest.go
index b716972cb5..00956af7f5 100644
--- a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_ondemandoptionsrequest.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_ondemandoptionsrequest.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EC2Fleet_OnDemandOptionsRequest AWS CloudFormation Resource (AWS::EC2::EC2Fleet.OnDemandOptionsRequest)
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_placement.go b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_placement.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-ec2fleet_placement.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_placement.go
index 49e90b26c4..40c11073d8 100644
--- a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_placement.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_placement.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EC2Fleet_Placement AWS CloudFormation Resource (AWS::EC2::EC2Fleet.Placement)
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_spotoptionsrequest.go b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_spotoptionsrequest.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-ec2fleet_spotoptionsrequest.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_spotoptionsrequest.go
index 374c43f326..4ab1a5f679 100644
--- a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_spotoptionsrequest.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_spotoptionsrequest.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EC2Fleet_SpotOptionsRequest AWS CloudFormation Resource (AWS::EC2::EC2Fleet.SpotOptionsRequest)
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_tagspecification.go b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_tagspecification.go
similarity index 89%
rename from goformation/cloudformation/ec2/aws-ec2-ec2fleet_tagspecification.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_tagspecification.go
index 06e6991532..95ef72480f 100644
--- a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_tagspecification.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_tagspecification.go
@@ -1,10 +1,10 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EC2Fleet_TagSpecification AWS CloudFormation Resource (AWS::EC2::EC2Fleet.TagSpecification)
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_targetcapacityspecificationrequest.go b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_targetcapacityspecificationrequest.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-ec2fleet_targetcapacityspecificationrequest.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_targetcapacityspecificationrequest.go
index e5e9639d17..64bfab89d0 100644
--- a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_targetcapacityspecificationrequest.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_targetcapacityspecificationrequest.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EC2Fleet_TargetCapacitySpecificationRequest AWS CloudFormation Resource (AWS::EC2::EC2Fleet.TargetCapacitySpecificationRequest)
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_totallocalstoragegbrequest.go b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_totallocalstoragegbrequest.go
similarity index 92%
rename from goformation/cloudformation/ec2/aws-ec2-ec2fleet_totallocalstoragegbrequest.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_totallocalstoragegbrequest.go
index f2b7a07220..543e361628 100644
--- a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_totallocalstoragegbrequest.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_totallocalstoragegbrequest.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EC2Fleet_TotalLocalStorageGBRequest AWS CloudFormation Resource (AWS::EC2::EC2Fleet.TotalLocalStorageGBRequest)
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_vcpucountrangerequest.go b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_vcpucountrangerequest.go
similarity index 92%
rename from goformation/cloudformation/ec2/aws-ec2-ec2fleet_vcpucountrangerequest.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_vcpucountrangerequest.go
index e75a59d4b6..b52fb37b3c 100644
--- a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_vcpucountrangerequest.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-ec2fleet_vcpucountrangerequest.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EC2Fleet_VCpuCountRangeRequest AWS CloudFormation Resource (AWS::EC2::EC2Fleet.VCpuCountRangeRequest)
diff --git a/goformation/cloudformation/ec2/aws-ec2-egressonlyinternetgateway.go b/pkg/goformation/cloudformation/ec2/aws-ec2-egressonlyinternetgateway.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-egressonlyinternetgateway.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-egressonlyinternetgateway.go
index 0e79fbcf7a..1b322f9da6 100644
--- a/goformation/cloudformation/ec2/aws-ec2-egressonlyinternetgateway.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-egressonlyinternetgateway.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EgressOnlyInternetGateway AWS CloudFormation Resource (AWS::EC2::EgressOnlyInternetGateway)
diff --git a/goformation/cloudformation/ec2/aws-ec2-eip.go b/pkg/goformation/cloudformation/ec2/aws-ec2-eip.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-eip.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-eip.go
index ef9599a829..5eefdffcec 100644
--- a/goformation/cloudformation/ec2/aws-ec2-eip.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-eip.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EIP AWS CloudFormation Resource (AWS::EC2::EIP)
diff --git a/goformation/cloudformation/ec2/aws-ec2-eipassociation.go b/pkg/goformation/cloudformation/ec2/aws-ec2-eipassociation.go
similarity index 97%
rename from goformation/cloudformation/ec2/aws-ec2-eipassociation.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-eipassociation.go
index 4ea312b08b..77125c8e39 100644
--- a/goformation/cloudformation/ec2/aws-ec2-eipassociation.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-eipassociation.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EIPAssociation AWS CloudFormation Resource (AWS::EC2::EIPAssociation)
diff --git a/goformation/cloudformation/ec2/aws-ec2-enclavecertificateiamroleassociation.go b/pkg/goformation/cloudformation/ec2/aws-ec2-enclavecertificateiamroleassociation.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-enclavecertificateiamroleassociation.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-enclavecertificateiamroleassociation.go
index 3c51dc1678..35bebe92f7 100644
--- a/goformation/cloudformation/ec2/aws-ec2-enclavecertificateiamroleassociation.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-enclavecertificateiamroleassociation.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EnclaveCertificateIamRoleAssociation AWS CloudFormation Resource (AWS::EC2::EnclaveCertificateIamRoleAssociation)
diff --git a/goformation/cloudformation/ec2/aws-ec2-flowlog.go b/pkg/goformation/cloudformation/ec2/aws-ec2-flowlog.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-flowlog.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-flowlog.go
index 93badbcefb..b0110bc8b4 100644
--- a/goformation/cloudformation/ec2/aws-ec2-flowlog.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-flowlog.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FlowLog AWS CloudFormation Resource (AWS::EC2::FlowLog)
diff --git a/goformation/cloudformation/ec2/aws-ec2-gatewayroutetableassociation.go b/pkg/goformation/cloudformation/ec2/aws-ec2-gatewayroutetableassociation.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-gatewayroutetableassociation.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-gatewayroutetableassociation.go
index ea5394dfc9..9513225078 100644
--- a/goformation/cloudformation/ec2/aws-ec2-gatewayroutetableassociation.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-gatewayroutetableassociation.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GatewayRouteTableAssociation AWS CloudFormation Resource (AWS::EC2::GatewayRouteTableAssociation)
diff --git a/goformation/cloudformation/ec2/aws-ec2-host.go b/pkg/goformation/cloudformation/ec2/aws-ec2-host.go
similarity index 97%
rename from goformation/cloudformation/ec2/aws-ec2-host.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-host.go
index c1ad3649d2..5a20694258 100644
--- a/goformation/cloudformation/ec2/aws-ec2-host.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-host.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Host AWS CloudFormation Resource (AWS::EC2::Host)
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance.go b/pkg/goformation/cloudformation/ec2/aws-ec2-instance.go
similarity index 98%
rename from goformation/cloudformation/ec2/aws-ec2-instance.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-instance.go
index bec351ac12..1a75e797d7 100644
--- a/goformation/cloudformation/ec2/aws-ec2-instance.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-instance.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance AWS CloudFormation Resource (AWS::EC2::Instance)
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_associationparameter.go b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_associationparameter.go
similarity index 93%
rename from goformation/cloudformation/ec2/aws-ec2-instance_associationparameter.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-instance_associationparameter.go
index fd4e558fd3..103714d973 100644
--- a/goformation/cloudformation/ec2/aws-ec2-instance_associationparameter.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_associationparameter.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance_AssociationParameter AWS CloudFormation Resource (AWS::EC2::Instance.AssociationParameter)
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_blockdevicemapping.go b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_blockdevicemapping.go
similarity index 94%
rename from goformation/cloudformation/ec2/aws-ec2-instance_blockdevicemapping.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-instance_blockdevicemapping.go
index fdd2e89f0d..c0555e029a 100644
--- a/goformation/cloudformation/ec2/aws-ec2-instance_blockdevicemapping.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_blockdevicemapping.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance_BlockDeviceMapping AWS CloudFormation Resource (AWS::EC2::Instance.BlockDeviceMapping)
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_cpuoptions.go b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_cpuoptions.go
similarity index 92%
rename from goformation/cloudformation/ec2/aws-ec2-instance_cpuoptions.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-instance_cpuoptions.go
index b441c72c28..43e41c463b 100644
--- a/goformation/cloudformation/ec2/aws-ec2-instance_cpuoptions.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_cpuoptions.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance_CpuOptions AWS CloudFormation Resource (AWS::EC2::Instance.CpuOptions)
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_creditspecification.go b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_creditspecification.go
similarity index 91%
rename from goformation/cloudformation/ec2/aws-ec2-instance_creditspecification.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-instance_creditspecification.go
index 296d1bb42d..8514130282 100644
--- a/goformation/cloudformation/ec2/aws-ec2-instance_creditspecification.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_creditspecification.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance_CreditSpecification AWS CloudFormation Resource (AWS::EC2::Instance.CreditSpecification)
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_ebs.go b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_ebs.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-instance_ebs.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-instance_ebs.go
index c7c2e60dc5..c39e755853 100644
--- a/goformation/cloudformation/ec2/aws-ec2-instance_ebs.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_ebs.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance_Ebs AWS CloudFormation Resource (AWS::EC2::Instance.Ebs)
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_elasticgpuspecification.go b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_elasticgpuspecification.go
similarity index 91%
rename from goformation/cloudformation/ec2/aws-ec2-instance_elasticgpuspecification.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-instance_elasticgpuspecification.go
index 3b5b78450d..f4614ce6d9 100644
--- a/goformation/cloudformation/ec2/aws-ec2-instance_elasticgpuspecification.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_elasticgpuspecification.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance_ElasticGpuSpecification AWS CloudFormation Resource (AWS::EC2::Instance.ElasticGpuSpecification)
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_elasticinferenceaccelerator.go b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_elasticinferenceaccelerator.go
similarity index 93%
rename from goformation/cloudformation/ec2/aws-ec2-instance_elasticinferenceaccelerator.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-instance_elasticinferenceaccelerator.go
index cea7d4965a..1ea4050446 100644
--- a/goformation/cloudformation/ec2/aws-ec2-instance_elasticinferenceaccelerator.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_elasticinferenceaccelerator.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance_ElasticInferenceAccelerator AWS CloudFormation Resource (AWS::EC2::Instance.ElasticInferenceAccelerator)
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_enclaveoptions.go b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_enclaveoptions.go
similarity index 91%
rename from goformation/cloudformation/ec2/aws-ec2-instance_enclaveoptions.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-instance_enclaveoptions.go
index 369f051810..55ee7c0230 100644
--- a/goformation/cloudformation/ec2/aws-ec2-instance_enclaveoptions.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_enclaveoptions.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance_EnclaveOptions AWS CloudFormation Resource (AWS::EC2::Instance.EnclaveOptions)
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_hibernationoptions.go b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_hibernationoptions.go
similarity index 91%
rename from goformation/cloudformation/ec2/aws-ec2-instance_hibernationoptions.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-instance_hibernationoptions.go
index eff29e3222..cfab9c4eed 100644
--- a/goformation/cloudformation/ec2/aws-ec2-instance_hibernationoptions.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_hibernationoptions.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance_HibernationOptions AWS CloudFormation Resource (AWS::EC2::Instance.HibernationOptions)
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_instanceipv6address.go b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_instanceipv6address.go
similarity index 91%
rename from goformation/cloudformation/ec2/aws-ec2-instance_instanceipv6address.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-instance_instanceipv6address.go
index a201d86850..ea56131b54 100644
--- a/goformation/cloudformation/ec2/aws-ec2-instance_instanceipv6address.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_instanceipv6address.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance_InstanceIpv6Address AWS CloudFormation Resource (AWS::EC2::Instance.InstanceIpv6Address)
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_launchtemplatespecification.go b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_launchtemplatespecification.go
similarity index 94%
rename from goformation/cloudformation/ec2/aws-ec2-instance_launchtemplatespecification.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-instance_launchtemplatespecification.go
index f3c17af96b..9399ffbe1e 100644
--- a/goformation/cloudformation/ec2/aws-ec2-instance_launchtemplatespecification.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_launchtemplatespecification.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance_LaunchTemplateSpecification AWS CloudFormation Resource (AWS::EC2::Instance.LaunchTemplateSpecification)
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_licensespecification.go b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_licensespecification.go
similarity index 92%
rename from goformation/cloudformation/ec2/aws-ec2-instance_licensespecification.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-instance_licensespecification.go
index 823066671a..4392186cb3 100644
--- a/goformation/cloudformation/ec2/aws-ec2-instance_licensespecification.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_licensespecification.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance_LicenseSpecification AWS CloudFormation Resource (AWS::EC2::Instance.LicenseSpecification)
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_networkinterface.go b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_networkinterface.go
similarity index 97%
rename from goformation/cloudformation/ec2/aws-ec2-instance_networkinterface.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-instance_networkinterface.go
index 28233cd984..b546d0ed9f 100644
--- a/goformation/cloudformation/ec2/aws-ec2-instance_networkinterface.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_networkinterface.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance_NetworkInterface AWS CloudFormation Resource (AWS::EC2::Instance.NetworkInterface)
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_nodevice.go b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_nodevice.go
similarity index 94%
rename from goformation/cloudformation/ec2/aws-ec2-instance_nodevice.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-instance_nodevice.go
index 86882c6d12..b60e793210 100644
--- a/goformation/cloudformation/ec2/aws-ec2-instance_nodevice.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_nodevice.go
@@ -1,7 +1,7 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance_NoDevice AWS CloudFormation Resource (AWS::EC2::Instance.NoDevice)
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_privateipaddressspecification.go b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_privateipaddressspecification.go
similarity index 93%
rename from goformation/cloudformation/ec2/aws-ec2-instance_privateipaddressspecification.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-instance_privateipaddressspecification.go
index f2f0e74ec4..2418b24bec 100644
--- a/goformation/cloudformation/ec2/aws-ec2-instance_privateipaddressspecification.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_privateipaddressspecification.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance_PrivateIpAddressSpecification AWS CloudFormation Resource (AWS::EC2::Instance.PrivateIpAddressSpecification)
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_ssmassociation.go b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_ssmassociation.go
similarity index 93%
rename from goformation/cloudformation/ec2/aws-ec2-instance_ssmassociation.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-instance_ssmassociation.go
index f7e9231186..26e276a0c4 100644
--- a/goformation/cloudformation/ec2/aws-ec2-instance_ssmassociation.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_ssmassociation.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance_SsmAssociation AWS CloudFormation Resource (AWS::EC2::Instance.SsmAssociation)
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_volume.go b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_volume.go
similarity index 92%
rename from goformation/cloudformation/ec2/aws-ec2-instance_volume.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-instance_volume.go
index e59f97edd9..66f0332dda 100644
--- a/goformation/cloudformation/ec2/aws-ec2-instance_volume.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-instance_volume.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance_Volume AWS CloudFormation Resource (AWS::EC2::Instance.Volume)
diff --git a/goformation/cloudformation/ec2/aws-ec2-internetgateway.go b/pkg/goformation/cloudformation/ec2/aws-ec2-internetgateway.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-internetgateway.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-internetgateway.go
index 6fdbe13362..65c3e557a8 100644
--- a/goformation/cloudformation/ec2/aws-ec2-internetgateway.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-internetgateway.go
@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InternetGateway AWS CloudFormation Resource (AWS::EC2::InternetGateway)
diff --git a/goformation/cloudformation/ec2/aws-ec2-ipam.go b/pkg/goformation/cloudformation/ec2/aws-ec2-ipam.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-ipam.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-ipam.go
index 1ce172dfc9..1ec2adbf3a 100644
--- a/goformation/cloudformation/ec2/aws-ec2-ipam.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-ipam.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // IPAM AWS CloudFormation Resource (AWS::EC2::IPAM)
diff --git a/goformation/cloudformation/ec2/aws-ec2-ipam_ipamoperatingregion.go b/pkg/goformation/cloudformation/ec2/aws-ec2-ipam_ipamoperatingregion.go
similarity index 91%
rename from goformation/cloudformation/ec2/aws-ec2-ipam_ipamoperatingregion.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-ipam_ipamoperatingregion.go
index ff2499c1ba..a70f3aa5e2 100644
--- a/goformation/cloudformation/ec2/aws-ec2-ipam_ipamoperatingregion.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-ipam_ipamoperatingregion.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // IPAM_IpamOperatingRegion AWS CloudFormation Resource (AWS::EC2::IPAM.IpamOperatingRegion)
diff --git a/goformation/cloudformation/ec2/aws-ec2-ipamallocation.go b/pkg/goformation/cloudformation/ec2/aws-ec2-ipamallocation.go
similarity index 97%
rename from goformation/cloudformation/ec2/aws-ec2-ipamallocation.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-ipamallocation.go
index 509d0178a1..5f7a5bf420 100644
--- a/goformation/cloudformation/ec2/aws-ec2-ipamallocation.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-ipamallocation.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // IPAMAllocation AWS CloudFormation Resource (AWS::EC2::IPAMAllocation)
diff --git a/goformation/cloudformation/ec2/aws-ec2-ipampool.go b/pkg/goformation/cloudformation/ec2/aws-ec2-ipampool.go
similarity index 97%
rename from goformation/cloudformation/ec2/aws-ec2-ipampool.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-ipampool.go
index ee1b4acbc4..78d5528fe7 100644
--- a/goformation/cloudformation/ec2/aws-ec2-ipampool.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-ipampool.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // IPAMPool AWS CloudFormation Resource (AWS::EC2::IPAMPool)
diff --git a/goformation/cloudformation/ec2/aws-ec2-ipampool_provisionedcidr.go b/pkg/goformation/cloudformation/ec2/aws-ec2-ipampool_provisionedcidr.go
similarity index 91%
rename from goformation/cloudformation/ec2/aws-ec2-ipampool_provisionedcidr.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-ipampool_provisionedcidr.go
index 3b088627b6..89586371ff 100644
--- a/goformation/cloudformation/ec2/aws-ec2-ipampool_provisionedcidr.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-ipampool_provisionedcidr.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // IPAMPool_ProvisionedCidr AWS CloudFormation Resource (AWS::EC2::IPAMPool.ProvisionedCidr)
diff --git a/goformation/cloudformation/ec2/aws-ec2-ipamscope.go b/pkg/goformation/cloudformation/ec2/aws-ec2-ipamscope.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-ipamscope.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-ipamscope.go
index a45d710847..f9c1240b56 100644
--- a/goformation/cloudformation/ec2/aws-ec2-ipamscope.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-ipamscope.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // IPAMScope AWS CloudFormation Resource (AWS::EC2::IPAMScope)
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate.go b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate.go
similarity index 97%
rename from goformation/cloudformation/ec2/aws-ec2-launchtemplate.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate.go
index c9d583ef5c..f1edc5d2ba 100644
--- a/goformation/cloudformation/ec2/aws-ec2-launchtemplate.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplate AWS CloudFormation Resource (AWS::EC2::LaunchTemplate)
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_acceleratorcount.go b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_acceleratorcount.go
similarity index 92%
rename from goformation/cloudformation/ec2/aws-ec2-launchtemplate_acceleratorcount.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_acceleratorcount.go
index cc17a2deee..4c61e7e3a0 100644
--- a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_acceleratorcount.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_acceleratorcount.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplate_AcceleratorCount AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.AcceleratorCount)
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_acceleratortotalmemorymib.go b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_acceleratortotalmemorymib.go
similarity index 93%
rename from goformation/cloudformation/ec2/aws-ec2-launchtemplate_acceleratortotalmemorymib.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_acceleratortotalmemorymib.go
index 86a0d983c2..2173b896fe 100644
--- a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_acceleratortotalmemorymib.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_acceleratortotalmemorymib.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplate_AcceleratorTotalMemoryMiB AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.AcceleratorTotalMemoryMiB)
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_baselineebsbandwidthmbps.go b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_baselineebsbandwidthmbps.go
similarity index 93%
rename from goformation/cloudformation/ec2/aws-ec2-launchtemplate_baselineebsbandwidthmbps.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_baselineebsbandwidthmbps.go
index f031a340f2..e1ac4a81cf 100644
--- a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_baselineebsbandwidthmbps.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_baselineebsbandwidthmbps.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplate_BaselineEbsBandwidthMbps AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.BaselineEbsBandwidthMbps)
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_blockdevicemapping.go b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_blockdevicemapping.go
similarity index 94%
rename from goformation/cloudformation/ec2/aws-ec2-launchtemplate_blockdevicemapping.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_blockdevicemapping.go
index c7bd37df6e..24af227059 100644
--- a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_blockdevicemapping.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_blockdevicemapping.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplate_BlockDeviceMapping AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.BlockDeviceMapping)
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_capacityreservationspecification.go b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_capacityreservationspecification.go
similarity index 94%
rename from goformation/cloudformation/ec2/aws-ec2-launchtemplate_capacityreservationspecification.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_capacityreservationspecification.go
index 263a2db048..48be2cdc0f 100644
--- a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_capacityreservationspecification.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_capacityreservationspecification.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplate_CapacityReservationSpecification AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.CapacityReservationSpecification)
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_capacityreservationtarget.go b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_capacityreservationtarget.go
similarity index 93%
rename from goformation/cloudformation/ec2/aws-ec2-launchtemplate_capacityreservationtarget.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_capacityreservationtarget.go
index be0d88d980..e85979c208 100644
--- a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_capacityreservationtarget.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_capacityreservationtarget.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplate_CapacityReservationTarget AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.CapacityReservationTarget)
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_cpuoptions.go b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_cpuoptions.go
similarity index 93%
rename from goformation/cloudformation/ec2/aws-ec2-launchtemplate_cpuoptions.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_cpuoptions.go
index c6fb2e801e..a02648ce2e 100644
--- a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_cpuoptions.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_cpuoptions.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplate_CpuOptions AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.CpuOptions)
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_creditspecification.go b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_creditspecification.go
similarity index 92%
rename from goformation/cloudformation/ec2/aws-ec2-launchtemplate_creditspecification.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_creditspecification.go
index 2ffd2f27c3..5541904896 100644
--- a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_creditspecification.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_creditspecification.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplate_CreditSpecification AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.CreditSpecification)
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_ebs.go b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_ebs.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-launchtemplate_ebs.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_ebs.go
index 090dacaaf4..9db15a5884 100644
--- a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_ebs.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_ebs.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplate_Ebs AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.Ebs)
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_elasticgpuspecification.go b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_elasticgpuspecification.go
similarity index 92%
rename from goformation/cloudformation/ec2/aws-ec2-launchtemplate_elasticgpuspecification.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_elasticgpuspecification.go
index 7c7ee477d4..fdfac38aac 100644
--- a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_elasticgpuspecification.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_elasticgpuspecification.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplate_ElasticGpuSpecification AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.ElasticGpuSpecification)
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_enclaveoptions.go b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_enclaveoptions.go
similarity index 91%
rename from goformation/cloudformation/ec2/aws-ec2-launchtemplate_enclaveoptions.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_enclaveoptions.go
index adcd6a72fa..ba87e91cd3 100644
--- a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_enclaveoptions.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_enclaveoptions.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplate_EnclaveOptions AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.EnclaveOptions)
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_hibernationoptions.go b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_hibernationoptions.go
similarity index 92%
rename from goformation/cloudformation/ec2/aws-ec2-launchtemplate_hibernationoptions.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_hibernationoptions.go
index e592f75d0b..36fccb3601 100644
--- a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_hibernationoptions.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_hibernationoptions.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplate_HibernationOptions AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.HibernationOptions)
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_iaminstanceprofile.go b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_iaminstanceprofile.go
similarity index 93%
rename from goformation/cloudformation/ec2/aws-ec2-launchtemplate_iaminstanceprofile.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_iaminstanceprofile.go
index cd0bd23f8d..0016c8f596 100644
--- a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_iaminstanceprofile.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_iaminstanceprofile.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplate_IamInstanceProfile AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.IamInstanceProfile)
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_instancemarketoptions.go b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_instancemarketoptions.go
similarity index 93%
rename from goformation/cloudformation/ec2/aws-ec2-launchtemplate_instancemarketoptions.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_instancemarketoptions.go
index 4d655c33aa..771d09af7e 100644
--- a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_instancemarketoptions.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_instancemarketoptions.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplate_InstanceMarketOptions AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.InstanceMarketOptions)
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_ipv6add.go b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_ipv6add.go
similarity index 91%
rename from goformation/cloudformation/ec2/aws-ec2-launchtemplate_ipv6add.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_ipv6add.go
index 55bd26301b..b728081924 100644
--- a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_ipv6add.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_ipv6add.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplate_Ipv6Add AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.Ipv6Add)
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplatedata.go b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplatedata.go
similarity index 98%
rename from goformation/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplatedata.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplatedata.go
index 8bf02812e5..d0426a3963 100644
--- a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplatedata.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplatedata.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplate_LaunchTemplateData AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.LaunchTemplateData)
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplateelasticinferenceaccelerator.go b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplateelasticinferenceaccelerator.go
similarity index 93%
rename from goformation/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplateelasticinferenceaccelerator.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplateelasticinferenceaccelerator.go
index 3b236503d7..defb07b252 100644
--- a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplateelasticinferenceaccelerator.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplateelasticinferenceaccelerator.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplate_LaunchTemplateElasticInferenceAccelerator AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.LaunchTemplateElasticInferenceAccelerator)
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplatetagspecification.go b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplatetagspecification.go
similarity index 90%
rename from goformation/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplatetagspecification.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplatetagspecification.go
index b6df59ef34..76650a94f7 100644
--- a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplatetagspecification.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplatetagspecification.go
@@ -1,10 +1,10 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplate_LaunchTemplateTagSpecification AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.LaunchTemplateTagSpecification)
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_licensespecification.go b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_licensespecification.go
similarity index 92%
rename from goformation/cloudformation/ec2/aws-ec2-launchtemplate_licensespecification.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_licensespecification.go
index 4320bc5fa6..0f2f909550 100644
--- a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_licensespecification.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_licensespecification.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplate_LicenseSpecification AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.LicenseSpecification)
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_memorygibpervcpu.go b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_memorygibpervcpu.go
similarity index 92%
rename from goformation/cloudformation/ec2/aws-ec2-launchtemplate_memorygibpervcpu.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_memorygibpervcpu.go
index 71e409dcfc..730e81c7f3 100644
--- a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_memorygibpervcpu.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_memorygibpervcpu.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplate_MemoryGiBPerVCpu AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.MemoryGiBPerVCpu)
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_memorymib.go b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_memorymib.go
similarity index 92%
rename from goformation/cloudformation/ec2/aws-ec2-launchtemplate_memorymib.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_memorymib.go
index 2669968d1f..ca2755b9d1 100644
--- a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_memorymib.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_memorymib.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplate_MemoryMiB AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.MemoryMiB)
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_metadataoptions.go b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_metadataoptions.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-launchtemplate_metadataoptions.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_metadataoptions.go
index 4f2e240492..57d1b4aee5 100644
--- a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_metadataoptions.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_metadataoptions.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplate_MetadataOptions AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.MetadataOptions)
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_monitoring.go b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_monitoring.go
similarity index 91%
rename from goformation/cloudformation/ec2/aws-ec2-launchtemplate_monitoring.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_monitoring.go
index c0043913e0..144273e242 100644
--- a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_monitoring.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_monitoring.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplate_Monitoring AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.Monitoring)
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_networkinterface.go b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_networkinterface.go
similarity index 97%
rename from goformation/cloudformation/ec2/aws-ec2-launchtemplate_networkinterface.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_networkinterface.go
index 9535d874ed..682fce8eca 100644
--- a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_networkinterface.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_networkinterface.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplate_NetworkInterface AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.NetworkInterface)
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_networkinterfacecount.go b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_networkinterfacecount.go
similarity index 93%
rename from goformation/cloudformation/ec2/aws-ec2-launchtemplate_networkinterfacecount.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_networkinterfacecount.go
index 9440235af9..2a08a902fe 100644
--- a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_networkinterfacecount.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_networkinterfacecount.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplate_NetworkInterfaceCount AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.NetworkInterfaceCount)
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_placement.go b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_placement.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-launchtemplate_placement.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_placement.go
index 2c1b3f9b69..acdeb6922a 100644
--- a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_placement.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_placement.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplate_Placement AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.Placement)
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_privateipadd.go b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_privateipadd.go
similarity index 92%
rename from goformation/cloudformation/ec2/aws-ec2-launchtemplate_privateipadd.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_privateipadd.go
index 79332abd6c..20b9495b2f 100644
--- a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_privateipadd.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_privateipadd.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplate_PrivateIpAdd AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.PrivateIpAdd)
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_spotoptions.go b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_spotoptions.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-launchtemplate_spotoptions.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_spotoptions.go
index 2dbb6f804c..f21f08e102 100644
--- a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_spotoptions.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_spotoptions.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplate_SpotOptions AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.SpotOptions)
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_tagspecification.go b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_tagspecification.go
similarity index 89%
rename from goformation/cloudformation/ec2/aws-ec2-launchtemplate_tagspecification.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_tagspecification.go
index 86b401a6be..066b359828 100644
--- a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_tagspecification.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_tagspecification.go
@@ -1,10 +1,10 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplate_TagSpecification AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.TagSpecification)
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_totallocalstoragegb.go b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_totallocalstoragegb.go
similarity index 92%
rename from goformation/cloudformation/ec2/aws-ec2-launchtemplate_totallocalstoragegb.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_totallocalstoragegb.go
index 32393c5919..c7d01532f5 100644
--- a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_totallocalstoragegb.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_totallocalstoragegb.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplate_TotalLocalStorageGB AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.TotalLocalStorageGB)
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_vcpucount.go b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_vcpucount.go
similarity index 92%
rename from goformation/cloudformation/ec2/aws-ec2-launchtemplate_vcpucount.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_vcpucount.go
index 8914f0554d..5dd9d595f1 100644
--- a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_vcpucount.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-launchtemplate_vcpucount.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplate_VCpuCount AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.VCpuCount)
diff --git a/goformation/cloudformation/ec2/aws-ec2-localgatewayroute.go b/pkg/goformation/cloudformation/ec2/aws-ec2-localgatewayroute.go
similarity index 97%
rename from goformation/cloudformation/ec2/aws-ec2-localgatewayroute.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-localgatewayroute.go
index 18b65ea3c7..073c95b107 100644
--- a/goformation/cloudformation/ec2/aws-ec2-localgatewayroute.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-localgatewayroute.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LocalGatewayRoute AWS CloudFormation Resource (AWS::EC2::LocalGatewayRoute)
diff --git a/goformation/cloudformation/ec2/aws-ec2-localgatewayroutetablevpcassociation.go b/pkg/goformation/cloudformation/ec2/aws-ec2-localgatewayroutetablevpcassociation.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-localgatewayroutetablevpcassociation.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-localgatewayroutetablevpcassociation.go
index f634877541..a9c80ca8c4 100644
--- a/goformation/cloudformation/ec2/aws-ec2-localgatewayroutetablevpcassociation.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-localgatewayroutetablevpcassociation.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LocalGatewayRouteTableVPCAssociation AWS CloudFormation Resource (AWS::EC2::LocalGatewayRouteTableVPCAssociation)
diff --git a/goformation/cloudformation/ec2/aws-ec2-localgatewayroutetablevpcassociation_tags.go b/pkg/goformation/cloudformation/ec2/aws-ec2-localgatewayroutetablevpcassociation_tags.go
similarity index 91%
rename from goformation/cloudformation/ec2/aws-ec2-localgatewayroutetablevpcassociation_tags.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-localgatewayroutetablevpcassociation_tags.go
index 7f2e2eb9a6..ff761035a9 100644
--- a/goformation/cloudformation/ec2/aws-ec2-localgatewayroutetablevpcassociation_tags.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-localgatewayroutetablevpcassociation_tags.go
@@ -1,8 +1,8 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LocalGatewayRouteTableVPCAssociation_Tags AWS CloudFormation Resource (AWS::EC2::LocalGatewayRouteTableVPCAssociation.Tags)
diff --git a/goformation/cloudformation/ec2/aws-ec2-natgateway.go b/pkg/goformation/cloudformation/ec2/aws-ec2-natgateway.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-natgateway.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-natgateway.go
index 77ccf642b5..50e3d1ce26 100644
--- a/goformation/cloudformation/ec2/aws-ec2-natgateway.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-natgateway.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NatGateway AWS CloudFormation Resource (AWS::EC2::NatGateway)
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkacl.go b/pkg/goformation/cloudformation/ec2/aws-ec2-networkacl.go
similarity index 94%
rename from goformation/cloudformation/ec2/aws-ec2-networkacl.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-networkacl.go
index bed0cb6868..2fb4631bda 100644
--- a/goformation/cloudformation/ec2/aws-ec2-networkacl.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-networkacl.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NetworkAcl AWS CloudFormation Resource (AWS::EC2::NetworkAcl)
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkaclentry.go b/pkg/goformation/cloudformation/ec2/aws-ec2-networkaclentry.go
similarity index 97%
rename from goformation/cloudformation/ec2/aws-ec2-networkaclentry.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-networkaclentry.go
index a8627bfabc..63d7a67faa 100644
--- a/goformation/cloudformation/ec2/aws-ec2-networkaclentry.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-networkaclentry.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NetworkAclEntry AWS CloudFormation Resource (AWS::EC2::NetworkAclEntry)
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkaclentry_icmp.go b/pkg/goformation/cloudformation/ec2/aws-ec2-networkaclentry_icmp.go
similarity index 92%
rename from goformation/cloudformation/ec2/aws-ec2-networkaclentry_icmp.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-networkaclentry_icmp.go
index 6ee85ec7fd..5bd04cac2f 100644
--- a/goformation/cloudformation/ec2/aws-ec2-networkaclentry_icmp.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-networkaclentry_icmp.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NetworkAclEntry_Icmp AWS CloudFormation Resource (AWS::EC2::NetworkAclEntry.Icmp)
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkaclentry_portrange.go b/pkg/goformation/cloudformation/ec2/aws-ec2-networkaclentry_portrange.go
similarity index 92%
rename from goformation/cloudformation/ec2/aws-ec2-networkaclentry_portrange.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-networkaclentry_portrange.go
index c66499b61a..68025ff847 100644
--- a/goformation/cloudformation/ec2/aws-ec2-networkaclentry_portrange.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-networkaclentry_portrange.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NetworkAclEntry_PortRange AWS CloudFormation Resource (AWS::EC2::NetworkAclEntry.PortRange)
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis.go b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis.go
index f881dab698..fd88aa6ddb 100644
--- a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NetworkInsightsAnalysis AWS CloudFormation Resource (AWS::EC2::NetworkInsightsAnalysis)
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_alternatepathhint.go b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_alternatepathhint.go
similarity index 93%
rename from goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_alternatepathhint.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_alternatepathhint.go
index ae5df33f59..44b872fe28 100644
--- a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_alternatepathhint.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_alternatepathhint.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NetworkInsightsAnalysis_AlternatePathHint AWS CloudFormation Resource (AWS::EC2::NetworkInsightsAnalysis.AlternatePathHint)
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisaclrule.go b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisaclrule.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisaclrule.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisaclrule.go
index 7d9c8feda6..7fca9a8abe 100644
--- a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisaclrule.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisaclrule.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NetworkInsightsAnalysis_AnalysisAclRule AWS CloudFormation Resource (AWS::EC2::NetworkInsightsAnalysis.AnalysisAclRule)
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysiscomponent.go b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysiscomponent.go
similarity index 93%
rename from goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysiscomponent.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysiscomponent.go
index 67c8cb1896..3ca50a7326 100644
--- a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysiscomponent.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysiscomponent.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NetworkInsightsAnalysis_AnalysisComponent AWS CloudFormation Resource (AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent)
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisloadbalancerlistener.go b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisloadbalancerlistener.go
similarity index 93%
rename from goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisloadbalancerlistener.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisloadbalancerlistener.go
index 5180d3a3d5..fae29db5fb 100644
--- a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisloadbalancerlistener.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisloadbalancerlistener.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NetworkInsightsAnalysis_AnalysisLoadBalancerListener AWS CloudFormation Resource (AWS::EC2::NetworkInsightsAnalysis.AnalysisLoadBalancerListener)
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisloadbalancertarget.go b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisloadbalancertarget.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisloadbalancertarget.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisloadbalancertarget.go
index cde7e09b7f..7e77fc34a8 100644
--- a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisloadbalancertarget.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisloadbalancertarget.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NetworkInsightsAnalysis_AnalysisLoadBalancerTarget AWS CloudFormation Resource (AWS::EC2::NetworkInsightsAnalysis.AnalysisLoadBalancerTarget)
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysispacketheader.go b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysispacketheader.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysispacketheader.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysispacketheader.go
index d4b66a639b..fc02c3bfc4 100644
--- a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysispacketheader.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysispacketheader.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NetworkInsightsAnalysis_AnalysisPacketHeader AWS CloudFormation Resource (AWS::EC2::NetworkInsightsAnalysis.AnalysisPacketHeader)
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisroutetableroute.go b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisroutetableroute.go
similarity index 97%
rename from goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisroutetableroute.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisroutetableroute.go
index 3af7a69b0a..6d7f79494a 100644
--- a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisroutetableroute.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisroutetableroute.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NetworkInsightsAnalysis_AnalysisRouteTableRoute AWS CloudFormation Resource (AWS::EC2::NetworkInsightsAnalysis.AnalysisRouteTableRoute)
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysissecuritygrouprule.go b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysissecuritygrouprule.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysissecuritygrouprule.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysissecuritygrouprule.go
index 52208da807..70a8ea7387 100644
--- a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysissecuritygrouprule.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysissecuritygrouprule.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NetworkInsightsAnalysis_AnalysisSecurityGroupRule AWS CloudFormation Resource (AWS::EC2::NetworkInsightsAnalysis.AnalysisSecurityGroupRule)
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_explanation.go b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_explanation.go
similarity index 99%
rename from goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_explanation.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_explanation.go
index 855f81d8c5..c97201d6e5 100644
--- a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_explanation.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_explanation.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NetworkInsightsAnalysis_Explanation AWS CloudFormation Resource (AWS::EC2::NetworkInsightsAnalysis.Explanation)
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_pathcomponent.go b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_pathcomponent.go
similarity index 97%
rename from goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_pathcomponent.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_pathcomponent.go
index fc1a22df82..9740afb8ff 100644
--- a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_pathcomponent.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_pathcomponent.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NetworkInsightsAnalysis_PathComponent AWS CloudFormation Resource (AWS::EC2::NetworkInsightsAnalysis.PathComponent)
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_portrange.go b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_portrange.go
similarity index 92%
rename from goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_portrange.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_portrange.go
index 4a5211e63e..29feb9144d 100644
--- a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_portrange.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_portrange.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NetworkInsightsAnalysis_PortRange AWS CloudFormation Resource (AWS::EC2::NetworkInsightsAnalysis.PortRange)
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkinsightspath.go b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightspath.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-networkinsightspath.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightspath.go
index 71153493ce..a8737bebea 100644
--- a/goformation/cloudformation/ec2/aws-ec2-networkinsightspath.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinsightspath.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NetworkInsightsPath AWS CloudFormation Resource (AWS::EC2::NetworkInsightsPath)
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkinterface.go b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinterface.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-networkinterface.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-networkinterface.go
index 8ed307abfb..76c21062a4 100644
--- a/goformation/cloudformation/ec2/aws-ec2-networkinterface.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinterface.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NetworkInterface AWS CloudFormation Resource (AWS::EC2::NetworkInterface)
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkinterface_instanceipv6address.go b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinterface_instanceipv6address.go
similarity index 92%
rename from goformation/cloudformation/ec2/aws-ec2-networkinterface_instanceipv6address.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-networkinterface_instanceipv6address.go
index b976c554c0..f1d0808bcd 100644
--- a/goformation/cloudformation/ec2/aws-ec2-networkinterface_instanceipv6address.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinterface_instanceipv6address.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NetworkInterface_InstanceIpv6Address AWS CloudFormation Resource (AWS::EC2::NetworkInterface.InstanceIpv6Address)
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkinterface_privateipaddressspecification.go b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinterface_privateipaddressspecification.go
similarity index 93%
rename from goformation/cloudformation/ec2/aws-ec2-networkinterface_privateipaddressspecification.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-networkinterface_privateipaddressspecification.go
index fb075a4265..9ac8dda7f6 100644
--- a/goformation/cloudformation/ec2/aws-ec2-networkinterface_privateipaddressspecification.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinterface_privateipaddressspecification.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NetworkInterface_PrivateIpAddressSpecification AWS CloudFormation Resource (AWS::EC2::NetworkInterface.PrivateIpAddressSpecification)
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkinterfaceattachment.go b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinterfaceattachment.go
similarity index 97%
rename from goformation/cloudformation/ec2/aws-ec2-networkinterfaceattachment.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-networkinterfaceattachment.go
index b43101b8cc..07e9c1a135 100644
--- a/goformation/cloudformation/ec2/aws-ec2-networkinterfaceattachment.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinterfaceattachment.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NetworkInterfaceAttachment AWS CloudFormation Resource (AWS::EC2::NetworkInterfaceAttachment)
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkinterfacepermission.go b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinterfacepermission.go
similarity index 97%
rename from goformation/cloudformation/ec2/aws-ec2-networkinterfacepermission.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-networkinterfacepermission.go
index f600bcef9c..60f8bfdc82 100644
--- a/goformation/cloudformation/ec2/aws-ec2-networkinterfacepermission.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-networkinterfacepermission.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NetworkInterfacePermission AWS CloudFormation Resource (AWS::EC2::NetworkInterfacePermission)
diff --git a/goformation/cloudformation/ec2/aws-ec2-placementgroup.go b/pkg/goformation/cloudformation/ec2/aws-ec2-placementgroup.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-placementgroup.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-placementgroup.go
index 1a7995c0cc..7d84d9c9b6 100644
--- a/goformation/cloudformation/ec2/aws-ec2-placementgroup.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-placementgroup.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PlacementGroup AWS CloudFormation Resource (AWS::EC2::PlacementGroup)
diff --git a/goformation/cloudformation/ec2/aws-ec2-prefixlist.go b/pkg/goformation/cloudformation/ec2/aws-ec2-prefixlist.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-prefixlist.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-prefixlist.go
index 9d21339864..b120ef8473 100644
--- a/goformation/cloudformation/ec2/aws-ec2-prefixlist.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-prefixlist.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PrefixList AWS CloudFormation Resource (AWS::EC2::PrefixList)
diff --git a/goformation/cloudformation/ec2/aws-ec2-prefixlist_entry.go b/pkg/goformation/cloudformation/ec2/aws-ec2-prefixlist_entry.go
similarity index 92%
rename from goformation/cloudformation/ec2/aws-ec2-prefixlist_entry.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-prefixlist_entry.go
index 0e7b0deaab..e95081bcef 100644
--- a/goformation/cloudformation/ec2/aws-ec2-prefixlist_entry.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-prefixlist_entry.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PrefixList_Entry AWS CloudFormation Resource (AWS::EC2::PrefixList.Entry)
diff --git a/goformation/cloudformation/ec2/aws-ec2-route.go b/pkg/goformation/cloudformation/ec2/aws-ec2-route.go
similarity index 98%
rename from goformation/cloudformation/ec2/aws-ec2-route.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-route.go
index ad44e98436..bdb4b105a0 100644
--- a/goformation/cloudformation/ec2/aws-ec2-route.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-route.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Route AWS CloudFormation Resource (AWS::EC2::Route)
diff --git a/goformation/cloudformation/ec2/aws-ec2-routetable.go b/pkg/goformation/cloudformation/ec2/aws-ec2-routetable.go
similarity index 94%
rename from goformation/cloudformation/ec2/aws-ec2-routetable.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-routetable.go
index aec98c273e..1829918eb1 100644
--- a/goformation/cloudformation/ec2/aws-ec2-routetable.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-routetable.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RouteTable AWS CloudFormation Resource (AWS::EC2::RouteTable)
diff --git a/goformation/cloudformation/ec2/aws-ec2-securitygroup.go b/pkg/goformation/cloudformation/ec2/aws-ec2-securitygroup.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-securitygroup.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-securitygroup.go
index 98e479d116..a72cdeae0f 100644
--- a/goformation/cloudformation/ec2/aws-ec2-securitygroup.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-securitygroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SecurityGroup AWS CloudFormation Resource (AWS::EC2::SecurityGroup)
diff --git a/goformation/cloudformation/ec2/aws-ec2-securitygroup_egress.go b/pkg/goformation/cloudformation/ec2/aws-ec2-securitygroup_egress.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-securitygroup_egress.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-securitygroup_egress.go
index bda7817edf..016516d1e0 100644
--- a/goformation/cloudformation/ec2/aws-ec2-securitygroup_egress.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-securitygroup_egress.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SecurityGroup_Egress AWS CloudFormation Resource (AWS::EC2::SecurityGroup.Egress)
diff --git a/goformation/cloudformation/ec2/aws-ec2-securitygroup_ingress.go b/pkg/goformation/cloudformation/ec2/aws-ec2-securitygroup_ingress.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-securitygroup_ingress.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-securitygroup_ingress.go
index 32c35ba4c0..337b747cce 100644
--- a/goformation/cloudformation/ec2/aws-ec2-securitygroup_ingress.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-securitygroup_ingress.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SecurityGroup_Ingress AWS CloudFormation Resource (AWS::EC2::SecurityGroup.Ingress)
diff --git a/goformation/cloudformation/ec2/aws-ec2-securitygroupegress.go b/pkg/goformation/cloudformation/ec2/aws-ec2-securitygroupegress.go
similarity index 97%
rename from goformation/cloudformation/ec2/aws-ec2-securitygroupegress.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-securitygroupegress.go
index 8085cebfc5..c1cb6cad4c 100644
--- a/goformation/cloudformation/ec2/aws-ec2-securitygroupegress.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-securitygroupegress.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SecurityGroupEgress AWS CloudFormation Resource (AWS::EC2::SecurityGroupEgress)
diff --git a/goformation/cloudformation/ec2/aws-ec2-securitygroupingress.go b/pkg/goformation/cloudformation/ec2/aws-ec2-securitygroupingress.go
similarity index 98%
rename from goformation/cloudformation/ec2/aws-ec2-securitygroupingress.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-securitygroupingress.go
index 286fdd3b02..94f9283afb 100644
--- a/goformation/cloudformation/ec2/aws-ec2-securitygroupingress.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-securitygroupingress.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SecurityGroupIngress AWS CloudFormation Resource (AWS::EC2::SecurityGroupIngress)
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet.go b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet.go
similarity index 98%
rename from goformation/cloudformation/ec2/aws-ec2-spotfleet.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet.go
index a42f729312..78df9293b9 100644
--- a/goformation/cloudformation/ec2/aws-ec2-spotfleet.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SpotFleet AWS CloudFormation Resource (AWS::EC2::SpotFleet)
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_acceleratorcountrequest.go b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_acceleratorcountrequest.go
similarity index 92%
rename from goformation/cloudformation/ec2/aws-ec2-spotfleet_acceleratorcountrequest.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_acceleratorcountrequest.go
index a9953e8807..e604a1fa38 100644
--- a/goformation/cloudformation/ec2/aws-ec2-spotfleet_acceleratorcountrequest.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_acceleratorcountrequest.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SpotFleet_AcceleratorCountRequest AWS CloudFormation Resource (AWS::EC2::SpotFleet.AcceleratorCountRequest)
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_acceleratortotalmemorymibrequest.go b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_acceleratortotalmemorymibrequest.go
similarity index 93%
rename from goformation/cloudformation/ec2/aws-ec2-spotfleet_acceleratortotalmemorymibrequest.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_acceleratortotalmemorymibrequest.go
index 8f95c6d932..db085b82ad 100644
--- a/goformation/cloudformation/ec2/aws-ec2-spotfleet_acceleratortotalmemorymibrequest.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_acceleratortotalmemorymibrequest.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SpotFleet_AcceleratorTotalMemoryMiBRequest AWS CloudFormation Resource (AWS::EC2::SpotFleet.AcceleratorTotalMemoryMiBRequest)
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_baselineebsbandwidthmbpsrequest.go b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_baselineebsbandwidthmbpsrequest.go
similarity index 93%
rename from goformation/cloudformation/ec2/aws-ec2-spotfleet_baselineebsbandwidthmbpsrequest.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_baselineebsbandwidthmbpsrequest.go
index 5193949bf0..080d36852a 100644
--- a/goformation/cloudformation/ec2/aws-ec2-spotfleet_baselineebsbandwidthmbpsrequest.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_baselineebsbandwidthmbpsrequest.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SpotFleet_BaselineEbsBandwidthMbpsRequest AWS CloudFormation Resource (AWS::EC2::SpotFleet.BaselineEbsBandwidthMbpsRequest)
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_blockdevicemapping.go b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_blockdevicemapping.go
similarity index 94%
rename from goformation/cloudformation/ec2/aws-ec2-spotfleet_blockdevicemapping.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_blockdevicemapping.go
index 973a3f678a..549d9f7502 100644
--- a/goformation/cloudformation/ec2/aws-ec2-spotfleet_blockdevicemapping.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_blockdevicemapping.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SpotFleet_BlockDeviceMapping AWS CloudFormation Resource (AWS::EC2::SpotFleet.BlockDeviceMapping)
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_classicloadbalancer.go b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_classicloadbalancer.go
similarity index 91%
rename from goformation/cloudformation/ec2/aws-ec2-spotfleet_classicloadbalancer.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_classicloadbalancer.go
index a557777d2d..89165c3b57 100644
--- a/goformation/cloudformation/ec2/aws-ec2-spotfleet_classicloadbalancer.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_classicloadbalancer.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SpotFleet_ClassicLoadBalancer AWS CloudFormation Resource (AWS::EC2::SpotFleet.ClassicLoadBalancer)
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_classicloadbalancersconfig.go b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_classicloadbalancersconfig.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-spotfleet_classicloadbalancersconfig.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_classicloadbalancersconfig.go
index 95efbdfcb2..7c9b4026e6 100644
--- a/goformation/cloudformation/ec2/aws-ec2-spotfleet_classicloadbalancersconfig.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_classicloadbalancersconfig.go
@@ -1,7 +1,7 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SpotFleet_ClassicLoadBalancersConfig AWS CloudFormation Resource (AWS::EC2::SpotFleet.ClassicLoadBalancersConfig)
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_ebsblockdevice.go b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_ebsblockdevice.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-spotfleet_ebsblockdevice.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_ebsblockdevice.go
index adc5f2a750..9690ba1945 100644
--- a/goformation/cloudformation/ec2/aws-ec2-spotfleet_ebsblockdevice.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_ebsblockdevice.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SpotFleet_EbsBlockDevice AWS CloudFormation Resource (AWS::EC2::SpotFleet.EbsBlockDevice)
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_fleetlaunchtemplatespecification.go b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_fleetlaunchtemplatespecification.go
similarity index 94%
rename from goformation/cloudformation/ec2/aws-ec2-spotfleet_fleetlaunchtemplatespecification.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_fleetlaunchtemplatespecification.go
index d583507fed..295a9e80d7 100644
--- a/goformation/cloudformation/ec2/aws-ec2-spotfleet_fleetlaunchtemplatespecification.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_fleetlaunchtemplatespecification.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SpotFleet_FleetLaunchTemplateSpecification AWS CloudFormation Resource (AWS::EC2::SpotFleet.FleetLaunchTemplateSpecification)
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_groupidentifier.go b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_groupidentifier.go
similarity index 91%
rename from goformation/cloudformation/ec2/aws-ec2-spotfleet_groupidentifier.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_groupidentifier.go
index 106b9cd39f..9be661e52d 100644
--- a/goformation/cloudformation/ec2/aws-ec2-spotfleet_groupidentifier.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_groupidentifier.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SpotFleet_GroupIdentifier AWS CloudFormation Resource (AWS::EC2::SpotFleet.GroupIdentifier)
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_iaminstanceprofilespecification.go b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_iaminstanceprofilespecification.go
similarity index 92%
rename from goformation/cloudformation/ec2/aws-ec2-spotfleet_iaminstanceprofilespecification.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_iaminstanceprofilespecification.go
index c368d328d2..172f677cbc 100644
--- a/goformation/cloudformation/ec2/aws-ec2-spotfleet_iaminstanceprofilespecification.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_iaminstanceprofilespecification.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SpotFleet_IamInstanceProfileSpecification AWS CloudFormation Resource (AWS::EC2::SpotFleet.IamInstanceProfileSpecification)
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_instanceipv6address.go b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_instanceipv6address.go
similarity index 91%
rename from goformation/cloudformation/ec2/aws-ec2-spotfleet_instanceipv6address.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_instanceipv6address.go
index 7ee86a2f9f..84453a3a8c 100644
--- a/goformation/cloudformation/ec2/aws-ec2-spotfleet_instanceipv6address.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_instanceipv6address.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SpotFleet_InstanceIpv6Address AWS CloudFormation Resource (AWS::EC2::SpotFleet.InstanceIpv6Address)
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_instancenetworkinterfacespecification.go b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_instancenetworkinterfacespecification.go
similarity index 97%
rename from goformation/cloudformation/ec2/aws-ec2-spotfleet_instancenetworkinterfacespecification.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_instancenetworkinterfacespecification.go
index a34192332a..bc85c56af0 100644
--- a/goformation/cloudformation/ec2/aws-ec2-spotfleet_instancenetworkinterfacespecification.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_instancenetworkinterfacespecification.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SpotFleet_InstanceNetworkInterfaceSpecification AWS CloudFormation Resource (AWS::EC2::SpotFleet.InstanceNetworkInterfaceSpecification)
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_instancerequirementsrequest.go b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_instancerequirementsrequest.go
similarity index 98%
rename from goformation/cloudformation/ec2/aws-ec2-spotfleet_instancerequirementsrequest.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_instancerequirementsrequest.go
index d161476770..1d93050e46 100644
--- a/goformation/cloudformation/ec2/aws-ec2-spotfleet_instancerequirementsrequest.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_instancerequirementsrequest.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SpotFleet_InstanceRequirementsRequest AWS CloudFormation Resource (AWS::EC2::SpotFleet.InstanceRequirementsRequest)
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_launchtemplateconfig.go b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_launchtemplateconfig.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-spotfleet_launchtemplateconfig.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_launchtemplateconfig.go
index 58b7571169..3be7d5d026 100644
--- a/goformation/cloudformation/ec2/aws-ec2-spotfleet_launchtemplateconfig.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_launchtemplateconfig.go
@@ -1,7 +1,7 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SpotFleet_LaunchTemplateConfig AWS CloudFormation Resource (AWS::EC2::SpotFleet.LaunchTemplateConfig)
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_launchtemplateoverrides.go b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_launchtemplateoverrides.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-spotfleet_launchtemplateoverrides.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_launchtemplateoverrides.go
index 36852e33d5..3fe8d11008 100644
--- a/goformation/cloudformation/ec2/aws-ec2-spotfleet_launchtemplateoverrides.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_launchtemplateoverrides.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SpotFleet_LaunchTemplateOverrides AWS CloudFormation Resource (AWS::EC2::SpotFleet.LaunchTemplateOverrides)
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_loadbalancersconfig.go b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_loadbalancersconfig.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-spotfleet_loadbalancersconfig.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_loadbalancersconfig.go
index 6fb46a54ac..712f62eb42 100644
--- a/goformation/cloudformation/ec2/aws-ec2-spotfleet_loadbalancersconfig.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_loadbalancersconfig.go
@@ -1,7 +1,7 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SpotFleet_LoadBalancersConfig AWS CloudFormation Resource (AWS::EC2::SpotFleet.LoadBalancersConfig)
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_memorygibpervcpurequest.go b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_memorygibpervcpurequest.go
similarity index 92%
rename from goformation/cloudformation/ec2/aws-ec2-spotfleet_memorygibpervcpurequest.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_memorygibpervcpurequest.go
index 5e44b4d831..0c26b0693d 100644
--- a/goformation/cloudformation/ec2/aws-ec2-spotfleet_memorygibpervcpurequest.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_memorygibpervcpurequest.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SpotFleet_MemoryGiBPerVCpuRequest AWS CloudFormation Resource (AWS::EC2::SpotFleet.MemoryGiBPerVCpuRequest)
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_memorymibrequest.go b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_memorymibrequest.go
similarity index 92%
rename from goformation/cloudformation/ec2/aws-ec2-spotfleet_memorymibrequest.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_memorymibrequest.go
index 9c3c29fe4e..ba8e93ec5b 100644
--- a/goformation/cloudformation/ec2/aws-ec2-spotfleet_memorymibrequest.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_memorymibrequest.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SpotFleet_MemoryMiBRequest AWS CloudFormation Resource (AWS::EC2::SpotFleet.MemoryMiBRequest)
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_networkinterfacecountrequest.go b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_networkinterfacecountrequest.go
similarity index 93%
rename from goformation/cloudformation/ec2/aws-ec2-spotfleet_networkinterfacecountrequest.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_networkinterfacecountrequest.go
index f5621fe180..6ed157ae15 100644
--- a/goformation/cloudformation/ec2/aws-ec2-spotfleet_networkinterfacecountrequest.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_networkinterfacecountrequest.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SpotFleet_NetworkInterfaceCountRequest AWS CloudFormation Resource (AWS::EC2::SpotFleet.NetworkInterfaceCountRequest)
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_privateipaddressspecification.go b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_privateipaddressspecification.go
similarity index 93%
rename from goformation/cloudformation/ec2/aws-ec2-spotfleet_privateipaddressspecification.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_privateipaddressspecification.go
index 0c5444897b..33e8824c5f 100644
--- a/goformation/cloudformation/ec2/aws-ec2-spotfleet_privateipaddressspecification.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_privateipaddressspecification.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SpotFleet_PrivateIpAddressSpecification AWS CloudFormation Resource (AWS::EC2::SpotFleet.PrivateIpAddressSpecification)
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotcapacityrebalance.go b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotcapacityrebalance.go
similarity index 93%
rename from goformation/cloudformation/ec2/aws-ec2-spotfleet_spotcapacityrebalance.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotcapacityrebalance.go
index bc56b35d79..40632f8a80 100644
--- a/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotcapacityrebalance.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotcapacityrebalance.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SpotFleet_SpotCapacityRebalance AWS CloudFormation Resource (AWS::EC2::SpotFleet.SpotCapacityRebalance)
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleetlaunchspecification.go b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleetlaunchspecification.go
similarity index 98%
rename from goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleetlaunchspecification.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleetlaunchspecification.go
index a1d06baea7..e9b3e53c91 100644
--- a/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleetlaunchspecification.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleetlaunchspecification.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SpotFleet_SpotFleetLaunchSpecification AWS CloudFormation Resource (AWS::EC2::SpotFleet.SpotFleetLaunchSpecification)
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleetmonitoring.go b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleetmonitoring.go
similarity index 91%
rename from goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleetmonitoring.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleetmonitoring.go
index 55b13022dc..e8243d7649 100644
--- a/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleetmonitoring.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleetmonitoring.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SpotFleet_SpotFleetMonitoring AWS CloudFormation Resource (AWS::EC2::SpotFleet.SpotFleetMonitoring)
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleetrequestconfigdata.go b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleetrequestconfigdata.go
similarity index 98%
rename from goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleetrequestconfigdata.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleetrequestconfigdata.go
index 1bc6af12e0..daee8782a8 100644
--- a/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleetrequestconfigdata.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleetrequestconfigdata.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SpotFleet_SpotFleetRequestConfigData AWS CloudFormation Resource (AWS::EC2::SpotFleet.SpotFleetRequestConfigData)
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleettagspecification.go b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleettagspecification.go
similarity index 89%
rename from goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleettagspecification.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleettagspecification.go
index 8cd8a32bc4..615b7bf75a 100644
--- a/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleettagspecification.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleettagspecification.go
@@ -1,10 +1,10 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SpotFleet_SpotFleetTagSpecification AWS CloudFormation Resource (AWS::EC2::SpotFleet.SpotFleetTagSpecification)
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotmaintenancestrategies.go b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotmaintenancestrategies.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-spotfleet_spotmaintenancestrategies.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotmaintenancestrategies.go
index 1c278da6f1..7d0dc53a38 100644
--- a/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotmaintenancestrategies.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotmaintenancestrategies.go
@@ -1,7 +1,7 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SpotFleet_SpotMaintenanceStrategies AWS CloudFormation Resource (AWS::EC2::SpotFleet.SpotMaintenanceStrategies)
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotplacement.go b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotplacement.go
similarity index 93%
rename from goformation/cloudformation/ec2/aws-ec2-spotfleet_spotplacement.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotplacement.go
index a95a7f3414..1d091db9ec 100644
--- a/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotplacement.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotplacement.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SpotFleet_SpotPlacement AWS CloudFormation Resource (AWS::EC2::SpotFleet.SpotPlacement)
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_targetgroup.go b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_targetgroup.go
similarity index 91%
rename from goformation/cloudformation/ec2/aws-ec2-spotfleet_targetgroup.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_targetgroup.go
index 8f9bc385e9..fd7bfe1573 100644
--- a/goformation/cloudformation/ec2/aws-ec2-spotfleet_targetgroup.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_targetgroup.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SpotFleet_TargetGroup AWS CloudFormation Resource (AWS::EC2::SpotFleet.TargetGroup)
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_targetgroupsconfig.go b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_targetgroupsconfig.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-spotfleet_targetgroupsconfig.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_targetgroupsconfig.go
index 3df21de291..fd58de1aca 100644
--- a/goformation/cloudformation/ec2/aws-ec2-spotfleet_targetgroupsconfig.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_targetgroupsconfig.go
@@ -1,7 +1,7 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SpotFleet_TargetGroupsConfig AWS CloudFormation Resource (AWS::EC2::SpotFleet.TargetGroupsConfig)
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_totallocalstoragegbrequest.go b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_totallocalstoragegbrequest.go
similarity index 93%
rename from goformation/cloudformation/ec2/aws-ec2-spotfleet_totallocalstoragegbrequest.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_totallocalstoragegbrequest.go
index fcc2d6182f..66f7c607b2 100644
--- a/goformation/cloudformation/ec2/aws-ec2-spotfleet_totallocalstoragegbrequest.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_totallocalstoragegbrequest.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SpotFleet_TotalLocalStorageGBRequest AWS CloudFormation Resource (AWS::EC2::SpotFleet.TotalLocalStorageGBRequest)
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_vcpucountrangerequest.go b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_vcpucountrangerequest.go
similarity index 92%
rename from goformation/cloudformation/ec2/aws-ec2-spotfleet_vcpucountrangerequest.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_vcpucountrangerequest.go
index e61ef172fc..cc0add8182 100644
--- a/goformation/cloudformation/ec2/aws-ec2-spotfleet_vcpucountrangerequest.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-spotfleet_vcpucountrangerequest.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SpotFleet_VCpuCountRangeRequest AWS CloudFormation Resource (AWS::EC2::SpotFleet.VCpuCountRangeRequest)
diff --git a/goformation/cloudformation/ec2/aws-ec2-subnet.go b/pkg/goformation/cloudformation/ec2/aws-ec2-subnet.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-subnet.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-subnet.go
index e594d1bba0..f78ba80717 100644
--- a/goformation/cloudformation/ec2/aws-ec2-subnet.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-subnet.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Subnet AWS CloudFormation Resource (AWS::EC2::Subnet)
diff --git a/goformation/cloudformation/ec2/aws-ec2-subnet_privatednsnameoptionsonlaunch.go b/pkg/goformation/cloudformation/ec2/aws-ec2-subnet_privatednsnameoptionsonlaunch.go
similarity index 94%
rename from goformation/cloudformation/ec2/aws-ec2-subnet_privatednsnameoptionsonlaunch.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-subnet_privatednsnameoptionsonlaunch.go
index e517343719..2d9d05632d 100644
--- a/goformation/cloudformation/ec2/aws-ec2-subnet_privatednsnameoptionsonlaunch.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-subnet_privatednsnameoptionsonlaunch.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Subnet_PrivateDnsNameOptionsOnLaunch AWS CloudFormation Resource (AWS::EC2::Subnet.PrivateDnsNameOptionsOnLaunch)
diff --git a/goformation/cloudformation/ec2/aws-ec2-subnetcidrblock.go b/pkg/goformation/cloudformation/ec2/aws-ec2-subnetcidrblock.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-subnetcidrblock.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-subnetcidrblock.go
index 784ca0c4a5..0e522a47bb 100644
--- a/goformation/cloudformation/ec2/aws-ec2-subnetcidrblock.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-subnetcidrblock.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SubnetCidrBlock AWS CloudFormation Resource (AWS::EC2::SubnetCidrBlock)
diff --git a/goformation/cloudformation/ec2/aws-ec2-subnetnetworkaclassociation.go b/pkg/goformation/cloudformation/ec2/aws-ec2-subnetnetworkaclassociation.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-subnetnetworkaclassociation.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-subnetnetworkaclassociation.go
index 14453346c8..25225579f8 100644
--- a/goformation/cloudformation/ec2/aws-ec2-subnetnetworkaclassociation.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-subnetnetworkaclassociation.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SubnetNetworkAclAssociation AWS CloudFormation Resource (AWS::EC2::SubnetNetworkAclAssociation)
diff --git a/goformation/cloudformation/ec2/aws-ec2-subnetroutetableassociation.go b/pkg/goformation/cloudformation/ec2/aws-ec2-subnetroutetableassociation.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-subnetroutetableassociation.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-subnetroutetableassociation.go
index fc833cafda..bc805ae17f 100644
--- a/goformation/cloudformation/ec2/aws-ec2-subnetroutetableassociation.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-subnetroutetableassociation.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SubnetRouteTableAssociation AWS CloudFormation Resource (AWS::EC2::SubnetRouteTableAssociation)
diff --git a/goformation/cloudformation/ec2/aws-ec2-trafficmirrorfilter.go b/pkg/goformation/cloudformation/ec2/aws-ec2-trafficmirrorfilter.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-trafficmirrorfilter.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-trafficmirrorfilter.go
index de0e97c2bd..97a19a1842 100644
--- a/goformation/cloudformation/ec2/aws-ec2-trafficmirrorfilter.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-trafficmirrorfilter.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TrafficMirrorFilter AWS CloudFormation Resource (AWS::EC2::TrafficMirrorFilter)
diff --git a/goformation/cloudformation/ec2/aws-ec2-trafficmirrorfilterrule.go b/pkg/goformation/cloudformation/ec2/aws-ec2-trafficmirrorfilterrule.go
similarity index 97%
rename from goformation/cloudformation/ec2/aws-ec2-trafficmirrorfilterrule.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-trafficmirrorfilterrule.go
index 02cfaeac20..65e4f379ac 100644
--- a/goformation/cloudformation/ec2/aws-ec2-trafficmirrorfilterrule.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-trafficmirrorfilterrule.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TrafficMirrorFilterRule AWS CloudFormation Resource (AWS::EC2::TrafficMirrorFilterRule)
diff --git a/goformation/cloudformation/ec2/aws-ec2-trafficmirrorfilterrule_trafficmirrorportrange.go b/pkg/goformation/cloudformation/ec2/aws-ec2-trafficmirrorfilterrule_trafficmirrorportrange.go
similarity index 93%
rename from goformation/cloudformation/ec2/aws-ec2-trafficmirrorfilterrule_trafficmirrorportrange.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-trafficmirrorfilterrule_trafficmirrorportrange.go
index 47b11f5f03..e10177362c 100644
--- a/goformation/cloudformation/ec2/aws-ec2-trafficmirrorfilterrule_trafficmirrorportrange.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-trafficmirrorfilterrule_trafficmirrorportrange.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TrafficMirrorFilterRule_TrafficMirrorPortRange AWS CloudFormation Resource (AWS::EC2::TrafficMirrorFilterRule.TrafficMirrorPortRange)
diff --git a/goformation/cloudformation/ec2/aws-ec2-trafficmirrorsession.go b/pkg/goformation/cloudformation/ec2/aws-ec2-trafficmirrorsession.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-trafficmirrorsession.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-trafficmirrorsession.go
index 544973a3a9..a56e0d8454 100644
--- a/goformation/cloudformation/ec2/aws-ec2-trafficmirrorsession.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-trafficmirrorsession.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TrafficMirrorSession AWS CloudFormation Resource (AWS::EC2::TrafficMirrorSession)
diff --git a/goformation/cloudformation/ec2/aws-ec2-trafficmirrortarget.go b/pkg/goformation/cloudformation/ec2/aws-ec2-trafficmirrortarget.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-trafficmirrortarget.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-trafficmirrortarget.go
index c20c751d9c..78225618c2 100644
--- a/goformation/cloudformation/ec2/aws-ec2-trafficmirrortarget.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-trafficmirrortarget.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TrafficMirrorTarget AWS CloudFormation Resource (AWS::EC2::TrafficMirrorTarget)
diff --git a/goformation/cloudformation/ec2/aws-ec2-transitgateway.go b/pkg/goformation/cloudformation/ec2/aws-ec2-transitgateway.go
similarity index 97%
rename from goformation/cloudformation/ec2/aws-ec2-transitgateway.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-transitgateway.go
index 5ebc32d5ab..9a857402e2 100644
--- a/goformation/cloudformation/ec2/aws-ec2-transitgateway.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-transitgateway.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TransitGateway AWS CloudFormation Resource (AWS::EC2::TransitGateway)
diff --git a/goformation/cloudformation/ec2/aws-ec2-transitgatewayattachment.go b/pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewayattachment.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-transitgatewayattachment.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewayattachment.go
index a62a91c8c1..e6572a34c2 100644
--- a/goformation/cloudformation/ec2/aws-ec2-transitgatewayattachment.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewayattachment.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TransitGatewayAttachment AWS CloudFormation Resource (AWS::EC2::TransitGatewayAttachment)
diff --git a/goformation/cloudformation/ec2/aws-ec2-transitgatewayconnect.go b/pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewayconnect.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-transitgatewayconnect.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewayconnect.go
index 3d096e5f2b..e27b03fb0b 100644
--- a/goformation/cloudformation/ec2/aws-ec2-transitgatewayconnect.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewayconnect.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TransitGatewayConnect AWS CloudFormation Resource (AWS::EC2::TransitGatewayConnect)
diff --git a/goformation/cloudformation/ec2/aws-ec2-transitgatewayconnect_transitgatewayconnectoptions.go b/pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewayconnect_transitgatewayconnectoptions.go
similarity index 92%
rename from goformation/cloudformation/ec2/aws-ec2-transitgatewayconnect_transitgatewayconnectoptions.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewayconnect_transitgatewayconnectoptions.go
index 7cce6f31af..4fbb401107 100644
--- a/goformation/cloudformation/ec2/aws-ec2-transitgatewayconnect_transitgatewayconnectoptions.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewayconnect_transitgatewayconnectoptions.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TransitGatewayConnect_TransitGatewayConnectOptions AWS CloudFormation Resource (AWS::EC2::TransitGatewayConnect.TransitGatewayConnectOptions)
diff --git a/goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastdomain.go b/pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastdomain.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastdomain.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastdomain.go
index 0e7d9fa41e..620ae8ae77 100644
--- a/goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastdomain.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastdomain.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TransitGatewayMulticastDomain AWS CloudFormation Resource (AWS::EC2::TransitGatewayMulticastDomain)
diff --git a/goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastdomainassociation.go b/pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastdomainassociation.go
similarity index 97%
rename from goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastdomainassociation.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastdomainassociation.go
index 88d5a97c26..2900bc0e86 100644
--- a/goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastdomainassociation.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastdomainassociation.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TransitGatewayMulticastDomainAssociation AWS CloudFormation Resource (AWS::EC2::TransitGatewayMulticastDomainAssociation)
diff --git a/goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastgroupmember.go b/pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastgroupmember.go
similarity index 97%
rename from goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastgroupmember.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastgroupmember.go
index 22185e7139..8ea902d5c7 100644
--- a/goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastgroupmember.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastgroupmember.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TransitGatewayMulticastGroupMember AWS CloudFormation Resource (AWS::EC2::TransitGatewayMulticastGroupMember)
diff --git a/goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastgroupsource.go b/pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastgroupsource.go
similarity index 97%
rename from goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastgroupsource.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastgroupsource.go
index 84a8dedc86..57be67617d 100644
--- a/goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastgroupsource.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastgroupsource.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TransitGatewayMulticastGroupSource AWS CloudFormation Resource (AWS::EC2::TransitGatewayMulticastGroupSource)
diff --git a/goformation/cloudformation/ec2/aws-ec2-transitgatewaypeeringattachment.go b/pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewaypeeringattachment.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-transitgatewaypeeringattachment.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewaypeeringattachment.go
index 50e859928a..67dd80b0b2 100644
--- a/goformation/cloudformation/ec2/aws-ec2-transitgatewaypeeringattachment.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewaypeeringattachment.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TransitGatewayPeeringAttachment AWS CloudFormation Resource (AWS::EC2::TransitGatewayPeeringAttachment)
diff --git a/goformation/cloudformation/ec2/aws-ec2-transitgatewaypeeringattachment_transitgatewaypeeringattachmentoptions.go b/pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewaypeeringattachment_transitgatewaypeeringattachmentoptions.go
similarity index 93%
rename from goformation/cloudformation/ec2/aws-ec2-transitgatewaypeeringattachment_transitgatewaypeeringattachmentoptions.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewaypeeringattachment_transitgatewaypeeringattachmentoptions.go
index 5e105d9e27..8be896aec9 100644
--- a/goformation/cloudformation/ec2/aws-ec2-transitgatewaypeeringattachment_transitgatewaypeeringattachmentoptions.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewaypeeringattachment_transitgatewaypeeringattachmentoptions.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TransitGatewayPeeringAttachment_TransitGatewayPeeringAttachmentOptions AWS CloudFormation Resource (AWS::EC2::TransitGatewayPeeringAttachment.TransitGatewayPeeringAttachmentOptions)
diff --git a/goformation/cloudformation/ec2/aws-ec2-transitgatewayroute.go b/pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewayroute.go
similarity index 97%
rename from goformation/cloudformation/ec2/aws-ec2-transitgatewayroute.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewayroute.go
index 103382d629..35ba0ad7f7 100644
--- a/goformation/cloudformation/ec2/aws-ec2-transitgatewayroute.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewayroute.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TransitGatewayRoute AWS CloudFormation Resource (AWS::EC2::TransitGatewayRoute)
diff --git a/goformation/cloudformation/ec2/aws-ec2-transitgatewayroutetable.go b/pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewayroutetable.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-transitgatewayroutetable.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewayroutetable.go
index 1b7f364463..3e01c2cc8b 100644
--- a/goformation/cloudformation/ec2/aws-ec2-transitgatewayroutetable.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewayroutetable.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TransitGatewayRouteTable AWS CloudFormation Resource (AWS::EC2::TransitGatewayRouteTable)
diff --git a/goformation/cloudformation/ec2/aws-ec2-transitgatewayroutetableassociation.go b/pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewayroutetableassociation.go
similarity index 97%
rename from goformation/cloudformation/ec2/aws-ec2-transitgatewayroutetableassociation.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewayroutetableassociation.go
index 66314dfa06..a81741ba6a 100644
--- a/goformation/cloudformation/ec2/aws-ec2-transitgatewayroutetableassociation.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewayroutetableassociation.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TransitGatewayRouteTableAssociation AWS CloudFormation Resource (AWS::EC2::TransitGatewayRouteTableAssociation)
diff --git a/goformation/cloudformation/ec2/aws-ec2-transitgatewayroutetablepropagation.go b/pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewayroutetablepropagation.go
similarity index 97%
rename from goformation/cloudformation/ec2/aws-ec2-transitgatewayroutetablepropagation.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewayroutetablepropagation.go
index 016b6129a1..2540135751 100644
--- a/goformation/cloudformation/ec2/aws-ec2-transitgatewayroutetablepropagation.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewayroutetablepropagation.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TransitGatewayRouteTablePropagation AWS CloudFormation Resource (AWS::EC2::TransitGatewayRouteTablePropagation)
diff --git a/goformation/cloudformation/ec2/aws-ec2-transitgatewayvpcattachment.go b/pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewayvpcattachment.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-transitgatewayvpcattachment.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewayvpcattachment.go
index b5f1a93f9c..973473f846 100644
--- a/goformation/cloudformation/ec2/aws-ec2-transitgatewayvpcattachment.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-transitgatewayvpcattachment.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TransitGatewayVpcAttachment AWS CloudFormation Resource (AWS::EC2::TransitGatewayVpcAttachment)
diff --git a/goformation/cloudformation/ec2/aws-ec2-volume.go b/pkg/goformation/cloudformation/ec2/aws-ec2-volume.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-volume.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-volume.go
index 889b92e927..bec366c008 100644
--- a/goformation/cloudformation/ec2/aws-ec2-volume.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-volume.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Volume AWS CloudFormation Resource (AWS::EC2::Volume)
diff --git a/goformation/cloudformation/ec2/aws-ec2-volumeattachment.go b/pkg/goformation/cloudformation/ec2/aws-ec2-volumeattachment.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-volumeattachment.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-volumeattachment.go
index 8edba9c7c7..e83d19445c 100644
--- a/goformation/cloudformation/ec2/aws-ec2-volumeattachment.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-volumeattachment.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VolumeAttachment AWS CloudFormation Resource (AWS::EC2::VolumeAttachment)
diff --git a/goformation/cloudformation/ec2/aws-ec2-vpc.go b/pkg/goformation/cloudformation/ec2/aws-ec2-vpc.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-vpc.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-vpc.go
index dc6fd108aa..bc2c2070a4 100644
--- a/goformation/cloudformation/ec2/aws-ec2-vpc.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-vpc.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VPC AWS CloudFormation Resource (AWS::EC2::VPC)
diff --git a/goformation/cloudformation/ec2/aws-ec2-vpccidrblock.go b/pkg/goformation/cloudformation/ec2/aws-ec2-vpccidrblock.go
similarity index 97%
rename from goformation/cloudformation/ec2/aws-ec2-vpccidrblock.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-vpccidrblock.go
index b598473e66..49d2f5e1ee 100644
--- a/goformation/cloudformation/ec2/aws-ec2-vpccidrblock.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-vpccidrblock.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VPCCidrBlock AWS CloudFormation Resource (AWS::EC2::VPCCidrBlock)
diff --git a/goformation/cloudformation/ec2/aws-ec2-vpcdhcpoptionsassociation.go b/pkg/goformation/cloudformation/ec2/aws-ec2-vpcdhcpoptionsassociation.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-vpcdhcpoptionsassociation.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-vpcdhcpoptionsassociation.go
index 1759fefc8d..56d598c582 100644
--- a/goformation/cloudformation/ec2/aws-ec2-vpcdhcpoptionsassociation.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-vpcdhcpoptionsassociation.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VPCDHCPOptionsAssociation AWS CloudFormation Resource (AWS::EC2::VPCDHCPOptionsAssociation)
diff --git a/goformation/cloudformation/ec2/aws-ec2-vpcendpoint.go b/pkg/goformation/cloudformation/ec2/aws-ec2-vpcendpoint.go
similarity index 97%
rename from goformation/cloudformation/ec2/aws-ec2-vpcendpoint.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-vpcendpoint.go
index fa429162a4..3b9f093468 100644
--- a/goformation/cloudformation/ec2/aws-ec2-vpcendpoint.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-vpcendpoint.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VPCEndpoint AWS CloudFormation Resource (AWS::EC2::VPCEndpoint)
diff --git a/goformation/cloudformation/ec2/aws-ec2-vpcendpointconnectionnotification.go b/pkg/goformation/cloudformation/ec2/aws-ec2-vpcendpointconnectionnotification.go
similarity index 97%
rename from goformation/cloudformation/ec2/aws-ec2-vpcendpointconnectionnotification.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-vpcendpointconnectionnotification.go
index 6fd49beb3e..d9c9daa5a2 100644
--- a/goformation/cloudformation/ec2/aws-ec2-vpcendpointconnectionnotification.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-vpcendpointconnectionnotification.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VPCEndpointConnectionNotification AWS CloudFormation Resource (AWS::EC2::VPCEndpointConnectionNotification)
diff --git a/goformation/cloudformation/ec2/aws-ec2-vpcendpointservice.go b/pkg/goformation/cloudformation/ec2/aws-ec2-vpcendpointservice.go
similarity index 97%
rename from goformation/cloudformation/ec2/aws-ec2-vpcendpointservice.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-vpcendpointservice.go
index 3543b28687..f5099a21f5 100644
--- a/goformation/cloudformation/ec2/aws-ec2-vpcendpointservice.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-vpcendpointservice.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VPCEndpointService AWS CloudFormation Resource (AWS::EC2::VPCEndpointService)
diff --git a/goformation/cloudformation/ec2/aws-ec2-vpcendpointservicepermissions.go b/pkg/goformation/cloudformation/ec2/aws-ec2-vpcendpointservicepermissions.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-vpcendpointservicepermissions.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-vpcendpointservicepermissions.go
index c9040f3131..feab4bc540 100644
--- a/goformation/cloudformation/ec2/aws-ec2-vpcendpointservicepermissions.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-vpcendpointservicepermissions.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VPCEndpointServicePermissions AWS CloudFormation Resource (AWS::EC2::VPCEndpointServicePermissions)
diff --git a/goformation/cloudformation/ec2/aws-ec2-vpcgatewayattachment.go b/pkg/goformation/cloudformation/ec2/aws-ec2-vpcgatewayattachment.go
similarity index 97%
rename from goformation/cloudformation/ec2/aws-ec2-vpcgatewayattachment.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-vpcgatewayattachment.go
index b93b99965f..77a53090b3 100644
--- a/goformation/cloudformation/ec2/aws-ec2-vpcgatewayattachment.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-vpcgatewayattachment.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VPCGatewayAttachment AWS CloudFormation Resource (AWS::EC2::VPCGatewayAttachment)
diff --git a/goformation/cloudformation/ec2/aws-ec2-vpcpeeringconnection.go b/pkg/goformation/cloudformation/ec2/aws-ec2-vpcpeeringconnection.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-vpcpeeringconnection.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-vpcpeeringconnection.go
index 63d4ef38e3..2016a9e0d6 100644
--- a/goformation/cloudformation/ec2/aws-ec2-vpcpeeringconnection.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-vpcpeeringconnection.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VPCPeeringConnection AWS CloudFormation Resource (AWS::EC2::VPCPeeringConnection)
diff --git a/goformation/cloudformation/ec2/aws-ec2-vpnconnection.go b/pkg/goformation/cloudformation/ec2/aws-ec2-vpnconnection.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-vpnconnection.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-vpnconnection.go
index 82deb483c9..460bb83d81 100644
--- a/goformation/cloudformation/ec2/aws-ec2-vpnconnection.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-vpnconnection.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VPNConnection AWS CloudFormation Resource (AWS::EC2::VPNConnection)
diff --git a/goformation/cloudformation/ec2/aws-ec2-vpnconnection_vpntunneloptionsspecification.go b/pkg/goformation/cloudformation/ec2/aws-ec2-vpnconnection_vpntunneloptionsspecification.go
similarity index 93%
rename from goformation/cloudformation/ec2/aws-ec2-vpnconnection_vpntunneloptionsspecification.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-vpnconnection_vpntunneloptionsspecification.go
index cb8219bbb9..e4d78628a2 100644
--- a/goformation/cloudformation/ec2/aws-ec2-vpnconnection_vpntunneloptionsspecification.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-vpnconnection_vpntunneloptionsspecification.go
@@ -1,9 +1,9 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VPNConnection_VpnTunnelOptionsSpecification AWS CloudFormation Resource (AWS::EC2::VPNConnection.VpnTunnelOptionsSpecification)
diff --git a/goformation/cloudformation/ec2/aws-ec2-vpnconnectionroute.go b/pkg/goformation/cloudformation/ec2/aws-ec2-vpnconnectionroute.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-vpnconnectionroute.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-vpnconnectionroute.go
index e55cd2cc8b..bea1855052 100644
--- a/goformation/cloudformation/ec2/aws-ec2-vpnconnectionroute.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-vpnconnectionroute.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VPNConnectionRoute AWS CloudFormation Resource (AWS::EC2::VPNConnectionRoute)
diff --git a/goformation/cloudformation/ec2/aws-ec2-vpngateway.go b/pkg/goformation/cloudformation/ec2/aws-ec2-vpngateway.go
similarity index 95%
rename from goformation/cloudformation/ec2/aws-ec2-vpngateway.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-vpngateway.go
index fc42a44a26..583eb25b74 100644
--- a/goformation/cloudformation/ec2/aws-ec2-vpngateway.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-vpngateway.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VPNGateway AWS CloudFormation Resource (AWS::EC2::VPNGateway)
diff --git a/goformation/cloudformation/ec2/aws-ec2-vpngatewayroutepropagation.go b/pkg/goformation/cloudformation/ec2/aws-ec2-vpngatewayroutepropagation.go
similarity index 96%
rename from goformation/cloudformation/ec2/aws-ec2-vpngatewayroutepropagation.go
rename to pkg/goformation/cloudformation/ec2/aws-ec2-vpngatewayroutepropagation.go
index 2325671e58..7f30b1ae14 100644
--- a/goformation/cloudformation/ec2/aws-ec2-vpngatewayroutepropagation.go
+++ b/pkg/goformation/cloudformation/ec2/aws-ec2-vpngatewayroutepropagation.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VPNGatewayRoutePropagation AWS CloudFormation Resource (AWS::EC2::VPNGatewayRoutePropagation)
diff --git a/goformation/cloudformation/ecr/aws-ecr-publicrepository.go b/pkg/goformation/cloudformation/ecr/aws-ecr-publicrepository.go
similarity index 95%
rename from goformation/cloudformation/ecr/aws-ecr-publicrepository.go
rename to pkg/goformation/cloudformation/ecr/aws-ecr-publicrepository.go
index 355b17bfbb..cee29d22fc 100644
--- a/goformation/cloudformation/ecr/aws-ecr-publicrepository.go
+++ b/pkg/goformation/cloudformation/ecr/aws-ecr-publicrepository.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PublicRepository AWS CloudFormation Resource (AWS::ECR::PublicRepository)
diff --git a/goformation/cloudformation/ecr/aws-ecr-registrypolicy.go b/pkg/goformation/cloudformation/ecr/aws-ecr-registrypolicy.go
similarity index 98%
rename from goformation/cloudformation/ecr/aws-ecr-registrypolicy.go
rename to pkg/goformation/cloudformation/ecr/aws-ecr-registrypolicy.go
index f1044fcd5c..73beaedb5f 100644
--- a/goformation/cloudformation/ecr/aws-ecr-registrypolicy.go
+++ b/pkg/goformation/cloudformation/ecr/aws-ecr-registrypolicy.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RegistryPolicy AWS CloudFormation Resource (AWS::ECR::RegistryPolicy)
diff --git a/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration.go b/pkg/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration.go
similarity index 98%
rename from goformation/cloudformation/ecr/aws-ecr-replicationconfiguration.go
rename to pkg/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration.go
index f9b0946272..3d96029505 100644
--- a/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration.go
+++ b/pkg/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReplicationConfiguration AWS CloudFormation Resource (AWS::ECR::ReplicationConfiguration)
diff --git a/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationconfiguration.go b/pkg/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationconfiguration.go
similarity index 96%
rename from goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationconfiguration.go
rename to pkg/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationconfiguration.go
index b6660623df..701b0c921b 100644
--- a/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationconfiguration.go
+++ b/pkg/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationconfiguration.go
@@ -1,7 +1,7 @@
 package ecr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReplicationConfiguration_ReplicationConfiguration AWS CloudFormation Resource (AWS::ECR::ReplicationConfiguration.ReplicationConfiguration)
diff --git a/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationdestination.go b/pkg/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationdestination.go
similarity index 93%
rename from goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationdestination.go
rename to pkg/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationdestination.go
index 2bd0d89b2e..2910484a7c 100644
--- a/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationdestination.go
+++ b/pkg/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationdestination.go
@@ -1,9 +1,9 @@
 package ecr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReplicationConfiguration_ReplicationDestination AWS CloudFormation Resource (AWS::ECR::ReplicationConfiguration.ReplicationDestination)
diff --git a/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationrule.go b/pkg/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationrule.go
similarity index 96%
rename from goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationrule.go
rename to pkg/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationrule.go
index b9a0cac0ac..2fc9bd4681 100644
--- a/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationrule.go
+++ b/pkg/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationrule.go
@@ -1,7 +1,7 @@
 package ecr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReplicationConfiguration_ReplicationRule AWS CloudFormation Resource (AWS::ECR::ReplicationConfiguration.ReplicationRule)
diff --git a/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_repositoryfilter.go b/pkg/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_repositoryfilter.go
similarity index 93%
rename from goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_repositoryfilter.go
rename to pkg/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_repositoryfilter.go
index 724c8add45..85dfb6702b 100644
--- a/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_repositoryfilter.go
+++ b/pkg/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_repositoryfilter.go
@@ -1,9 +1,9 @@
 package ecr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReplicationConfiguration_RepositoryFilter AWS CloudFormation Resource (AWS::ECR::ReplicationConfiguration.RepositoryFilter)
diff --git a/goformation/cloudformation/ecr/aws-ecr-repository.go b/pkg/goformation/cloudformation/ecr/aws-ecr-repository.go
similarity index 96%
rename from goformation/cloudformation/ecr/aws-ecr-repository.go
rename to pkg/goformation/cloudformation/ecr/aws-ecr-repository.go
index 19c22a0688..1e051b7a8b 100644
--- a/goformation/cloudformation/ecr/aws-ecr-repository.go
+++ b/pkg/goformation/cloudformation/ecr/aws-ecr-repository.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Repository AWS CloudFormation Resource (AWS::ECR::Repository)
diff --git a/goformation/cloudformation/ecr/aws-ecr-repository_encryptionconfiguration.go b/pkg/goformation/cloudformation/ecr/aws-ecr-repository_encryptionconfiguration.go
similarity index 93%
rename from goformation/cloudformation/ecr/aws-ecr-repository_encryptionconfiguration.go
rename to pkg/goformation/cloudformation/ecr/aws-ecr-repository_encryptionconfiguration.go
index 159dcf3468..8f3ef0e4fb 100644
--- a/goformation/cloudformation/ecr/aws-ecr-repository_encryptionconfiguration.go
+++ b/pkg/goformation/cloudformation/ecr/aws-ecr-repository_encryptionconfiguration.go
@@ -1,9 +1,9 @@
 package ecr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Repository_EncryptionConfiguration AWS CloudFormation Resource (AWS::ECR::Repository.EncryptionConfiguration)
diff --git a/goformation/cloudformation/ecr/aws-ecr-repository_imagescanningconfiguration.go b/pkg/goformation/cloudformation/ecr/aws-ecr-repository_imagescanningconfiguration.go
similarity index 92%
rename from goformation/cloudformation/ecr/aws-ecr-repository_imagescanningconfiguration.go
rename to pkg/goformation/cloudformation/ecr/aws-ecr-repository_imagescanningconfiguration.go
index db83430cb7..e4f54f12c4 100644
--- a/goformation/cloudformation/ecr/aws-ecr-repository_imagescanningconfiguration.go
+++ b/pkg/goformation/cloudformation/ecr/aws-ecr-repository_imagescanningconfiguration.go
@@ -1,9 +1,9 @@
 package ecr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Repository_ImageScanningConfiguration AWS CloudFormation Resource (AWS::ECR::Repository.ImageScanningConfiguration)
diff --git a/goformation/cloudformation/ecr/aws-ecr-repository_lifecyclepolicy.go b/pkg/goformation/cloudformation/ecr/aws-ecr-repository_lifecyclepolicy.go
similarity index 93%
rename from goformation/cloudformation/ecr/aws-ecr-repository_lifecyclepolicy.go
rename to pkg/goformation/cloudformation/ecr/aws-ecr-repository_lifecyclepolicy.go
index 1f18e8b218..e916d2a126 100644
--- a/goformation/cloudformation/ecr/aws-ecr-repository_lifecyclepolicy.go
+++ b/pkg/goformation/cloudformation/ecr/aws-ecr-repository_lifecyclepolicy.go
@@ -1,9 +1,9 @@
 package ecr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Repository_LifecyclePolicy AWS CloudFormation Resource (AWS::ECR::Repository.LifecyclePolicy)
diff --git a/goformation/cloudformation/ecs/aws-ecs-capacityprovider.go b/pkg/goformation/cloudformation/ecs/aws-ecs-capacityprovider.go
similarity index 95%
rename from goformation/cloudformation/ecs/aws-ecs-capacityprovider.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-capacityprovider.go
index 9e6f47a3b8..bfd04c9563 100644
--- a/goformation/cloudformation/ecs/aws-ecs-capacityprovider.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-capacityprovider.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CapacityProvider AWS CloudFormation Resource (AWS::ECS::CapacityProvider)
diff --git a/goformation/cloudformation/ecs/aws-ecs-capacityprovider_autoscalinggroupprovider.go b/pkg/goformation/cloudformation/ecs/aws-ecs-capacityprovider_autoscalinggroupprovider.go
similarity index 94%
rename from goformation/cloudformation/ecs/aws-ecs-capacityprovider_autoscalinggroupprovider.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-capacityprovider_autoscalinggroupprovider.go
index aa75e96c79..492f05ff9a 100644
--- a/goformation/cloudformation/ecs/aws-ecs-capacityprovider_autoscalinggroupprovider.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-capacityprovider_autoscalinggroupprovider.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CapacityProvider_AutoScalingGroupProvider AWS CloudFormation Resource (AWS::ECS::CapacityProvider.AutoScalingGroupProvider)
diff --git a/goformation/cloudformation/ecs/aws-ecs-capacityprovider_managedscaling.go b/pkg/goformation/cloudformation/ecs/aws-ecs-capacityprovider_managedscaling.go
similarity index 95%
rename from goformation/cloudformation/ecs/aws-ecs-capacityprovider_managedscaling.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-capacityprovider_managedscaling.go
index ce742db275..4783586c3d 100644
--- a/goformation/cloudformation/ecs/aws-ecs-capacityprovider_managedscaling.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-capacityprovider_managedscaling.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CapacityProvider_ManagedScaling AWS CloudFormation Resource (AWS::ECS::CapacityProvider.ManagedScaling)
diff --git a/goformation/cloudformation/ecs/aws-ecs-cluster.go b/pkg/goformation/cloudformation/ecs/aws-ecs-cluster.go
similarity index 96%
rename from goformation/cloudformation/ecs/aws-ecs-cluster.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-cluster.go
index 356ef76fa7..ca11ddc3de 100644
--- a/goformation/cloudformation/ecs/aws-ecs-cluster.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-cluster.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster AWS CloudFormation Resource (AWS::ECS::Cluster)
diff --git a/goformation/cloudformation/ecs/aws-ecs-cluster_capacityproviderstrategyitem.go b/pkg/goformation/cloudformation/ecs/aws-ecs-cluster_capacityproviderstrategyitem.go
similarity index 94%
rename from goformation/cloudformation/ecs/aws-ecs-cluster_capacityproviderstrategyitem.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-cluster_capacityproviderstrategyitem.go
index 3abc275061..7308cf1c98 100644
--- a/goformation/cloudformation/ecs/aws-ecs-cluster_capacityproviderstrategyitem.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-cluster_capacityproviderstrategyitem.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_CapacityProviderStrategyItem AWS CloudFormation Resource (AWS::ECS::Cluster.CapacityProviderStrategyItem)
diff --git a/goformation/cloudformation/ecs/aws-ecs-cluster_clusterconfiguration.go b/pkg/goformation/cloudformation/ecs/aws-ecs-cluster_clusterconfiguration.go
similarity index 95%
rename from goformation/cloudformation/ecs/aws-ecs-cluster_clusterconfiguration.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-cluster_clusterconfiguration.go
index 0d271d36f8..cfc615994e 100644
--- a/goformation/cloudformation/ecs/aws-ecs-cluster_clusterconfiguration.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-cluster_clusterconfiguration.go
@@ -1,7 +1,7 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_ClusterConfiguration AWS CloudFormation Resource (AWS::ECS::Cluster.ClusterConfiguration)
diff --git a/goformation/cloudformation/ecs/aws-ecs-cluster_clustersettings.go b/pkg/goformation/cloudformation/ecs/aws-ecs-cluster_clustersettings.go
similarity index 92%
rename from goformation/cloudformation/ecs/aws-ecs-cluster_clustersettings.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-cluster_clustersettings.go
index c61d9d51d4..9c0a15568b 100644
--- a/goformation/cloudformation/ecs/aws-ecs-cluster_clustersettings.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-cluster_clustersettings.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_ClusterSettings AWS CloudFormation Resource (AWS::ECS::Cluster.ClusterSettings)
diff --git a/goformation/cloudformation/ecs/aws-ecs-cluster_executecommandconfiguration.go b/pkg/goformation/cloudformation/ecs/aws-ecs-cluster_executecommandconfiguration.go
similarity index 94%
rename from goformation/cloudformation/ecs/aws-ecs-cluster_executecommandconfiguration.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-cluster_executecommandconfiguration.go
index d2bf46ffe0..ac749a8388 100644
--- a/goformation/cloudformation/ecs/aws-ecs-cluster_executecommandconfiguration.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-cluster_executecommandconfiguration.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_ExecuteCommandConfiguration AWS CloudFormation Resource (AWS::ECS::Cluster.ExecuteCommandConfiguration)
diff --git a/goformation/cloudformation/ecs/aws-ecs-cluster_executecommandlogconfiguration.go b/pkg/goformation/cloudformation/ecs/aws-ecs-cluster_executecommandlogconfiguration.go
similarity index 95%
rename from goformation/cloudformation/ecs/aws-ecs-cluster_executecommandlogconfiguration.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-cluster_executecommandlogconfiguration.go
index f83b79b74c..e6578ecc39 100644
--- a/goformation/cloudformation/ecs/aws-ecs-cluster_executecommandlogconfiguration.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-cluster_executecommandlogconfiguration.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_ExecuteCommandLogConfiguration AWS CloudFormation Resource (AWS::ECS::Cluster.ExecuteCommandLogConfiguration)
diff --git a/goformation/cloudformation/ecs/aws-ecs-clustercapacityproviderassociations.go b/pkg/goformation/cloudformation/ecs/aws-ecs-clustercapacityproviderassociations.go
similarity index 97%
rename from goformation/cloudformation/ecs/aws-ecs-clustercapacityproviderassociations.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-clustercapacityproviderassociations.go
index 46cb5cde4c..0b4721907b 100644
--- a/goformation/cloudformation/ecs/aws-ecs-clustercapacityproviderassociations.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-clustercapacityproviderassociations.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ClusterCapacityProviderAssociations AWS CloudFormation Resource (AWS::ECS::ClusterCapacityProviderAssociations)
diff --git a/goformation/cloudformation/ecs/aws-ecs-clustercapacityproviderassociations_capacityproviderstrategy.go b/pkg/goformation/cloudformation/ecs/aws-ecs-clustercapacityproviderassociations_capacityproviderstrategy.go
similarity index 94%
rename from goformation/cloudformation/ecs/aws-ecs-clustercapacityproviderassociations_capacityproviderstrategy.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-clustercapacityproviderassociations_capacityproviderstrategy.go
index de3951c5b4..7406610b80 100644
--- a/goformation/cloudformation/ecs/aws-ecs-clustercapacityproviderassociations_capacityproviderstrategy.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-clustercapacityproviderassociations_capacityproviderstrategy.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ClusterCapacityProviderAssociations_CapacityProviderStrategy AWS CloudFormation Resource (AWS::ECS::ClusterCapacityProviderAssociations.CapacityProviderStrategy)
diff --git a/goformation/cloudformation/ecs/aws-ecs-primarytaskset.go b/pkg/goformation/cloudformation/ecs/aws-ecs-primarytaskset.go
similarity index 96%
rename from goformation/cloudformation/ecs/aws-ecs-primarytaskset.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-primarytaskset.go
index 3ef69730ab..f7879ff807 100644
--- a/goformation/cloudformation/ecs/aws-ecs-primarytaskset.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-primarytaskset.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PrimaryTaskSet AWS CloudFormation Resource (AWS::ECS::PrimaryTaskSet)
diff --git a/goformation/cloudformation/ecs/aws-ecs-service.go b/pkg/goformation/cloudformation/ecs/aws-ecs-service.go
similarity index 97%
rename from goformation/cloudformation/ecs/aws-ecs-service.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-service.go
index 69ecbc83fa..40922b7a2b 100644
--- a/goformation/cloudformation/ecs/aws-ecs-service.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-service.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Service AWS CloudFormation Resource (AWS::ECS::Service)
diff --git a/goformation/cloudformation/ecs/aws-ecs-service_awsvpcconfiguration.go b/pkg/goformation/cloudformation/ecs/aws-ecs-service_awsvpcconfiguration.go
similarity index 93%
rename from goformation/cloudformation/ecs/aws-ecs-service_awsvpcconfiguration.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-service_awsvpcconfiguration.go
index 9454f49623..6b80d8f27d 100644
--- a/goformation/cloudformation/ecs/aws-ecs-service_awsvpcconfiguration.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-service_awsvpcconfiguration.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Service_AwsVpcConfiguration AWS CloudFormation Resource (AWS::ECS::Service.AwsVpcConfiguration)
diff --git a/goformation/cloudformation/ecs/aws-ecs-service_capacityproviderstrategyitem.go b/pkg/goformation/cloudformation/ecs/aws-ecs-service_capacityproviderstrategyitem.go
similarity index 94%
rename from goformation/cloudformation/ecs/aws-ecs-service_capacityproviderstrategyitem.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-service_capacityproviderstrategyitem.go
index 29d145b424..a66e284b28 100644
--- a/goformation/cloudformation/ecs/aws-ecs-service_capacityproviderstrategyitem.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-service_capacityproviderstrategyitem.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Service_CapacityProviderStrategyItem AWS CloudFormation Resource (AWS::ECS::Service.CapacityProviderStrategyItem)
diff --git a/goformation/cloudformation/ecs/aws-ecs-service_deploymentcircuitbreaker.go b/pkg/goformation/cloudformation/ecs/aws-ecs-service_deploymentcircuitbreaker.go
similarity index 92%
rename from goformation/cloudformation/ecs/aws-ecs-service_deploymentcircuitbreaker.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-service_deploymentcircuitbreaker.go
index 59df969533..046873ff0d 100644
--- a/goformation/cloudformation/ecs/aws-ecs-service_deploymentcircuitbreaker.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-service_deploymentcircuitbreaker.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Service_DeploymentCircuitBreaker AWS CloudFormation Resource (AWS::ECS::Service.DeploymentCircuitBreaker)
diff --git a/goformation/cloudformation/ecs/aws-ecs-service_deploymentconfiguration.go b/pkg/goformation/cloudformation/ecs/aws-ecs-service_deploymentconfiguration.go
similarity index 94%
rename from goformation/cloudformation/ecs/aws-ecs-service_deploymentconfiguration.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-service_deploymentconfiguration.go
index 1236780fa5..2984a51e32 100644
--- a/goformation/cloudformation/ecs/aws-ecs-service_deploymentconfiguration.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-service_deploymentconfiguration.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Service_DeploymentConfiguration AWS CloudFormation Resource (AWS::ECS::Service.DeploymentConfiguration)
diff --git a/goformation/cloudformation/ecs/aws-ecs-service_deploymentcontroller.go b/pkg/goformation/cloudformation/ecs/aws-ecs-service_deploymentcontroller.go
similarity index 91%
rename from goformation/cloudformation/ecs/aws-ecs-service_deploymentcontroller.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-service_deploymentcontroller.go
index 9e3f0663b6..c6d6fd51f6 100644
--- a/goformation/cloudformation/ecs/aws-ecs-service_deploymentcontroller.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-service_deploymentcontroller.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Service_DeploymentController AWS CloudFormation Resource (AWS::ECS::Service.DeploymentController)
diff --git a/goformation/cloudformation/ecs/aws-ecs-service_loadbalancer.go b/pkg/goformation/cloudformation/ecs/aws-ecs-service_loadbalancer.go
similarity index 94%
rename from goformation/cloudformation/ecs/aws-ecs-service_loadbalancer.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-service_loadbalancer.go
index eea3c1599e..d45935344d 100644
--- a/goformation/cloudformation/ecs/aws-ecs-service_loadbalancer.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-service_loadbalancer.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Service_LoadBalancer AWS CloudFormation Resource (AWS::ECS::Service.LoadBalancer)
diff --git a/goformation/cloudformation/ecs/aws-ecs-service_networkconfiguration.go b/pkg/goformation/cloudformation/ecs/aws-ecs-service_networkconfiguration.go
similarity index 95%
rename from goformation/cloudformation/ecs/aws-ecs-service_networkconfiguration.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-service_networkconfiguration.go
index 3b6ff07ba0..9d09bfe9b6 100644
--- a/goformation/cloudformation/ecs/aws-ecs-service_networkconfiguration.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-service_networkconfiguration.go
@@ -1,7 +1,7 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Service_NetworkConfiguration AWS CloudFormation Resource (AWS::ECS::Service.NetworkConfiguration)
diff --git a/goformation/cloudformation/ecs/aws-ecs-service_placementconstraint.go b/pkg/goformation/cloudformation/ecs/aws-ecs-service_placementconstraint.go
similarity index 92%
rename from goformation/cloudformation/ecs/aws-ecs-service_placementconstraint.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-service_placementconstraint.go
index 4fcde7954f..0b5907e979 100644
--- a/goformation/cloudformation/ecs/aws-ecs-service_placementconstraint.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-service_placementconstraint.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Service_PlacementConstraint AWS CloudFormation Resource (AWS::ECS::Service.PlacementConstraint)
diff --git a/goformation/cloudformation/ecs/aws-ecs-service_placementstrategy.go b/pkg/goformation/cloudformation/ecs/aws-ecs-service_placementstrategy.go
similarity index 92%
rename from goformation/cloudformation/ecs/aws-ecs-service_placementstrategy.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-service_placementstrategy.go
index b886ddda5c..1403329a77 100644
--- a/goformation/cloudformation/ecs/aws-ecs-service_placementstrategy.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-service_placementstrategy.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Service_PlacementStrategy AWS CloudFormation Resource (AWS::ECS::Service.PlacementStrategy)
diff --git a/goformation/cloudformation/ecs/aws-ecs-service_serviceregistry.go b/pkg/goformation/cloudformation/ecs/aws-ecs-service_serviceregistry.go
similarity index 94%
rename from goformation/cloudformation/ecs/aws-ecs-service_serviceregistry.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-service_serviceregistry.go
index 89da6f2075..b1ffd03b3e 100644
--- a/goformation/cloudformation/ecs/aws-ecs-service_serviceregistry.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-service_serviceregistry.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Service_ServiceRegistry AWS CloudFormation Resource (AWS::ECS::Service.ServiceRegistry)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition.go
similarity index 97%
rename from goformation/cloudformation/ecs/aws-ecs-taskdefinition.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition.go
index 38ce1698cd..9a3644cea0 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskdefinition.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition AWS CloudFormation Resource (AWS::ECS::TaskDefinition)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_authorizationconfig.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_authorizationconfig.go
similarity index 93%
rename from goformation/cloudformation/ecs/aws-ecs-taskdefinition_authorizationconfig.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_authorizationconfig.go
index 10f782bd20..bb4a9cf79e 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_authorizationconfig.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_authorizationconfig.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_AuthorizationConfig AWS CloudFormation Resource (AWS::ECS::TaskDefinition.AuthorizationConfig)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_containerdefinition.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_containerdefinition.go
similarity index 98%
rename from goformation/cloudformation/ecs/aws-ecs-taskdefinition_containerdefinition.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_containerdefinition.go
index 6355d77671..d73410d2c1 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_containerdefinition.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_containerdefinition.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_ContainerDefinition AWS CloudFormation Resource (AWS::ECS::TaskDefinition.ContainerDefinition)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_containerdependency.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_containerdependency.go
similarity index 93%
rename from goformation/cloudformation/ecs/aws-ecs-taskdefinition_containerdependency.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_containerdependency.go
index caa0586882..af3306f1c0 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_containerdependency.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_containerdependency.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_ContainerDependency AWS CloudFormation Resource (AWS::ECS::TaskDefinition.ContainerDependency)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_device.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_device.go
similarity index 93%
rename from goformation/cloudformation/ecs/aws-ecs-taskdefinition_device.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_device.go
index fdfcae618c..41c0ea3339 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_device.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_device.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_Device AWS CloudFormation Resource (AWS::ECS::TaskDefinition.Device)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_dockervolumeconfiguration.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_dockervolumeconfiguration.go
similarity index 95%
rename from goformation/cloudformation/ecs/aws-ecs-taskdefinition_dockervolumeconfiguration.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_dockervolumeconfiguration.go
index 999d4c1882..ce09ba7890 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_dockervolumeconfiguration.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_dockervolumeconfiguration.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_DockerVolumeConfiguration AWS CloudFormation Resource (AWS::ECS::TaskDefinition.DockerVolumeConfiguration)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_efsvolumeconfiguration.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_efsvolumeconfiguration.go
similarity index 95%
rename from goformation/cloudformation/ecs/aws-ecs-taskdefinition_efsvolumeconfiguration.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_efsvolumeconfiguration.go
index 81377d256c..1a0e5b2273 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_efsvolumeconfiguration.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_efsvolumeconfiguration.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_EFSVolumeConfiguration AWS CloudFormation Resource (AWS::ECS::TaskDefinition.EFSVolumeConfiguration)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_environmentfile.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_environmentfile.go
similarity index 92%
rename from goformation/cloudformation/ecs/aws-ecs-taskdefinition_environmentfile.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_environmentfile.go
index 04b6f8fb95..ed9ddd7f48 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_environmentfile.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_environmentfile.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_EnvironmentFile AWS CloudFormation Resource (AWS::ECS::TaskDefinition.EnvironmentFile)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_ephemeralstorage.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_ephemeralstorage.go
similarity index 91%
rename from goformation/cloudformation/ecs/aws-ecs-taskdefinition_ephemeralstorage.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_ephemeralstorage.go
index c51deec288..15b34c65aa 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_ephemeralstorage.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_ephemeralstorage.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_EphemeralStorage AWS CloudFormation Resource (AWS::ECS::TaskDefinition.EphemeralStorage)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_firelensconfiguration.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_firelensconfiguration.go
similarity index 93%
rename from goformation/cloudformation/ecs/aws-ecs-taskdefinition_firelensconfiguration.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_firelensconfiguration.go
index dc9e748106..b9874b48ce 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_firelensconfiguration.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_firelensconfiguration.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_FirelensConfiguration AWS CloudFormation Resource (AWS::ECS::TaskDefinition.FirelensConfiguration)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_healthcheck.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_healthcheck.go
similarity index 94%
rename from goformation/cloudformation/ecs/aws-ecs-taskdefinition_healthcheck.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_healthcheck.go
index 3f332044b7..b7c540b1fb 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_healthcheck.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_healthcheck.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_HealthCheck AWS CloudFormation Resource (AWS::ECS::TaskDefinition.HealthCheck)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_hostentry.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_hostentry.go
similarity index 93%
rename from goformation/cloudformation/ecs/aws-ecs-taskdefinition_hostentry.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_hostentry.go
index 15f3cb0f68..8ef6fedf0e 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_hostentry.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_hostentry.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_HostEntry AWS CloudFormation Resource (AWS::ECS::TaskDefinition.HostEntry)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_hostvolumeproperties.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_hostvolumeproperties.go
similarity index 91%
rename from goformation/cloudformation/ecs/aws-ecs-taskdefinition_hostvolumeproperties.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_hostvolumeproperties.go
index 9d8e34ce33..f0c66c9d1e 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_hostvolumeproperties.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_hostvolumeproperties.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_HostVolumeProperties AWS CloudFormation Resource (AWS::ECS::TaskDefinition.HostVolumeProperties)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_inferenceaccelerator.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_inferenceaccelerator.go
similarity index 93%
rename from goformation/cloudformation/ecs/aws-ecs-taskdefinition_inferenceaccelerator.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_inferenceaccelerator.go
index da5dc2c5ef..991fc91e3b 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_inferenceaccelerator.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_inferenceaccelerator.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_InferenceAccelerator AWS CloudFormation Resource (AWS::ECS::TaskDefinition.InferenceAccelerator)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_kernelcapabilities.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_kernelcapabilities.go
similarity index 92%
rename from goformation/cloudformation/ecs/aws-ecs-taskdefinition_kernelcapabilities.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_kernelcapabilities.go
index b4b4fee78b..69256323a9 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_kernelcapabilities.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_kernelcapabilities.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_KernelCapabilities AWS CloudFormation Resource (AWS::ECS::TaskDefinition.KernelCapabilities)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_keyvaluepair.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_keyvaluepair.go
similarity index 93%
rename from goformation/cloudformation/ecs/aws-ecs-taskdefinition_keyvaluepair.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_keyvaluepair.go
index 50ca0c0bcc..1e9a2a551b 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_keyvaluepair.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_keyvaluepair.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_KeyValuePair AWS CloudFormation Resource (AWS::ECS::TaskDefinition.KeyValuePair)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_linuxparameters.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_linuxparameters.go
similarity index 96%
rename from goformation/cloudformation/ecs/aws-ecs-taskdefinition_linuxparameters.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_linuxparameters.go
index 58a7bf742d..4c3687d5a5 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_linuxparameters.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_linuxparameters.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_LinuxParameters AWS CloudFormation Resource (AWS::ECS::TaskDefinition.LinuxParameters)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_logconfiguration.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_logconfiguration.go
similarity index 94%
rename from goformation/cloudformation/ecs/aws-ecs-taskdefinition_logconfiguration.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_logconfiguration.go
index cbe3bd3bb9..57ef080934 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_logconfiguration.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_logconfiguration.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_LogConfiguration AWS CloudFormation Resource (AWS::ECS::TaskDefinition.LogConfiguration)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_mountpoint.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_mountpoint.go
similarity index 94%
rename from goformation/cloudformation/ecs/aws-ecs-taskdefinition_mountpoint.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_mountpoint.go
index 5920c32350..861e0a8996 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_mountpoint.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_mountpoint.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_MountPoint AWS CloudFormation Resource (AWS::ECS::TaskDefinition.MountPoint)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_portmapping.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_portmapping.go
similarity index 94%
rename from goformation/cloudformation/ecs/aws-ecs-taskdefinition_portmapping.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_portmapping.go
index 04f502014c..1fa552cb71 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_portmapping.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_portmapping.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_PortMapping AWS CloudFormation Resource (AWS::ECS::TaskDefinition.PortMapping)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_proxyconfiguration.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_proxyconfiguration.go
similarity index 94%
rename from goformation/cloudformation/ecs/aws-ecs-taskdefinition_proxyconfiguration.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_proxyconfiguration.go
index 2f35f9d4c3..8e3a7881e3 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_proxyconfiguration.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_proxyconfiguration.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_ProxyConfiguration AWS CloudFormation Resource (AWS::ECS::TaskDefinition.ProxyConfiguration)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_repositorycredentials.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_repositorycredentials.go
similarity index 92%
rename from goformation/cloudformation/ecs/aws-ecs-taskdefinition_repositorycredentials.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_repositorycredentials.go
index 50451c0104..ee55231d3c 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_repositorycredentials.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_repositorycredentials.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_RepositoryCredentials AWS CloudFormation Resource (AWS::ECS::TaskDefinition.RepositoryCredentials)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_resourcerequirement.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_resourcerequirement.go
similarity index 92%
rename from goformation/cloudformation/ecs/aws-ecs-taskdefinition_resourcerequirement.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_resourcerequirement.go
index dc1537da77..3e623a0cec 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_resourcerequirement.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_resourcerequirement.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_ResourceRequirement AWS CloudFormation Resource (AWS::ECS::TaskDefinition.ResourceRequirement)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_runtimeplatform.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_runtimeplatform.go
similarity index 93%
rename from goformation/cloudformation/ecs/aws-ecs-taskdefinition_runtimeplatform.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_runtimeplatform.go
index 3bd2ae4a85..4f73fc2936 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_runtimeplatform.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_runtimeplatform.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_RuntimePlatform AWS CloudFormation Resource (AWS::ECS::TaskDefinition.RuntimePlatform)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_secret.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_secret.go
similarity index 92%
rename from goformation/cloudformation/ecs/aws-ecs-taskdefinition_secret.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_secret.go
index 53e832d1c4..b490094424 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_secret.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_secret.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_Secret AWS CloudFormation Resource (AWS::ECS::TaskDefinition.Secret)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_systemcontrol.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_systemcontrol.go
similarity index 92%
rename from goformation/cloudformation/ecs/aws-ecs-taskdefinition_systemcontrol.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_systemcontrol.go
index 38513e45e4..6e1b983cf2 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_systemcontrol.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_systemcontrol.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_SystemControl AWS CloudFormation Resource (AWS::ECS::TaskDefinition.SystemControl)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_taskdefinitionplacementconstraint.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_taskdefinitionplacementconstraint.go
similarity index 93%
rename from goformation/cloudformation/ecs/aws-ecs-taskdefinition_taskdefinitionplacementconstraint.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_taskdefinitionplacementconstraint.go
index daedae473f..eed79d1fa7 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_taskdefinitionplacementconstraint.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_taskdefinitionplacementconstraint.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_TaskDefinitionPlacementConstraint AWS CloudFormation Resource (AWS::ECS::TaskDefinition.TaskDefinitionPlacementConstraint)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_tmpfs.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_tmpfs.go
similarity index 93%
rename from goformation/cloudformation/ecs/aws-ecs-taskdefinition_tmpfs.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_tmpfs.go
index 04ee29aa34..750cfd03a1 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_tmpfs.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_tmpfs.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_Tmpfs AWS CloudFormation Resource (AWS::ECS::TaskDefinition.Tmpfs)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_ulimit.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_ulimit.go
similarity index 93%
rename from goformation/cloudformation/ecs/aws-ecs-taskdefinition_ulimit.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_ulimit.go
index d407b7e65a..c71213ca6f 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_ulimit.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_ulimit.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_Ulimit AWS CloudFormation Resource (AWS::ECS::TaskDefinition.Ulimit)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_volume.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_volume.go
similarity index 94%
rename from goformation/cloudformation/ecs/aws-ecs-taskdefinition_volume.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_volume.go
index 6c967626d1..8a37a29eab 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_volume.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_volume.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_Volume AWS CloudFormation Resource (AWS::ECS::TaskDefinition.Volume)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_volumefrom.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_volumefrom.go
similarity index 93%
rename from goformation/cloudformation/ecs/aws-ecs-taskdefinition_volumefrom.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_volumefrom.go
index efaa5c94bf..7cac588225 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_volumefrom.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskdefinition_volumefrom.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_VolumeFrom AWS CloudFormation Resource (AWS::ECS::TaskDefinition.VolumeFrom)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskset.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskset.go
similarity index 97%
rename from goformation/cloudformation/ecs/aws-ecs-taskset.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskset.go
index f8b77b0511..d9b3245f04 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskset.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskset.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskSet AWS CloudFormation Resource (AWS::ECS::TaskSet)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskset_awsvpcconfiguration.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskset_awsvpcconfiguration.go
similarity index 93%
rename from goformation/cloudformation/ecs/aws-ecs-taskset_awsvpcconfiguration.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskset_awsvpcconfiguration.go
index 4ca4774cf9..511fc1cebf 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskset_awsvpcconfiguration.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskset_awsvpcconfiguration.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskSet_AwsVpcConfiguration AWS CloudFormation Resource (AWS::ECS::TaskSet.AwsVpcConfiguration)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskset_loadbalancer.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskset_loadbalancer.go
similarity index 94%
rename from goformation/cloudformation/ecs/aws-ecs-taskset_loadbalancer.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskset_loadbalancer.go
index eae1cf2bc7..9db2fd2591 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskset_loadbalancer.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskset_loadbalancer.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskSet_LoadBalancer AWS CloudFormation Resource (AWS::ECS::TaskSet.LoadBalancer)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskset_networkconfiguration.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskset_networkconfiguration.go
similarity index 95%
rename from goformation/cloudformation/ecs/aws-ecs-taskset_networkconfiguration.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskset_networkconfiguration.go
index db0070bbc5..fbd3a280d0 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskset_networkconfiguration.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskset_networkconfiguration.go
@@ -1,7 +1,7 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskSet_NetworkConfiguration AWS CloudFormation Resource (AWS::ECS::TaskSet.NetworkConfiguration)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskset_scale.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskset_scale.go
similarity index 92%
rename from goformation/cloudformation/ecs/aws-ecs-taskset_scale.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskset_scale.go
index 8adb0fccea..d4e42b5cb1 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskset_scale.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskset_scale.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskSet_Scale AWS CloudFormation Resource (AWS::ECS::TaskSet.Scale)
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskset_serviceregistry.go b/pkg/goformation/cloudformation/ecs/aws-ecs-taskset_serviceregistry.go
similarity index 94%
rename from goformation/cloudformation/ecs/aws-ecs-taskset_serviceregistry.go
rename to pkg/goformation/cloudformation/ecs/aws-ecs-taskset_serviceregistry.go
index 2319ebf029..1ea187e6d6 100644
--- a/goformation/cloudformation/ecs/aws-ecs-taskset_serviceregistry.go
+++ b/pkg/goformation/cloudformation/ecs/aws-ecs-taskset_serviceregistry.go
@@ -1,9 +1,9 @@
 package ecs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskSet_ServiceRegistry AWS CloudFormation Resource (AWS::ECS::TaskSet.ServiceRegistry)
diff --git a/goformation/cloudformation/efs/aws-efs-accesspoint.go b/pkg/goformation/cloudformation/efs/aws-efs-accesspoint.go
similarity index 97%
rename from goformation/cloudformation/efs/aws-efs-accesspoint.go
rename to pkg/goformation/cloudformation/efs/aws-efs-accesspoint.go
index bfb58da404..405b5951d8 100644
--- a/goformation/cloudformation/efs/aws-efs-accesspoint.go
+++ b/pkg/goformation/cloudformation/efs/aws-efs-accesspoint.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AccessPoint AWS CloudFormation Resource (AWS::EFS::AccessPoint)
diff --git a/goformation/cloudformation/efs/aws-efs-accesspoint_accesspointtag.go b/pkg/goformation/cloudformation/efs/aws-efs-accesspoint_accesspointtag.go
similarity index 92%
rename from goformation/cloudformation/efs/aws-efs-accesspoint_accesspointtag.go
rename to pkg/goformation/cloudformation/efs/aws-efs-accesspoint_accesspointtag.go
index 5104dae25f..476ef8eee0 100644
--- a/goformation/cloudformation/efs/aws-efs-accesspoint_accesspointtag.go
+++ b/pkg/goformation/cloudformation/efs/aws-efs-accesspoint_accesspointtag.go
@@ -1,9 +1,9 @@
 package efs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AccessPoint_AccessPointTag AWS CloudFormation Resource (AWS::EFS::AccessPoint.AccessPointTag)
diff --git a/goformation/cloudformation/efs/aws-efs-accesspoint_creationinfo.go b/pkg/goformation/cloudformation/efs/aws-efs-accesspoint_creationinfo.go
similarity index 93%
rename from goformation/cloudformation/efs/aws-efs-accesspoint_creationinfo.go
rename to pkg/goformation/cloudformation/efs/aws-efs-accesspoint_creationinfo.go
index 6242f25bce..680e669328 100644
--- a/goformation/cloudformation/efs/aws-efs-accesspoint_creationinfo.go
+++ b/pkg/goformation/cloudformation/efs/aws-efs-accesspoint_creationinfo.go
@@ -1,9 +1,9 @@
 package efs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AccessPoint_CreationInfo AWS CloudFormation Resource (AWS::EFS::AccessPoint.CreationInfo)
diff --git a/goformation/cloudformation/efs/aws-efs-accesspoint_posixuser.go b/pkg/goformation/cloudformation/efs/aws-efs-accesspoint_posixuser.go
similarity index 93%
rename from goformation/cloudformation/efs/aws-efs-accesspoint_posixuser.go
rename to pkg/goformation/cloudformation/efs/aws-efs-accesspoint_posixuser.go
index c40bed21a0..8926b7d79d 100644
--- a/goformation/cloudformation/efs/aws-efs-accesspoint_posixuser.go
+++ b/pkg/goformation/cloudformation/efs/aws-efs-accesspoint_posixuser.go
@@ -1,9 +1,9 @@
 package efs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AccessPoint_PosixUser AWS CloudFormation Resource (AWS::EFS::AccessPoint.PosixUser)
diff --git a/goformation/cloudformation/efs/aws-efs-accesspoint_rootdirectory.go b/pkg/goformation/cloudformation/efs/aws-efs-accesspoint_rootdirectory.go
similarity index 92%
rename from goformation/cloudformation/efs/aws-efs-accesspoint_rootdirectory.go
rename to pkg/goformation/cloudformation/efs/aws-efs-accesspoint_rootdirectory.go
index 299f187307..7d397f89d5 100644
--- a/goformation/cloudformation/efs/aws-efs-accesspoint_rootdirectory.go
+++ b/pkg/goformation/cloudformation/efs/aws-efs-accesspoint_rootdirectory.go
@@ -1,9 +1,9 @@
 package efs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AccessPoint_RootDirectory AWS CloudFormation Resource (AWS::EFS::AccessPoint.RootDirectory)
diff --git a/goformation/cloudformation/efs/aws-efs-filesystem.go b/pkg/goformation/cloudformation/efs/aws-efs-filesystem.go
similarity index 97%
rename from goformation/cloudformation/efs/aws-efs-filesystem.go
rename to pkg/goformation/cloudformation/efs/aws-efs-filesystem.go
index 1c7e004a70..47e0bc3b9b 100644
--- a/goformation/cloudformation/efs/aws-efs-filesystem.go
+++ b/pkg/goformation/cloudformation/efs/aws-efs-filesystem.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FileSystem AWS CloudFormation Resource (AWS::EFS::FileSystem)
diff --git a/goformation/cloudformation/efs/aws-efs-filesystem_backuppolicy.go b/pkg/goformation/cloudformation/efs/aws-efs-filesystem_backuppolicy.go
similarity index 91%
rename from goformation/cloudformation/efs/aws-efs-filesystem_backuppolicy.go
rename to pkg/goformation/cloudformation/efs/aws-efs-filesystem_backuppolicy.go
index 55e268a4f2..c1bd52358f 100644
--- a/goformation/cloudformation/efs/aws-efs-filesystem_backuppolicy.go
+++ b/pkg/goformation/cloudformation/efs/aws-efs-filesystem_backuppolicy.go
@@ -1,9 +1,9 @@
 package efs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FileSystem_BackupPolicy AWS CloudFormation Resource (AWS::EFS::FileSystem.BackupPolicy)
diff --git a/goformation/cloudformation/efs/aws-efs-filesystem_elasticfilesystemtag.go b/pkg/goformation/cloudformation/efs/aws-efs-filesystem_elasticfilesystemtag.go
similarity index 92%
rename from goformation/cloudformation/efs/aws-efs-filesystem_elasticfilesystemtag.go
rename to pkg/goformation/cloudformation/efs/aws-efs-filesystem_elasticfilesystemtag.go
index cd08aba794..f6064f7e44 100644
--- a/goformation/cloudformation/efs/aws-efs-filesystem_elasticfilesystemtag.go
+++ b/pkg/goformation/cloudformation/efs/aws-efs-filesystem_elasticfilesystemtag.go
@@ -1,9 +1,9 @@
 package efs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FileSystem_ElasticFileSystemTag AWS CloudFormation Resource (AWS::EFS::FileSystem.ElasticFileSystemTag)
diff --git a/goformation/cloudformation/efs/aws-efs-filesystem_lifecyclepolicy.go b/pkg/goformation/cloudformation/efs/aws-efs-filesystem_lifecyclepolicy.go
similarity index 93%
rename from goformation/cloudformation/efs/aws-efs-filesystem_lifecyclepolicy.go
rename to pkg/goformation/cloudformation/efs/aws-efs-filesystem_lifecyclepolicy.go
index 475e827d7e..a7b0e987d3 100644
--- a/goformation/cloudformation/efs/aws-efs-filesystem_lifecyclepolicy.go
+++ b/pkg/goformation/cloudformation/efs/aws-efs-filesystem_lifecyclepolicy.go
@@ -1,9 +1,9 @@
 package efs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FileSystem_LifecyclePolicy AWS CloudFormation Resource (AWS::EFS::FileSystem.LifecyclePolicy)
diff --git a/goformation/cloudformation/efs/aws-efs-mounttarget.go b/pkg/goformation/cloudformation/efs/aws-efs-mounttarget.go
similarity index 97%
rename from goformation/cloudformation/efs/aws-efs-mounttarget.go
rename to pkg/goformation/cloudformation/efs/aws-efs-mounttarget.go
index b7b552d936..94f079944d 100644
--- a/goformation/cloudformation/efs/aws-efs-mounttarget.go
+++ b/pkg/goformation/cloudformation/efs/aws-efs-mounttarget.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MountTarget AWS CloudFormation Resource (AWS::EFS::MountTarget)
diff --git a/goformation/cloudformation/eks/aws-eks-access-config.go b/pkg/goformation/cloudformation/eks/aws-eks-access-config.go
similarity index 90%
rename from goformation/cloudformation/eks/aws-eks-access-config.go
rename to pkg/goformation/cloudformation/eks/aws-eks-access-config.go
index 836c9e955a..93a0b742c7 100644
--- a/goformation/cloudformation/eks/aws-eks-access-config.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-access-config.go
@@ -1,7 +1,7 @@
 package eks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 )
 
 // Cluster_AccessConfig describes the access configuration for the cluster.
diff --git a/goformation/cloudformation/eks/aws-eks-access-entry.go b/pkg/goformation/cloudformation/eks/aws-eks-access-entry.go
similarity index 94%
rename from goformation/cloudformation/eks/aws-eks-access-entry.go
rename to pkg/goformation/cloudformation/eks/aws-eks-access-entry.go
index e79f254432..e9e92b73c8 100644
--- a/goformation/cloudformation/eks/aws-eks-access-entry.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-access-entry.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 type AccessEntry struct {
diff --git a/goformation/cloudformation/eks/aws-eks-access-entry_access_scope.go b/pkg/goformation/cloudformation/eks/aws-eks-access-entry_access_scope.go
similarity index 88%
rename from goformation/cloudformation/eks/aws-eks-access-entry_access_scope.go
rename to pkg/goformation/cloudformation/eks/aws-eks-access-entry_access_scope.go
index 12754c1c41..e0c17a8fd4 100644
--- a/goformation/cloudformation/eks/aws-eks-access-entry_access_scope.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-access-entry_access_scope.go
@@ -1,7 +1,7 @@
 package eks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 )
 
 type AccessEntry_AccessScope struct {
diff --git a/goformation/cloudformation/eks/aws-eks-access-entry_policy.go b/pkg/goformation/cloudformation/eks/aws-eks-access-entry_policy.go
similarity index 89%
rename from goformation/cloudformation/eks/aws-eks-access-entry_policy.go
rename to pkg/goformation/cloudformation/eks/aws-eks-access-entry_policy.go
index b6b8440f27..4025f7a9b4 100644
--- a/goformation/cloudformation/eks/aws-eks-access-entry_policy.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-access-entry_policy.go
@@ -1,9 +1,9 @@
 package eks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 type AccessEntry_AccessPolicy struct {
diff --git a/goformation/cloudformation/eks/aws-eks-addon.go b/pkg/goformation/cloudformation/eks/aws-eks-addon.go
similarity index 95%
rename from goformation/cloudformation/eks/aws-eks-addon.go
rename to pkg/goformation/cloudformation/eks/aws-eks-addon.go
index 311fab0065..32a3a3fdb7 100644
--- a/goformation/cloudformation/eks/aws-eks-addon.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-addon.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Addon AWS CloudFormation Resource (AWS::EKS::Addon)
diff --git a/goformation/cloudformation/eks/aws-eks-cluster.go b/pkg/goformation/cloudformation/eks/aws-eks-cluster.go
similarity index 96%
rename from goformation/cloudformation/eks/aws-eks-cluster.go
rename to pkg/goformation/cloudformation/eks/aws-eks-cluster.go
index 7cc02a401c..6c01f348e8 100644
--- a/goformation/cloudformation/eks/aws-eks-cluster.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-cluster.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster AWS CloudFormation Resource (AWS::EKS::Cluster)
diff --git a/goformation/cloudformation/eks/aws-eks-cluster_clusterlogging.go b/pkg/goformation/cloudformation/eks/aws-eks-cluster_clusterlogging.go
similarity index 95%
rename from goformation/cloudformation/eks/aws-eks-cluster_clusterlogging.go
rename to pkg/goformation/cloudformation/eks/aws-eks-cluster_clusterlogging.go
index d42821ebde..38d62cd0a7 100644
--- a/goformation/cloudformation/eks/aws-eks-cluster_clusterlogging.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-cluster_clusterlogging.go
@@ -1,7 +1,7 @@
 package eks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_ClusterLogging AWS CloudFormation Resource (AWS::EKS::Cluster.ClusterLogging)
diff --git a/goformation/cloudformation/eks/aws-eks-cluster_compute_config.go b/pkg/goformation/cloudformation/eks/aws-eks-cluster_compute_config.go
similarity index 89%
rename from goformation/cloudformation/eks/aws-eks-cluster_compute_config.go
rename to pkg/goformation/cloudformation/eks/aws-eks-cluster_compute_config.go
index cfc2585b78..19cf73985a 100644
--- a/goformation/cloudformation/eks/aws-eks-cluster_compute_config.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-cluster_compute_config.go
@@ -1,9 +1,9 @@
 package eks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 type Cluster_ComputeConfig struct {
diff --git a/goformation/cloudformation/eks/aws-eks-cluster_controlplaneplacement.go b/pkg/goformation/cloudformation/eks/aws-eks-cluster_controlplaneplacement.go
similarity index 91%
rename from goformation/cloudformation/eks/aws-eks-cluster_controlplaneplacement.go
rename to pkg/goformation/cloudformation/eks/aws-eks-cluster_controlplaneplacement.go
index 31400a7ba9..218c35171d 100644
--- a/goformation/cloudformation/eks/aws-eks-cluster_controlplaneplacement.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-cluster_controlplaneplacement.go
@@ -1,9 +1,9 @@
 package eks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_ControlPlanePlacement AWS CloudFormation Resource (AWS::EKS::Cluster.ControlPlanePlacement)
diff --git a/goformation/cloudformation/eks/aws-eks-cluster_elastic_loadbalancing.go b/pkg/goformation/cloudformation/eks/aws-eks-cluster_elastic_loadbalancing.go
similarity index 88%
rename from goformation/cloudformation/eks/aws-eks-cluster_elastic_loadbalancing.go
rename to pkg/goformation/cloudformation/eks/aws-eks-cluster_elastic_loadbalancing.go
index 3e3c3a89a2..b2843d0b2f 100644
--- a/goformation/cloudformation/eks/aws-eks-cluster_elastic_loadbalancing.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-cluster_elastic_loadbalancing.go
@@ -1,9 +1,9 @@
 package eks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 type Cluster_ElasticLoadBalancing struct {
diff --git a/goformation/cloudformation/eks/aws-eks-cluster_encryptionconfig.go b/pkg/goformation/cloudformation/eks/aws-eks-cluster_encryptionconfig.go
similarity index 92%
rename from goformation/cloudformation/eks/aws-eks-cluster_encryptionconfig.go
rename to pkg/goformation/cloudformation/eks/aws-eks-cluster_encryptionconfig.go
index a0481bf77c..04282c43c2 100644
--- a/goformation/cloudformation/eks/aws-eks-cluster_encryptionconfig.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-cluster_encryptionconfig.go
@@ -1,9 +1,9 @@
 package eks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_EncryptionConfig AWS CloudFormation Resource (AWS::EKS::Cluster.EncryptionConfig)
diff --git a/goformation/cloudformation/eks/aws-eks-cluster_kubernetesnetworkconfig.go b/pkg/goformation/cloudformation/eks/aws-eks-cluster_kubernetesnetworkconfig.go
similarity index 94%
rename from goformation/cloudformation/eks/aws-eks-cluster_kubernetesnetworkconfig.go
rename to pkg/goformation/cloudformation/eks/aws-eks-cluster_kubernetesnetworkconfig.go
index a8ca8f5045..4494e1307e 100644
--- a/goformation/cloudformation/eks/aws-eks-cluster_kubernetesnetworkconfig.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-cluster_kubernetesnetworkconfig.go
@@ -1,9 +1,9 @@
 package eks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_KubernetesNetworkConfig AWS CloudFormation Resource (AWS::EKS::Cluster.KubernetesNetworkConfig)
diff --git a/goformation/cloudformation/eks/aws-eks-cluster_logging.go b/pkg/goformation/cloudformation/eks/aws-eks-cluster_logging.go
similarity index 95%
rename from goformation/cloudformation/eks/aws-eks-cluster_logging.go
rename to pkg/goformation/cloudformation/eks/aws-eks-cluster_logging.go
index 893d796e47..cc5816af0a 100644
--- a/goformation/cloudformation/eks/aws-eks-cluster_logging.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-cluster_logging.go
@@ -1,7 +1,7 @@
 package eks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_Logging AWS CloudFormation Resource (AWS::EKS::Cluster.Logging)
diff --git a/goformation/cloudformation/eks/aws-eks-cluster_loggingtypeconfig.go b/pkg/goformation/cloudformation/eks/aws-eks-cluster_loggingtypeconfig.go
similarity index 91%
rename from goformation/cloudformation/eks/aws-eks-cluster_loggingtypeconfig.go
rename to pkg/goformation/cloudformation/eks/aws-eks-cluster_loggingtypeconfig.go
index be55db9af9..abac6d86e8 100644
--- a/goformation/cloudformation/eks/aws-eks-cluster_loggingtypeconfig.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-cluster_loggingtypeconfig.go
@@ -1,9 +1,9 @@
 package eks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_LoggingTypeConfig AWS CloudFormation Resource (AWS::EKS::Cluster.LoggingTypeConfig)
diff --git a/goformation/cloudformation/eks/aws-eks-cluster_outpostconfig.go b/pkg/goformation/cloudformation/eks/aws-eks-cluster_outpostconfig.go
similarity index 93%
rename from goformation/cloudformation/eks/aws-eks-cluster_outpostconfig.go
rename to pkg/goformation/cloudformation/eks/aws-eks-cluster_outpostconfig.go
index 108d7a81bd..68aa53b55e 100644
--- a/goformation/cloudformation/eks/aws-eks-cluster_outpostconfig.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-cluster_outpostconfig.go
@@ -1,9 +1,9 @@
 package eks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_OutpostConfig AWS CloudFormation Resource (AWS::EKS::Cluster.OutpostConfig)
diff --git a/goformation/cloudformation/eks/aws-eks-cluster_provider.go b/pkg/goformation/cloudformation/eks/aws-eks-cluster_provider.go
similarity index 91%
rename from goformation/cloudformation/eks/aws-eks-cluster_provider.go
rename to pkg/goformation/cloudformation/eks/aws-eks-cluster_provider.go
index 9c30c52d0c..bdd77763e1 100644
--- a/goformation/cloudformation/eks/aws-eks-cluster_provider.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-cluster_provider.go
@@ -1,9 +1,9 @@
 package eks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_Provider AWS CloudFormation Resource (AWS::EKS::Cluster.Provider)
diff --git a/goformation/cloudformation/eks/aws-eks-cluster_remotenetworks.go b/pkg/goformation/cloudformation/eks/aws-eks-cluster_remotenetworks.go
similarity index 86%
rename from goformation/cloudformation/eks/aws-eks-cluster_remotenetworks.go
rename to pkg/goformation/cloudformation/eks/aws-eks-cluster_remotenetworks.go
index 4945520b8d..bfdfb79e75 100644
--- a/goformation/cloudformation/eks/aws-eks-cluster_remotenetworks.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-cluster_remotenetworks.go
@@ -1,6 +1,6 @@
 package eks
 
-import "github.com/awslabs/goformation/v4/cloudformation/types"
+import "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 type Cluster_RemoteNetworkConfig struct {
 	RemotePodNetworks  []RemoteNetworks `json:"RemotePodNetworks,omitempty"`
diff --git a/goformation/cloudformation/eks/aws-eks-cluster_resourcesvpcconfig.go b/pkg/goformation/cloudformation/eks/aws-eks-cluster_resourcesvpcconfig.go
similarity index 95%
rename from goformation/cloudformation/eks/aws-eks-cluster_resourcesvpcconfig.go
rename to pkg/goformation/cloudformation/eks/aws-eks-cluster_resourcesvpcconfig.go
index 15565465d8..90e4d0295d 100644
--- a/goformation/cloudformation/eks/aws-eks-cluster_resourcesvpcconfig.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-cluster_resourcesvpcconfig.go
@@ -1,9 +1,9 @@
 package eks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_ResourcesVpcConfig AWS CloudFormation Resource (AWS::EKS::Cluster.ResourcesVpcConfig)
diff --git a/goformation/cloudformation/eks/aws-eks-cluster_storage_config.go b/pkg/goformation/cloudformation/eks/aws-eks-cluster_storage_config.go
similarity index 93%
rename from goformation/cloudformation/eks/aws-eks-cluster_storage_config.go
rename to pkg/goformation/cloudformation/eks/aws-eks-cluster_storage_config.go
index 4ca8dab9dd..18a5c98b58 100644
--- a/goformation/cloudformation/eks/aws-eks-cluster_storage_config.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-cluster_storage_config.go
@@ -1,9 +1,9 @@
 package eks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 type Cluster_StorageConfig struct {
diff --git a/goformation/cloudformation/eks/aws-eks-cluster_zonal-shift.go b/pkg/goformation/cloudformation/eks/aws-eks-cluster_zonal-shift.go
similarity index 88%
rename from goformation/cloudformation/eks/aws-eks-cluster_zonal-shift.go
rename to pkg/goformation/cloudformation/eks/aws-eks-cluster_zonal-shift.go
index 8d3099dc30..532a860565 100644
--- a/goformation/cloudformation/eks/aws-eks-cluster_zonal-shift.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-cluster_zonal-shift.go
@@ -1,9 +1,9 @@
 package eks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 type Cluster_ZonalShift struct {
diff --git a/goformation/cloudformation/eks/aws-eks-fargateprofile.go b/pkg/goformation/cloudformation/eks/aws-eks-fargateprofile.go
similarity index 96%
rename from goformation/cloudformation/eks/aws-eks-fargateprofile.go
rename to pkg/goformation/cloudformation/eks/aws-eks-fargateprofile.go
index 7eda426e78..6528041f40 100644
--- a/goformation/cloudformation/eks/aws-eks-fargateprofile.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-fargateprofile.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FargateProfile AWS CloudFormation Resource (AWS::EKS::FargateProfile)
diff --git a/goformation/cloudformation/eks/aws-eks-fargateprofile_label.go b/pkg/goformation/cloudformation/eks/aws-eks-fargateprofile_label.go
similarity index 92%
rename from goformation/cloudformation/eks/aws-eks-fargateprofile_label.go
rename to pkg/goformation/cloudformation/eks/aws-eks-fargateprofile_label.go
index c9dfb87153..9cba217cb7 100644
--- a/goformation/cloudformation/eks/aws-eks-fargateprofile_label.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-fargateprofile_label.go
@@ -1,9 +1,9 @@
 package eks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FargateProfile_Label AWS CloudFormation Resource (AWS::EKS::FargateProfile.Label)
diff --git a/goformation/cloudformation/eks/aws-eks-fargateprofile_selector.go b/pkg/goformation/cloudformation/eks/aws-eks-fargateprofile_selector.go
similarity index 92%
rename from goformation/cloudformation/eks/aws-eks-fargateprofile_selector.go
rename to pkg/goformation/cloudformation/eks/aws-eks-fargateprofile_selector.go
index 181e4df6cb..371b643452 100644
--- a/goformation/cloudformation/eks/aws-eks-fargateprofile_selector.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-fargateprofile_selector.go
@@ -1,9 +1,9 @@
 package eks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FargateProfile_Selector AWS CloudFormation Resource (AWS::EKS::FargateProfile.Selector)
diff --git a/goformation/cloudformation/eks/aws-eks-identityproviderconfig.go b/pkg/goformation/cloudformation/eks/aws-eks-identityproviderconfig.go
similarity index 95%
rename from goformation/cloudformation/eks/aws-eks-identityproviderconfig.go
rename to pkg/goformation/cloudformation/eks/aws-eks-identityproviderconfig.go
index 57562d442f..4ffbf32d1c 100644
--- a/goformation/cloudformation/eks/aws-eks-identityproviderconfig.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-identityproviderconfig.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // IdentityProviderConfig AWS CloudFormation Resource (AWS::EKS::IdentityProviderConfig)
diff --git a/goformation/cloudformation/eks/aws-eks-identityproviderconfig_oidcidentityproviderconfig.go b/pkg/goformation/cloudformation/eks/aws-eks-identityproviderconfig_oidcidentityproviderconfig.go
similarity index 96%
rename from goformation/cloudformation/eks/aws-eks-identityproviderconfig_oidcidentityproviderconfig.go
rename to pkg/goformation/cloudformation/eks/aws-eks-identityproviderconfig_oidcidentityproviderconfig.go
index b29a91605c..6cf185c864 100644
--- a/goformation/cloudformation/eks/aws-eks-identityproviderconfig_oidcidentityproviderconfig.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-identityproviderconfig_oidcidentityproviderconfig.go
@@ -1,9 +1,9 @@
 package eks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // IdentityProviderConfig_OidcIdentityProviderConfig AWS CloudFormation Resource (AWS::EKS::IdentityProviderConfig.OidcIdentityProviderConfig)
diff --git a/goformation/cloudformation/eks/aws-eks-identityproviderconfig_requiredclaim.go b/pkg/goformation/cloudformation/eks/aws-eks-identityproviderconfig_requiredclaim.go
similarity index 93%
rename from goformation/cloudformation/eks/aws-eks-identityproviderconfig_requiredclaim.go
rename to pkg/goformation/cloudformation/eks/aws-eks-identityproviderconfig_requiredclaim.go
index dc2f925f30..977d7e9fbe 100644
--- a/goformation/cloudformation/eks/aws-eks-identityproviderconfig_requiredclaim.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-identityproviderconfig_requiredclaim.go
@@ -1,9 +1,9 @@
 package eks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // IdentityProviderConfig_RequiredClaim AWS CloudFormation Resource (AWS::EKS::IdentityProviderConfig.RequiredClaim)
diff --git a/goformation/cloudformation/eks/aws-eks-nodegroup.go b/pkg/goformation/cloudformation/eks/aws-eks-nodegroup.go
similarity index 98%
rename from goformation/cloudformation/eks/aws-eks-nodegroup.go
rename to pkg/goformation/cloudformation/eks/aws-eks-nodegroup.go
index 550a67622c..bec8aeb148 100644
--- a/goformation/cloudformation/eks/aws-eks-nodegroup.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-nodegroup.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Nodegroup AWS CloudFormation Resource (AWS::EKS::Nodegroup)
diff --git a/goformation/cloudformation/eks/aws-eks-nodegroup_launchtemplatespecification.go b/pkg/goformation/cloudformation/eks/aws-eks-nodegroup_launchtemplatespecification.go
similarity index 93%
rename from goformation/cloudformation/eks/aws-eks-nodegroup_launchtemplatespecification.go
rename to pkg/goformation/cloudformation/eks/aws-eks-nodegroup_launchtemplatespecification.go
index 0078f24cc3..c8e157d537 100644
--- a/goformation/cloudformation/eks/aws-eks-nodegroup_launchtemplatespecification.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-nodegroup_launchtemplatespecification.go
@@ -1,9 +1,9 @@
 package eks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Nodegroup_LaunchTemplateSpecification AWS CloudFormation Resource (AWS::EKS::Nodegroup.LaunchTemplateSpecification)
diff --git a/goformation/cloudformation/eks/aws-eks-nodegroup_noderepairconfig.go b/pkg/goformation/cloudformation/eks/aws-eks-nodegroup_noderepairconfig.go
similarity index 89%
rename from goformation/cloudformation/eks/aws-eks-nodegroup_noderepairconfig.go
rename to pkg/goformation/cloudformation/eks/aws-eks-nodegroup_noderepairconfig.go
index 7882a5e323..f2397ce248 100644
--- a/goformation/cloudformation/eks/aws-eks-nodegroup_noderepairconfig.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-nodegroup_noderepairconfig.go
@@ -1,9 +1,9 @@
 package eks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Nodegroup_NodeRepairConfig AWS CloudFormation Resource (AWS::EKS::Nodegroup.NodeRepairConfig)
diff --git a/goformation/cloudformation/eks/aws-eks-nodegroup_remoteaccess.go b/pkg/goformation/cloudformation/eks/aws-eks-nodegroup_remoteaccess.go
similarity index 92%
rename from goformation/cloudformation/eks/aws-eks-nodegroup_remoteaccess.go
rename to pkg/goformation/cloudformation/eks/aws-eks-nodegroup_remoteaccess.go
index 580f3eb24f..bd19fb28d5 100644
--- a/goformation/cloudformation/eks/aws-eks-nodegroup_remoteaccess.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-nodegroup_remoteaccess.go
@@ -1,9 +1,9 @@
 package eks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Nodegroup_RemoteAccess AWS CloudFormation Resource (AWS::EKS::Nodegroup.RemoteAccess)
diff --git a/goformation/cloudformation/eks/aws-eks-nodegroup_scalingconfig.go b/pkg/goformation/cloudformation/eks/aws-eks-nodegroup_scalingconfig.go
similarity index 93%
rename from goformation/cloudformation/eks/aws-eks-nodegroup_scalingconfig.go
rename to pkg/goformation/cloudformation/eks/aws-eks-nodegroup_scalingconfig.go
index a6153420ab..7c4b237957 100644
--- a/goformation/cloudformation/eks/aws-eks-nodegroup_scalingconfig.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-nodegroup_scalingconfig.go
@@ -1,9 +1,9 @@
 package eks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Nodegroup_ScalingConfig AWS CloudFormation Resource (AWS::EKS::Nodegroup.ScalingConfig)
diff --git a/goformation/cloudformation/eks/aws-eks-nodegroup_taint.go b/pkg/goformation/cloudformation/eks/aws-eks-nodegroup_taint.go
similarity index 93%
rename from goformation/cloudformation/eks/aws-eks-nodegroup_taint.go
rename to pkg/goformation/cloudformation/eks/aws-eks-nodegroup_taint.go
index 607ac07529..56ebe7b85d 100644
--- a/goformation/cloudformation/eks/aws-eks-nodegroup_taint.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-nodegroup_taint.go
@@ -1,9 +1,9 @@
 package eks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Nodegroup_Taint AWS CloudFormation Resource (AWS::EKS::Nodegroup.Taint)
diff --git a/goformation/cloudformation/eks/aws-eks-nodegroup_taints.go b/pkg/goformation/cloudformation/eks/aws-eks-nodegroup_taints.go
similarity index 84%
rename from goformation/cloudformation/eks/aws-eks-nodegroup_taints.go
rename to pkg/goformation/cloudformation/eks/aws-eks-nodegroup_taints.go
index a7f1009206..71b55bca90 100644
--- a/goformation/cloudformation/eks/aws-eks-nodegroup_taints.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-nodegroup_taints.go
@@ -1,6 +1,6 @@
 package eks
 
-import "github.com/awslabs/goformation/v4/cloudformation/types"
+import "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 // Nodegroup_Taints AWS CloudFormation Resource (AWS::EKS::Nodegroup.Taints)
 // See: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-nodegroup-taint.html
diff --git a/goformation/cloudformation/eks/aws-eks-nodegroup_updateconfig.go b/pkg/goformation/cloudformation/eks/aws-eks-nodegroup_updateconfig.go
similarity index 92%
rename from goformation/cloudformation/eks/aws-eks-nodegroup_updateconfig.go
rename to pkg/goformation/cloudformation/eks/aws-eks-nodegroup_updateconfig.go
index c7a3e16b75..5f4c75f3e6 100644
--- a/goformation/cloudformation/eks/aws-eks-nodegroup_updateconfig.go
+++ b/pkg/goformation/cloudformation/eks/aws-eks-nodegroup_updateconfig.go
@@ -1,9 +1,9 @@
 package eks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Nodegroup_UpdateConfig AWS CloudFormation Resource (AWS::EKS::Nodegroup.UpdateConfig)
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-cachecluster.go b/pkg/goformation/cloudformation/elasticache/aws-elasticache-cachecluster.go
similarity index 97%
rename from goformation/cloudformation/elasticache/aws-elasticache-cachecluster.go
rename to pkg/goformation/cloudformation/elasticache/aws-elasticache-cachecluster.go
index ac377574a6..bd949f64b7 100644
--- a/goformation/cloudformation/elasticache/aws-elasticache-cachecluster.go
+++ b/pkg/goformation/cloudformation/elasticache/aws-elasticache-cachecluster.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CacheCluster AWS CloudFormation Resource (AWS::ElastiCache::CacheCluster)
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-cachecluster_cloudwatchlogsdestinationdetails.go b/pkg/goformation/cloudformation/elasticache/aws-elasticache-cachecluster_cloudwatchlogsdestinationdetails.go
similarity index 92%
rename from goformation/cloudformation/elasticache/aws-elasticache-cachecluster_cloudwatchlogsdestinationdetails.go
rename to pkg/goformation/cloudformation/elasticache/aws-elasticache-cachecluster_cloudwatchlogsdestinationdetails.go
index 98cdea23ec..227c0506f7 100644
--- a/goformation/cloudformation/elasticache/aws-elasticache-cachecluster_cloudwatchlogsdestinationdetails.go
+++ b/pkg/goformation/cloudformation/elasticache/aws-elasticache-cachecluster_cloudwatchlogsdestinationdetails.go
@@ -1,9 +1,9 @@
 package elasticache
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CacheCluster_CloudWatchLogsDestinationDetails AWS CloudFormation Resource (AWS::ElastiCache::CacheCluster.CloudWatchLogsDestinationDetails)
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-cachecluster_destinationdetails.go b/pkg/goformation/cloudformation/elasticache/aws-elasticache-cachecluster_destinationdetails.go
similarity index 96%
rename from goformation/cloudformation/elasticache/aws-elasticache-cachecluster_destinationdetails.go
rename to pkg/goformation/cloudformation/elasticache/aws-elasticache-cachecluster_destinationdetails.go
index 0aaf11a957..3b6e2ea483 100644
--- a/goformation/cloudformation/elasticache/aws-elasticache-cachecluster_destinationdetails.go
+++ b/pkg/goformation/cloudformation/elasticache/aws-elasticache-cachecluster_destinationdetails.go
@@ -1,7 +1,7 @@
 package elasticache
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CacheCluster_DestinationDetails AWS CloudFormation Resource (AWS::ElastiCache::CacheCluster.DestinationDetails)
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-cachecluster_kinesisfirehosedestinationdetails.go b/pkg/goformation/cloudformation/elasticache/aws-elasticache-cachecluster_kinesisfirehosedestinationdetails.go
similarity index 92%
rename from goformation/cloudformation/elasticache/aws-elasticache-cachecluster_kinesisfirehosedestinationdetails.go
rename to pkg/goformation/cloudformation/elasticache/aws-elasticache-cachecluster_kinesisfirehosedestinationdetails.go
index c3f72edd8d..2ee380fa49 100644
--- a/goformation/cloudformation/elasticache/aws-elasticache-cachecluster_kinesisfirehosedestinationdetails.go
+++ b/pkg/goformation/cloudformation/elasticache/aws-elasticache-cachecluster_kinesisfirehosedestinationdetails.go
@@ -1,9 +1,9 @@
 package elasticache
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CacheCluster_KinesisFirehoseDestinationDetails AWS CloudFormation Resource (AWS::ElastiCache::CacheCluster.KinesisFirehoseDestinationDetails)
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-cachecluster_logdeliveryconfigurationrequest.go b/pkg/goformation/cloudformation/elasticache/aws-elasticache-cachecluster_logdeliveryconfigurationrequest.go
similarity index 95%
rename from goformation/cloudformation/elasticache/aws-elasticache-cachecluster_logdeliveryconfigurationrequest.go
rename to pkg/goformation/cloudformation/elasticache/aws-elasticache-cachecluster_logdeliveryconfigurationrequest.go
index 1846c98de9..893ba93e40 100644
--- a/goformation/cloudformation/elasticache/aws-elasticache-cachecluster_logdeliveryconfigurationrequest.go
+++ b/pkg/goformation/cloudformation/elasticache/aws-elasticache-cachecluster_logdeliveryconfigurationrequest.go
@@ -1,9 +1,9 @@
 package elasticache
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CacheCluster_LogDeliveryConfigurationRequest AWS CloudFormation Resource (AWS::ElastiCache::CacheCluster.LogDeliveryConfigurationRequest)
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup.go b/pkg/goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup.go
similarity index 97%
rename from goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup.go
rename to pkg/goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup.go
index 744bff4fce..9003d6a955 100644
--- a/goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup.go
+++ b/pkg/goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GlobalReplicationGroup AWS CloudFormation Resource (AWS::ElastiCache::GlobalReplicationGroup)
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_globalreplicationgroupmember.go b/pkg/goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_globalreplicationgroupmember.go
similarity index 94%
rename from goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_globalreplicationgroupmember.go
rename to pkg/goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_globalreplicationgroupmember.go
index 7490829ed9..591c535b4a 100644
--- a/goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_globalreplicationgroupmember.go
+++ b/pkg/goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_globalreplicationgroupmember.go
@@ -1,9 +1,9 @@
 package elasticache
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GlobalReplicationGroup_GlobalReplicationGroupMember AWS CloudFormation Resource (AWS::ElastiCache::GlobalReplicationGroup.GlobalReplicationGroupMember)
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_regionalconfiguration.go b/pkg/goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_regionalconfiguration.go
similarity index 94%
rename from goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_regionalconfiguration.go
rename to pkg/goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_regionalconfiguration.go
index b19c237d11..6f368d4299 100644
--- a/goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_regionalconfiguration.go
+++ b/pkg/goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_regionalconfiguration.go
@@ -1,9 +1,9 @@
 package elasticache
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GlobalReplicationGroup_RegionalConfiguration AWS CloudFormation Resource (AWS::ElastiCache::GlobalReplicationGroup.RegionalConfiguration)
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_reshardingconfiguration.go b/pkg/goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_reshardingconfiguration.go
similarity index 93%
rename from goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_reshardingconfiguration.go
rename to pkg/goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_reshardingconfiguration.go
index f347e2134f..b25b7d931e 100644
--- a/goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_reshardingconfiguration.go
+++ b/pkg/goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_reshardingconfiguration.go
@@ -1,9 +1,9 @@
 package elasticache
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GlobalReplicationGroup_ReshardingConfiguration AWS CloudFormation Resource (AWS::ElastiCache::GlobalReplicationGroup.ReshardingConfiguration)
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-parametergroup.go b/pkg/goformation/cloudformation/elasticache/aws-elasticache-parametergroup.go
similarity index 95%
rename from goformation/cloudformation/elasticache/aws-elasticache-parametergroup.go
rename to pkg/goformation/cloudformation/elasticache/aws-elasticache-parametergroup.go
index ba423d8f64..08018bd8b6 100644
--- a/goformation/cloudformation/elasticache/aws-elasticache-parametergroup.go
+++ b/pkg/goformation/cloudformation/elasticache/aws-elasticache-parametergroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ParameterGroup AWS CloudFormation Resource (AWS::ElastiCache::ParameterGroup)
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup.go b/pkg/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup.go
similarity index 98%
rename from goformation/cloudformation/elasticache/aws-elasticache-replicationgroup.go
rename to pkg/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup.go
index 9c26b4616e..e9c37fdfc4 100644
--- a/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup.go
+++ b/pkg/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReplicationGroup AWS CloudFormation Resource (AWS::ElastiCache::ReplicationGroup)
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_cloudwatchlogsdestinationdetails.go b/pkg/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_cloudwatchlogsdestinationdetails.go
similarity index 92%
rename from goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_cloudwatchlogsdestinationdetails.go
rename to pkg/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_cloudwatchlogsdestinationdetails.go
index 346cfe6927..86b8abf9a9 100644
--- a/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_cloudwatchlogsdestinationdetails.go
+++ b/pkg/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_cloudwatchlogsdestinationdetails.go
@@ -1,9 +1,9 @@
 package elasticache
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReplicationGroup_CloudWatchLogsDestinationDetails AWS CloudFormation Resource (AWS::ElastiCache::ReplicationGroup.CloudWatchLogsDestinationDetails)
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_destinationdetails.go b/pkg/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_destinationdetails.go
similarity index 96%
rename from goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_destinationdetails.go
rename to pkg/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_destinationdetails.go
index 3c84c182a3..9034c35302 100644
--- a/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_destinationdetails.go
+++ b/pkg/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_destinationdetails.go
@@ -1,7 +1,7 @@
 package elasticache
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReplicationGroup_DestinationDetails AWS CloudFormation Resource (AWS::ElastiCache::ReplicationGroup.DestinationDetails)
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_kinesisfirehosedestinationdetails.go b/pkg/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_kinesisfirehosedestinationdetails.go
similarity index 92%
rename from goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_kinesisfirehosedestinationdetails.go
rename to pkg/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_kinesisfirehosedestinationdetails.go
index 29c75a1909..16b01b820e 100644
--- a/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_kinesisfirehosedestinationdetails.go
+++ b/pkg/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_kinesisfirehosedestinationdetails.go
@@ -1,9 +1,9 @@
 package elasticache
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReplicationGroup_KinesisFirehoseDestinationDetails AWS CloudFormation Resource (AWS::ElastiCache::ReplicationGroup.KinesisFirehoseDestinationDetails)
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_logdeliveryconfigurationrequest.go b/pkg/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_logdeliveryconfigurationrequest.go
similarity index 95%
rename from goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_logdeliveryconfigurationrequest.go
rename to pkg/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_logdeliveryconfigurationrequest.go
index 6d8fbcf035..fb8a50bf0c 100644
--- a/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_logdeliveryconfigurationrequest.go
+++ b/pkg/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_logdeliveryconfigurationrequest.go
@@ -1,9 +1,9 @@
 package elasticache
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReplicationGroup_LogDeliveryConfigurationRequest AWS CloudFormation Resource (AWS::ElastiCache::ReplicationGroup.LogDeliveryConfigurationRequest)
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_nodegroupconfiguration.go b/pkg/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_nodegroupconfiguration.go
similarity index 95%
rename from goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_nodegroupconfiguration.go
rename to pkg/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_nodegroupconfiguration.go
index dc377456f3..718a9232b0 100644
--- a/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_nodegroupconfiguration.go
+++ b/pkg/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_nodegroupconfiguration.go
@@ -1,9 +1,9 @@
 package elasticache
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReplicationGroup_NodeGroupConfiguration AWS CloudFormation Resource (AWS::ElastiCache::ReplicationGroup.NodeGroupConfiguration)
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-securitygroup.go b/pkg/goformation/cloudformation/elasticache/aws-elasticache-securitygroup.go
similarity index 95%
rename from goformation/cloudformation/elasticache/aws-elasticache-securitygroup.go
rename to pkg/goformation/cloudformation/elasticache/aws-elasticache-securitygroup.go
index 9549fc5414..b32dc4461c 100644
--- a/goformation/cloudformation/elasticache/aws-elasticache-securitygroup.go
+++ b/pkg/goformation/cloudformation/elasticache/aws-elasticache-securitygroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SecurityGroup AWS CloudFormation Resource (AWS::ElastiCache::SecurityGroup)
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-securitygroupingress.go b/pkg/goformation/cloudformation/elasticache/aws-elasticache-securitygroupingress.go
similarity index 97%
rename from goformation/cloudformation/elasticache/aws-elasticache-securitygroupingress.go
rename to pkg/goformation/cloudformation/elasticache/aws-elasticache-securitygroupingress.go
index 0a5db28f02..17e7932b1e 100644
--- a/goformation/cloudformation/elasticache/aws-elasticache-securitygroupingress.go
+++ b/pkg/goformation/cloudformation/elasticache/aws-elasticache-securitygroupingress.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SecurityGroupIngress AWS CloudFormation Resource (AWS::ElastiCache::SecurityGroupIngress)
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-subnetgroup.go b/pkg/goformation/cloudformation/elasticache/aws-elasticache-subnetgroup.go
similarity index 95%
rename from goformation/cloudformation/elasticache/aws-elasticache-subnetgroup.go
rename to pkg/goformation/cloudformation/elasticache/aws-elasticache-subnetgroup.go
index f03d41804a..e78d72d789 100644
--- a/goformation/cloudformation/elasticache/aws-elasticache-subnetgroup.go
+++ b/pkg/goformation/cloudformation/elasticache/aws-elasticache-subnetgroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SubnetGroup AWS CloudFormation Resource (AWS::ElastiCache::SubnetGroup)
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-user.go b/pkg/goformation/cloudformation/elasticache/aws-elasticache-user.go
similarity index 97%
rename from goformation/cloudformation/elasticache/aws-elasticache-user.go
rename to pkg/goformation/cloudformation/elasticache/aws-elasticache-user.go
index 57ee868736..18baa23713 100644
--- a/goformation/cloudformation/elasticache/aws-elasticache-user.go
+++ b/pkg/goformation/cloudformation/elasticache/aws-elasticache-user.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // User AWS CloudFormation Resource (AWS::ElastiCache::User)
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-usergroup.go b/pkg/goformation/cloudformation/elasticache/aws-elasticache-usergroup.go
similarity index 96%
rename from goformation/cloudformation/elasticache/aws-elasticache-usergroup.go
rename to pkg/goformation/cloudformation/elasticache/aws-elasticache-usergroup.go
index 89d101cfa6..c181b0565e 100644
--- a/goformation/cloudformation/elasticache/aws-elasticache-usergroup.go
+++ b/pkg/goformation/cloudformation/elasticache/aws-elasticache-usergroup.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserGroup AWS CloudFormation Resource (AWS::ElastiCache::UserGroup)
diff --git a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application.go b/pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application.go
similarity index 97%
rename from goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application.go
rename to pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application.go
index c8c3e72fc8..d11b99eb59 100644
--- a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application.go
+++ b/pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application AWS CloudFormation Resource (AWS::ElasticBeanstalk::Application)
diff --git a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_applicationresourcelifecycleconfig.go b/pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_applicationresourcelifecycleconfig.go
similarity index 94%
rename from goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_applicationresourcelifecycleconfig.go
rename to pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_applicationresourcelifecycleconfig.go
index 3f407270ed..c9a8698272 100644
--- a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_applicationresourcelifecycleconfig.go
+++ b/pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_applicationresourcelifecycleconfig.go
@@ -1,9 +1,9 @@
 package elasticbeanstalk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_ApplicationResourceLifecycleConfig AWS CloudFormation Resource (AWS::ElasticBeanstalk::Application.ApplicationResourceLifecycleConfig)
diff --git a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_applicationversionlifecycleconfig.go b/pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_applicationversionlifecycleconfig.go
similarity index 96%
rename from goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_applicationversionlifecycleconfig.go
rename to pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_applicationversionlifecycleconfig.go
index 62d57a3ff0..8c5584fd72 100644
--- a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_applicationversionlifecycleconfig.go
+++ b/pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_applicationversionlifecycleconfig.go
@@ -1,7 +1,7 @@
 package elasticbeanstalk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_ApplicationVersionLifecycleConfig AWS CloudFormation Resource (AWS::ElasticBeanstalk::Application.ApplicationVersionLifecycleConfig)
diff --git a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_maxagerule.go b/pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_maxagerule.go
similarity index 94%
rename from goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_maxagerule.go
rename to pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_maxagerule.go
index 7e103be765..b03118770c 100644
--- a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_maxagerule.go
+++ b/pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_maxagerule.go
@@ -1,9 +1,9 @@
 package elasticbeanstalk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_MaxAgeRule AWS CloudFormation Resource (AWS::ElasticBeanstalk::Application.MaxAgeRule)
diff --git a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_maxcountrule.go b/pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_maxcountrule.go
similarity index 94%
rename from goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_maxcountrule.go
rename to pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_maxcountrule.go
index d9936b031e..5a50ee2ec6 100644
--- a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_maxcountrule.go
+++ b/pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_maxcountrule.go
@@ -1,9 +1,9 @@
 package elasticbeanstalk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_MaxCountRule AWS CloudFormation Resource (AWS::ElasticBeanstalk::Application.MaxCountRule)
diff --git a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-applicationversion.go b/pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-applicationversion.go
similarity index 97%
rename from goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-applicationversion.go
rename to pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-applicationversion.go
index e472805333..609d691e47 100644
--- a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-applicationversion.go
+++ b/pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-applicationversion.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationVersion AWS CloudFormation Resource (AWS::ElasticBeanstalk::ApplicationVersion)
diff --git a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-applicationversion_sourcebundle.go b/pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-applicationversion_sourcebundle.go
similarity index 92%
rename from goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-applicationversion_sourcebundle.go
rename to pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-applicationversion_sourcebundle.go
index 1d9bea8909..9b3c8620e5 100644
--- a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-applicationversion_sourcebundle.go
+++ b/pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-applicationversion_sourcebundle.go
@@ -1,9 +1,9 @@
 package elasticbeanstalk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationVersion_SourceBundle AWS CloudFormation Resource (AWS::ElasticBeanstalk::ApplicationVersion.SourceBundle)
diff --git a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate.go b/pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate.go
similarity index 97%
rename from goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate.go
rename to pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate.go
index d211f68671..a3cb64314e 100644
--- a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate.go
+++ b/pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigurationTemplate AWS CloudFormation Resource (AWS::ElasticBeanstalk::ConfigurationTemplate)
diff --git a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate_configurationoptionsetting.go b/pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate_configurationoptionsetting.go
similarity index 95%
rename from goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate_configurationoptionsetting.go
rename to pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate_configurationoptionsetting.go
index 37ab920f88..201df9ac59 100644
--- a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate_configurationoptionsetting.go
+++ b/pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate_configurationoptionsetting.go
@@ -1,9 +1,9 @@
 package elasticbeanstalk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigurationTemplate_ConfigurationOptionSetting AWS CloudFormation Resource (AWS::ElasticBeanstalk::ConfigurationTemplate.ConfigurationOptionSetting)
diff --git a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate_sourceconfiguration.go b/pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate_sourceconfiguration.go
similarity index 93%
rename from goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate_sourceconfiguration.go
rename to pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate_sourceconfiguration.go
index d9b2f0000d..c66cde10b3 100644
--- a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate_sourceconfiguration.go
+++ b/pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate_sourceconfiguration.go
@@ -1,9 +1,9 @@
 package elasticbeanstalk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigurationTemplate_SourceConfiguration AWS CloudFormation Resource (AWS::ElasticBeanstalk::ConfigurationTemplate.SourceConfiguration)
diff --git a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment.go b/pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment.go
similarity index 96%
rename from goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment.go
rename to pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment.go
index 283113b8f2..7f1dc64703 100644
--- a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment.go
+++ b/pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Environment AWS CloudFormation Resource (AWS::ElasticBeanstalk::Environment)
diff --git a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment_optionsetting.go b/pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment_optionsetting.go
similarity index 94%
rename from goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment_optionsetting.go
rename to pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment_optionsetting.go
index 79b3ac6889..dd19ffc11e 100644
--- a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment_optionsetting.go
+++ b/pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment_optionsetting.go
@@ -1,9 +1,9 @@
 package elasticbeanstalk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Environment_OptionSetting AWS CloudFormation Resource (AWS::ElasticBeanstalk::Environment.OptionSetting)
diff --git a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment_tier.go b/pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment_tier.go
similarity index 93%
rename from goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment_tier.go
rename to pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment_tier.go
index c4c8cd66cc..f4f598ad9a 100644
--- a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment_tier.go
+++ b/pkg/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment_tier.go
@@ -1,9 +1,9 @@
 package elasticbeanstalk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Environment_Tier AWS CloudFormation Resource (AWS::ElasticBeanstalk::Environment.Tier)
diff --git a/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer.go b/pkg/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer.go
similarity index 97%
rename from goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer.go
rename to pkg/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer.go
index 054d54d28c..dd95ef5de3 100644
--- a/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LoadBalancer AWS CloudFormation Resource (AWS::ElasticLoadBalancing::LoadBalancer)
diff --git a/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_accessloggingpolicy.go b/pkg/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_accessloggingpolicy.go
similarity index 94%
rename from goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_accessloggingpolicy.go
rename to pkg/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_accessloggingpolicy.go
index 14392c8af3..a2a774cd84 100644
--- a/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_accessloggingpolicy.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_accessloggingpolicy.go
@@ -1,9 +1,9 @@
 package elasticloadbalancing
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LoadBalancer_AccessLoggingPolicy AWS CloudFormation Resource (AWS::ElasticLoadBalancing::LoadBalancer.AccessLoggingPolicy)
diff --git a/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_appcookiestickinesspolicy.go b/pkg/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_appcookiestickinesspolicy.go
similarity index 93%
rename from goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_appcookiestickinesspolicy.go
rename to pkg/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_appcookiestickinesspolicy.go
index 5aedf1f90f..5e09e251fd 100644
--- a/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_appcookiestickinesspolicy.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_appcookiestickinesspolicy.go
@@ -1,9 +1,9 @@
 package elasticloadbalancing
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LoadBalancer_AppCookieStickinessPolicy AWS CloudFormation Resource (AWS::ElasticLoadBalancing::LoadBalancer.AppCookieStickinessPolicy)
diff --git a/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_connectiondrainingpolicy.go b/pkg/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_connectiondrainingpolicy.go
similarity index 93%
rename from goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_connectiondrainingpolicy.go
rename to pkg/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_connectiondrainingpolicy.go
index af228abe8e..282b7114eb 100644
--- a/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_connectiondrainingpolicy.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_connectiondrainingpolicy.go
@@ -1,9 +1,9 @@
 package elasticloadbalancing
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LoadBalancer_ConnectionDrainingPolicy AWS CloudFormation Resource (AWS::ElasticLoadBalancing::LoadBalancer.ConnectionDrainingPolicy)
diff --git a/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_connectionsettings.go b/pkg/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_connectionsettings.go
similarity index 91%
rename from goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_connectionsettings.go
rename to pkg/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_connectionsettings.go
index 65fcb15f23..da2350e09d 100644
--- a/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_connectionsettings.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_connectionsettings.go
@@ -1,9 +1,9 @@
 package elasticloadbalancing
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LoadBalancer_ConnectionSettings AWS CloudFormation Resource (AWS::ElasticLoadBalancing::LoadBalancer.ConnectionSettings)
diff --git a/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_healthcheck.go b/pkg/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_healthcheck.go
similarity index 94%
rename from goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_healthcheck.go
rename to pkg/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_healthcheck.go
index 6c0209ce98..bf5b877fc8 100644
--- a/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_healthcheck.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_healthcheck.go
@@ -1,9 +1,9 @@
 package elasticloadbalancing
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LoadBalancer_HealthCheck AWS CloudFormation Resource (AWS::ElasticLoadBalancing::LoadBalancer.HealthCheck)
diff --git a/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_lbcookiestickinesspolicy.go b/pkg/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_lbcookiestickinesspolicy.go
similarity index 93%
rename from goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_lbcookiestickinesspolicy.go
rename to pkg/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_lbcookiestickinesspolicy.go
index b784b92a6b..1a0a6d4201 100644
--- a/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_lbcookiestickinesspolicy.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_lbcookiestickinesspolicy.go
@@ -1,9 +1,9 @@
 package elasticloadbalancing
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LoadBalancer_LBCookieStickinessPolicy AWS CloudFormation Resource (AWS::ElasticLoadBalancing::LoadBalancer.LBCookieStickinessPolicy)
diff --git a/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_listeners.go b/pkg/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_listeners.go
similarity index 95%
rename from goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_listeners.go
rename to pkg/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_listeners.go
index dd9bbf93b4..b56de28a35 100644
--- a/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_listeners.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_listeners.go
@@ -1,9 +1,9 @@
 package elasticloadbalancing
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LoadBalancer_Listeners AWS CloudFormation Resource (AWS::ElasticLoadBalancing::LoadBalancer.Listeners)
diff --git a/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_policies.go b/pkg/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_policies.go
similarity index 94%
rename from goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_policies.go
rename to pkg/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_policies.go
index 07f562cf69..330ad48e6f 100644
--- a/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_policies.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_policies.go
@@ -1,9 +1,9 @@
 package elasticloadbalancing
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LoadBalancer_Policies AWS CloudFormation Resource (AWS::ElasticLoadBalancing::LoadBalancer.Policies)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener.go
similarity index 97%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener.go
index 2c5c8d2aa8..0aedbd7ea3 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Listener AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::Listener)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_action.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_action.go
similarity index 96%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_action.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_action.go
index 7af6803beb..17a49ace81 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_action.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_action.go
@@ -1,9 +1,9 @@
 package elasticloadbalancingv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Listener_Action AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::Listener.Action)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_authenticatecognitoconfig.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_authenticatecognitoconfig.go
similarity index 96%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_authenticatecognitoconfig.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_authenticatecognitoconfig.go
index 866a7be34a..f43f8d58af 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_authenticatecognitoconfig.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_authenticatecognitoconfig.go
@@ -1,9 +1,9 @@
 package elasticloadbalancingv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Listener_AuthenticateCognitoConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::Listener.AuthenticateCognitoConfig)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_authenticateoidcconfig.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_authenticateoidcconfig.go
similarity index 97%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_authenticateoidcconfig.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_authenticateoidcconfig.go
index fcfa9ec161..20efad57cc 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_authenticateoidcconfig.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_authenticateoidcconfig.go
@@ -1,9 +1,9 @@
 package elasticloadbalancingv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Listener_AuthenticateOidcConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::Listener.AuthenticateOidcConfig)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_certificate.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_certificate.go
similarity index 92%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_certificate.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_certificate.go
index d9ecaf1c18..72d91c97df 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_certificate.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_certificate.go
@@ -1,9 +1,9 @@
 package elasticloadbalancingv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Listener_Certificate AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::Listener.Certificate)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_fixedresponseconfig.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_fixedresponseconfig.go
similarity index 94%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_fixedresponseconfig.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_fixedresponseconfig.go
index 37768e43d0..a5fad4c309 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_fixedresponseconfig.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_fixedresponseconfig.go
@@ -1,9 +1,9 @@
 package elasticloadbalancingv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Listener_FixedResponseConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::Listener.FixedResponseConfig)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_forwardconfig.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_forwardconfig.go
similarity index 96%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_forwardconfig.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_forwardconfig.go
index f5af9aac0a..d479e0df86 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_forwardconfig.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_forwardconfig.go
@@ -1,7 +1,7 @@
 package elasticloadbalancingv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Listener_ForwardConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::Listener.ForwardConfig)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_redirectconfig.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_redirectconfig.go
similarity index 95%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_redirectconfig.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_redirectconfig.go
index cad24219d2..a915644433 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_redirectconfig.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_redirectconfig.go
@@ -1,9 +1,9 @@
 package elasticloadbalancingv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Listener_RedirectConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::Listener.RedirectConfig)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_targetgroupstickinessconfig.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_targetgroupstickinessconfig.go
similarity index 93%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_targetgroupstickinessconfig.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_targetgroupstickinessconfig.go
index 03fedf00d1..890ed3eae2 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_targetgroupstickinessconfig.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_targetgroupstickinessconfig.go
@@ -1,9 +1,9 @@
 package elasticloadbalancingv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Listener_TargetGroupStickinessConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::Listener.TargetGroupStickinessConfig)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_targetgrouptuple.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_targetgrouptuple.go
similarity index 93%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_targetgrouptuple.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_targetgrouptuple.go
index 9f0f648a97..b4e455f3ad 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_targetgrouptuple.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_targetgrouptuple.go
@@ -1,9 +1,9 @@
 package elasticloadbalancingv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Listener_TargetGroupTuple AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::Listener.TargetGroupTuple)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenercertificate.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenercertificate.go
similarity index 96%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenercertificate.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenercertificate.go
index e2c14e2fa0..ce8fad35f4 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenercertificate.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenercertificate.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ListenerCertificate AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerCertificate)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenercertificate_certificate.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenercertificate_certificate.go
similarity index 92%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenercertificate_certificate.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenercertificate_certificate.go
index e7ee776dd6..474ffd40b6 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenercertificate_certificate.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenercertificate_certificate.go
@@ -1,9 +1,9 @@
 package elasticloadbalancingv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ListenerCertificate_Certificate AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerCertificate.Certificate)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule.go
similarity index 97%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule.go
index 635d4710ea..bde95b3cef 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ListenerRule AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_action.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_action.go
similarity index 96%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_action.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_action.go
index 1dcc608c44..3c84c44bce 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_action.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_action.go
@@ -1,9 +1,9 @@
 package elasticloadbalancingv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ListenerRule_Action AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.Action)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_authenticatecognitoconfig.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_authenticatecognitoconfig.go
similarity index 96%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_authenticatecognitoconfig.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_authenticatecognitoconfig.go
index 76c4b2c275..c2f331bc3d 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_authenticatecognitoconfig.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_authenticatecognitoconfig.go
@@ -1,9 +1,9 @@
 package elasticloadbalancingv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ListenerRule_AuthenticateCognitoConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.AuthenticateCognitoConfig)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_authenticateoidcconfig.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_authenticateoidcconfig.go
similarity index 97%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_authenticateoidcconfig.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_authenticateoidcconfig.go
index a4b23bfcb5..eefb07607b 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_authenticateoidcconfig.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_authenticateoidcconfig.go
@@ -1,9 +1,9 @@
 package elasticloadbalancingv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ListenerRule_AuthenticateOidcConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.AuthenticateOidcConfig)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_fixedresponseconfig.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_fixedresponseconfig.go
similarity index 94%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_fixedresponseconfig.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_fixedresponseconfig.go
index 61a8fa6c33..2f1c1e602d 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_fixedresponseconfig.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_fixedresponseconfig.go
@@ -1,9 +1,9 @@
 package elasticloadbalancingv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ListenerRule_FixedResponseConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.FixedResponseConfig)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_forwardconfig.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_forwardconfig.go
similarity index 96%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_forwardconfig.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_forwardconfig.go
index 4583066ee4..01b3826d24 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_forwardconfig.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_forwardconfig.go
@@ -1,7 +1,7 @@
 package elasticloadbalancingv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ListenerRule_ForwardConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.ForwardConfig)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_hostheaderconfig.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_hostheaderconfig.go
similarity index 92%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_hostheaderconfig.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_hostheaderconfig.go
index ce123181bf..ca18f80f1e 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_hostheaderconfig.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_hostheaderconfig.go
@@ -1,9 +1,9 @@
 package elasticloadbalancingv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ListenerRule_HostHeaderConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.HostHeaderConfig)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_httpheaderconfig.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_httpheaderconfig.go
similarity index 93%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_httpheaderconfig.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_httpheaderconfig.go
index adfefbdf5c..c010604d16 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_httpheaderconfig.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_httpheaderconfig.go
@@ -1,9 +1,9 @@
 package elasticloadbalancingv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ListenerRule_HttpHeaderConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.HttpHeaderConfig)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_httprequestmethodconfig.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_httprequestmethodconfig.go
similarity index 92%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_httprequestmethodconfig.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_httprequestmethodconfig.go
index 213659a254..a3822878b6 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_httprequestmethodconfig.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_httprequestmethodconfig.go
@@ -1,9 +1,9 @@
 package elasticloadbalancingv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ListenerRule_HttpRequestMethodConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.HttpRequestMethodConfig)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_pathpatternconfig.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_pathpatternconfig.go
similarity index 92%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_pathpatternconfig.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_pathpatternconfig.go
index b2e8a74a93..83ad5daffb 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_pathpatternconfig.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_pathpatternconfig.go
@@ -1,9 +1,9 @@
 package elasticloadbalancingv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ListenerRule_PathPatternConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.PathPatternConfig)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_querystringconfig.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_querystringconfig.go
similarity index 95%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_querystringconfig.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_querystringconfig.go
index e7db4ffd8a..a6f2be5764 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_querystringconfig.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_querystringconfig.go
@@ -1,7 +1,7 @@
 package elasticloadbalancingv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ListenerRule_QueryStringConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.QueryStringConfig)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_querystringkeyvalue.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_querystringkeyvalue.go
similarity index 93%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_querystringkeyvalue.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_querystringkeyvalue.go
index 3562a3c4bd..dbd76e84ca 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_querystringkeyvalue.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_querystringkeyvalue.go
@@ -1,9 +1,9 @@
 package elasticloadbalancingv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ListenerRule_QueryStringKeyValue AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.QueryStringKeyValue)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_redirectconfig.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_redirectconfig.go
similarity index 95%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_redirectconfig.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_redirectconfig.go
index fac27ad8e3..52744e4580 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_redirectconfig.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_redirectconfig.go
@@ -1,9 +1,9 @@
 package elasticloadbalancingv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ListenerRule_RedirectConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.RedirectConfig)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_rulecondition.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_rulecondition.go
similarity index 96%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_rulecondition.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_rulecondition.go
index 2d340ae6b5..d590b607f0 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_rulecondition.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_rulecondition.go
@@ -1,9 +1,9 @@
 package elasticloadbalancingv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ListenerRule_RuleCondition AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.RuleCondition)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_sourceipconfig.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_sourceipconfig.go
similarity index 92%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_sourceipconfig.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_sourceipconfig.go
index 00183d78aa..d6b8403830 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_sourceipconfig.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_sourceipconfig.go
@@ -1,9 +1,9 @@
 package elasticloadbalancingv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ListenerRule_SourceIpConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.SourceIpConfig)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_targetgroupstickinessconfig.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_targetgroupstickinessconfig.go
similarity index 93%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_targetgroupstickinessconfig.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_targetgroupstickinessconfig.go
index deb9d78f44..58bb3dc31c 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_targetgroupstickinessconfig.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_targetgroupstickinessconfig.go
@@ -1,9 +1,9 @@
 package elasticloadbalancingv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ListenerRule_TargetGroupStickinessConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.TargetGroupStickinessConfig)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_targetgrouptuple.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_targetgrouptuple.go
similarity index 93%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_targetgrouptuple.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_targetgrouptuple.go
index 4ae7f7f18e..fe05161b59 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_targetgrouptuple.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_targetgrouptuple.go
@@ -1,9 +1,9 @@
 package elasticloadbalancingv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ListenerRule_TargetGroupTuple AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.TargetGroupTuple)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer.go
similarity index 96%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer.go
index 7fa0b9404d..bd5e89e8fa 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LoadBalancer AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::LoadBalancer)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer_loadbalancerattribute.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer_loadbalancerattribute.go
similarity index 93%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer_loadbalancerattribute.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer_loadbalancerattribute.go
index 05f12c1708..6082c5500c 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer_loadbalancerattribute.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer_loadbalancerattribute.go
@@ -1,9 +1,9 @@
 package elasticloadbalancingv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LoadBalancer_LoadBalancerAttribute AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::LoadBalancer.LoadBalancerAttribute)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer_subnetmapping.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer_subnetmapping.go
similarity index 94%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer_subnetmapping.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer_subnetmapping.go
index 7844f0dc5d..a14a435d92 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer_subnetmapping.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer_subnetmapping.go
@@ -1,9 +1,9 @@
 package elasticloadbalancingv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LoadBalancer_SubnetMapping AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::LoadBalancer.SubnetMapping)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup.go
similarity index 97%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup.go
index 0804fca009..9de6dc0e91 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TargetGroup AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::TargetGroup)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_matcher.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_matcher.go
similarity index 93%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_matcher.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_matcher.go
index 6a2b8c99da..158774a353 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_matcher.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_matcher.go
@@ -1,9 +1,9 @@
 package elasticloadbalancingv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TargetGroup_Matcher AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::TargetGroup.Matcher)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_targetdescription.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_targetdescription.go
similarity index 94%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_targetdescription.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_targetdescription.go
index 3e27694a85..674a9735cd 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_targetdescription.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_targetdescription.go
@@ -1,9 +1,9 @@
 package elasticloadbalancingv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TargetGroup_TargetDescription AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::TargetGroup.TargetDescription)
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_targetgroupattribute.go b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_targetgroupattribute.go
similarity index 93%
rename from goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_targetgroupattribute.go
rename to pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_targetgroupattribute.go
index f222af5143..322a9b5412 100644
--- a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_targetgroupattribute.go
+++ b/pkg/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_targetgroupattribute.go
@@ -1,9 +1,9 @@
 package elasticloadbalancingv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TargetGroup_TargetGroupAttribute AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::TargetGroup.TargetGroupAttribute)
diff --git a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain.go b/pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain.go
similarity index 97%
rename from goformation/cloudformation/elasticsearch/aws-elasticsearch-domain.go
rename to pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain.go
index 75758b7e45..e6a6ff2350 100644
--- a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain.go
+++ b/pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain AWS CloudFormation Resource (AWS::Elasticsearch::Domain)
diff --git a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_advancedsecurityoptionsinput.go b/pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_advancedsecurityoptionsinput.go
similarity index 94%
rename from goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_advancedsecurityoptionsinput.go
rename to pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_advancedsecurityoptionsinput.go
index 7bdf37b177..551ec76eb3 100644
--- a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_advancedsecurityoptionsinput.go
+++ b/pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_advancedsecurityoptionsinput.go
@@ -1,9 +1,9 @@
 package elasticsearch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain_AdvancedSecurityOptionsInput AWS CloudFormation Resource (AWS::Elasticsearch::Domain.AdvancedSecurityOptionsInput)
diff --git a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_cognitooptions.go b/pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_cognitooptions.go
similarity index 94%
rename from goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_cognitooptions.go
rename to pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_cognitooptions.go
index b408c2313e..dcf0064403 100644
--- a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_cognitooptions.go
+++ b/pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_cognitooptions.go
@@ -1,9 +1,9 @@
 package elasticsearch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain_CognitoOptions AWS CloudFormation Resource (AWS::Elasticsearch::Domain.CognitoOptions)
diff --git a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_coldstorageoptions.go b/pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_coldstorageoptions.go
similarity index 91%
rename from goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_coldstorageoptions.go
rename to pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_coldstorageoptions.go
index a590079fde..4c2c0b33eb 100644
--- a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_coldstorageoptions.go
+++ b/pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_coldstorageoptions.go
@@ -1,9 +1,9 @@
 package elasticsearch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain_ColdStorageOptions AWS CloudFormation Resource (AWS::Elasticsearch::Domain.ColdStorageOptions)
diff --git a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_domainendpointoptions.go b/pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_domainendpointoptions.go
similarity index 95%
rename from goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_domainendpointoptions.go
rename to pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_domainendpointoptions.go
index 96ba96f132..6140304b0a 100644
--- a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_domainendpointoptions.go
+++ b/pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_domainendpointoptions.go
@@ -1,9 +1,9 @@
 package elasticsearch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain_DomainEndpointOptions AWS CloudFormation Resource (AWS::Elasticsearch::Domain.DomainEndpointOptions)
diff --git a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_ebsoptions.go b/pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_ebsoptions.go
similarity index 94%
rename from goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_ebsoptions.go
rename to pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_ebsoptions.go
index 50f6f5c726..d4a73d30e3 100644
--- a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_ebsoptions.go
+++ b/pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_ebsoptions.go
@@ -1,9 +1,9 @@
 package elasticsearch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain_EBSOptions AWS CloudFormation Resource (AWS::Elasticsearch::Domain.EBSOptions)
diff --git a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_elasticsearchclusterconfig.go b/pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_elasticsearchclusterconfig.go
similarity index 97%
rename from goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_elasticsearchclusterconfig.go
rename to pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_elasticsearchclusterconfig.go
index 028a3046d9..1f0688e7d8 100644
--- a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_elasticsearchclusterconfig.go
+++ b/pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_elasticsearchclusterconfig.go
@@ -1,9 +1,9 @@
 package elasticsearch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain_ElasticsearchClusterConfig AWS CloudFormation Resource (AWS::Elasticsearch::Domain.ElasticsearchClusterConfig)
diff --git a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_encryptionatrestoptions.go b/pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_encryptionatrestoptions.go
similarity index 93%
rename from goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_encryptionatrestoptions.go
rename to pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_encryptionatrestoptions.go
index 0f0a823f62..2dc4a2833f 100644
--- a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_encryptionatrestoptions.go
+++ b/pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_encryptionatrestoptions.go
@@ -1,9 +1,9 @@
 package elasticsearch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain_EncryptionAtRestOptions AWS CloudFormation Resource (AWS::Elasticsearch::Domain.EncryptionAtRestOptions)
diff --git a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_logpublishingoption.go b/pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_logpublishingoption.go
similarity index 93%
rename from goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_logpublishingoption.go
rename to pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_logpublishingoption.go
index b6f5eedc02..5c0490920f 100644
--- a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_logpublishingoption.go
+++ b/pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_logpublishingoption.go
@@ -1,9 +1,9 @@
 package elasticsearch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain_LogPublishingOption AWS CloudFormation Resource (AWS::Elasticsearch::Domain.LogPublishingOption)
diff --git a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_masteruseroptions.go b/pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_masteruseroptions.go
similarity index 94%
rename from goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_masteruseroptions.go
rename to pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_masteruseroptions.go
index 4c3de24a75..16433c1db4 100644
--- a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_masteruseroptions.go
+++ b/pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_masteruseroptions.go
@@ -1,9 +1,9 @@
 package elasticsearch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain_MasterUserOptions AWS CloudFormation Resource (AWS::Elasticsearch::Domain.MasterUserOptions)
diff --git a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_nodetonodeencryptionoptions.go b/pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_nodetonodeencryptionoptions.go
similarity index 92%
rename from goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_nodetonodeencryptionoptions.go
rename to pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_nodetonodeencryptionoptions.go
index 6362cdd2f4..4c4800a419 100644
--- a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_nodetonodeencryptionoptions.go
+++ b/pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_nodetonodeencryptionoptions.go
@@ -1,9 +1,9 @@
 package elasticsearch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain_NodeToNodeEncryptionOptions AWS CloudFormation Resource (AWS::Elasticsearch::Domain.NodeToNodeEncryptionOptions)
diff --git a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_snapshotoptions.go b/pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_snapshotoptions.go
similarity index 92%
rename from goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_snapshotoptions.go
rename to pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_snapshotoptions.go
index 3c729443e1..5c965091f7 100644
--- a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_snapshotoptions.go
+++ b/pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_snapshotoptions.go
@@ -1,9 +1,9 @@
 package elasticsearch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain_SnapshotOptions AWS CloudFormation Resource (AWS::Elasticsearch::Domain.SnapshotOptions)
diff --git a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_vpcoptions.go b/pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_vpcoptions.go
similarity index 92%
rename from goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_vpcoptions.go
rename to pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_vpcoptions.go
index 54833b0395..4953f7e00a 100644
--- a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_vpcoptions.go
+++ b/pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_vpcoptions.go
@@ -1,9 +1,9 @@
 package elasticsearch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain_VPCOptions AWS CloudFormation Resource (AWS::Elasticsearch::Domain.VPCOptions)
diff --git a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_zoneawarenessconfig.go b/pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_zoneawarenessconfig.go
similarity index 92%
rename from goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_zoneawarenessconfig.go
rename to pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_zoneawarenessconfig.go
index 094d6121d3..c986c21294 100644
--- a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_zoneawarenessconfig.go
+++ b/pkg/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_zoneawarenessconfig.go
@@ -1,9 +1,9 @@
 package elasticsearch
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain_ZoneAwarenessConfig AWS CloudFormation Resource (AWS::Elasticsearch::Domain.ZoneAwarenessConfig)
diff --git a/goformation/cloudformation/emr/aws-emr-cluster.go b/pkg/goformation/cloudformation/emr/aws-emr-cluster.go
similarity index 97%
rename from goformation/cloudformation/emr/aws-emr-cluster.go
rename to pkg/goformation/cloudformation/emr/aws-emr-cluster.go
index c029b028cd..f0438aa6e6 100644
--- a/goformation/cloudformation/emr/aws-emr-cluster.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-cluster.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster AWS CloudFormation Resource (AWS::EMR::Cluster)
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_application.go b/pkg/goformation/cloudformation/emr/aws-emr-cluster_application.go
similarity index 94%
rename from goformation/cloudformation/emr/aws-emr-cluster_application.go
rename to pkg/goformation/cloudformation/emr/aws-emr-cluster_application.go
index 6f79ef046b..8ff4a4cbce 100644
--- a/goformation/cloudformation/emr/aws-emr-cluster_application.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-cluster_application.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_Application AWS CloudFormation Resource (AWS::EMR::Cluster.Application)
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_autoscalingpolicy.go b/pkg/goformation/cloudformation/emr/aws-emr-cluster_autoscalingpolicy.go
similarity index 96%
rename from goformation/cloudformation/emr/aws-emr-cluster_autoscalingpolicy.go
rename to pkg/goformation/cloudformation/emr/aws-emr-cluster_autoscalingpolicy.go
index 5163856b09..1f3a08a3d8 100644
--- a/goformation/cloudformation/emr/aws-emr-cluster_autoscalingpolicy.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-cluster_autoscalingpolicy.go
@@ -1,7 +1,7 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_AutoScalingPolicy AWS CloudFormation Resource (AWS::EMR::Cluster.AutoScalingPolicy)
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_bootstrapactionconfig.go b/pkg/goformation/cloudformation/emr/aws-emr-cluster_bootstrapactionconfig.go
similarity index 93%
rename from goformation/cloudformation/emr/aws-emr-cluster_bootstrapactionconfig.go
rename to pkg/goformation/cloudformation/emr/aws-emr-cluster_bootstrapactionconfig.go
index 9a5e0deb2a..706d5ebf52 100644
--- a/goformation/cloudformation/emr/aws-emr-cluster_bootstrapactionconfig.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-cluster_bootstrapactionconfig.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_BootstrapActionConfig AWS CloudFormation Resource (AWS::EMR::Cluster.BootstrapActionConfig)
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_cloudwatchalarmdefinition.go b/pkg/goformation/cloudformation/emr/aws-emr-cluster_cloudwatchalarmdefinition.go
similarity index 96%
rename from goformation/cloudformation/emr/aws-emr-cluster_cloudwatchalarmdefinition.go
rename to pkg/goformation/cloudformation/emr/aws-emr-cluster_cloudwatchalarmdefinition.go
index f2d2fce32f..ac0df4fb07 100644
--- a/goformation/cloudformation/emr/aws-emr-cluster_cloudwatchalarmdefinition.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-cluster_cloudwatchalarmdefinition.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_CloudWatchAlarmDefinition AWS CloudFormation Resource (AWS::EMR::Cluster.CloudWatchAlarmDefinition)
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_computelimits.go b/pkg/goformation/cloudformation/emr/aws-emr-cluster_computelimits.go
similarity index 95%
rename from goformation/cloudformation/emr/aws-emr-cluster_computelimits.go
rename to pkg/goformation/cloudformation/emr/aws-emr-cluster_computelimits.go
index bc1d5bf436..f87af47c18 100644
--- a/goformation/cloudformation/emr/aws-emr-cluster_computelimits.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-cluster_computelimits.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_ComputeLimits AWS CloudFormation Resource (AWS::EMR::Cluster.ComputeLimits)
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_configuration.go b/pkg/goformation/cloudformation/emr/aws-emr-cluster_configuration.go
similarity index 94%
rename from goformation/cloudformation/emr/aws-emr-cluster_configuration.go
rename to pkg/goformation/cloudformation/emr/aws-emr-cluster_configuration.go
index 26602e1f0f..53a7fbd2f3 100644
--- a/goformation/cloudformation/emr/aws-emr-cluster_configuration.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-cluster_configuration.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_Configuration AWS CloudFormation Resource (AWS::EMR::Cluster.Configuration)
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_ebsblockdeviceconfig.go b/pkg/goformation/cloudformation/emr/aws-emr-cluster_ebsblockdeviceconfig.go
similarity index 93%
rename from goformation/cloudformation/emr/aws-emr-cluster_ebsblockdeviceconfig.go
rename to pkg/goformation/cloudformation/emr/aws-emr-cluster_ebsblockdeviceconfig.go
index c5aff2753a..2286fed870 100644
--- a/goformation/cloudformation/emr/aws-emr-cluster_ebsblockdeviceconfig.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-cluster_ebsblockdeviceconfig.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_EbsBlockDeviceConfig AWS CloudFormation Resource (AWS::EMR::Cluster.EbsBlockDeviceConfig)
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_ebsconfiguration.go b/pkg/goformation/cloudformation/emr/aws-emr-cluster_ebsconfiguration.go
similarity index 93%
rename from goformation/cloudformation/emr/aws-emr-cluster_ebsconfiguration.go
rename to pkg/goformation/cloudformation/emr/aws-emr-cluster_ebsconfiguration.go
index 3db15b65e8..783d59f8b6 100644
--- a/goformation/cloudformation/emr/aws-emr-cluster_ebsconfiguration.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-cluster_ebsconfiguration.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_EbsConfiguration AWS CloudFormation Resource (AWS::EMR::Cluster.EbsConfiguration)
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_hadoopjarstepconfig.go b/pkg/goformation/cloudformation/emr/aws-emr-cluster_hadoopjarstepconfig.go
similarity index 94%
rename from goformation/cloudformation/emr/aws-emr-cluster_hadoopjarstepconfig.go
rename to pkg/goformation/cloudformation/emr/aws-emr-cluster_hadoopjarstepconfig.go
index d65a5346e8..656806ea49 100644
--- a/goformation/cloudformation/emr/aws-emr-cluster_hadoopjarstepconfig.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-cluster_hadoopjarstepconfig.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_HadoopJarStepConfig AWS CloudFormation Resource (AWS::EMR::Cluster.HadoopJarStepConfig)
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_instancefleetconfig.go b/pkg/goformation/cloudformation/emr/aws-emr-cluster_instancefleetconfig.go
similarity index 95%
rename from goformation/cloudformation/emr/aws-emr-cluster_instancefleetconfig.go
rename to pkg/goformation/cloudformation/emr/aws-emr-cluster_instancefleetconfig.go
index e0b42ef270..4194414ff9 100644
--- a/goformation/cloudformation/emr/aws-emr-cluster_instancefleetconfig.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-cluster_instancefleetconfig.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_InstanceFleetConfig AWS CloudFormation Resource (AWS::EMR::Cluster.InstanceFleetConfig)
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_instancefleetprovisioningspecifications.go b/pkg/goformation/cloudformation/emr/aws-emr-cluster_instancefleetprovisioningspecifications.go
similarity index 96%
rename from goformation/cloudformation/emr/aws-emr-cluster_instancefleetprovisioningspecifications.go
rename to pkg/goformation/cloudformation/emr/aws-emr-cluster_instancefleetprovisioningspecifications.go
index 2a7cb3d32e..0b60a9febf 100644
--- a/goformation/cloudformation/emr/aws-emr-cluster_instancefleetprovisioningspecifications.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-cluster_instancefleetprovisioningspecifications.go
@@ -1,7 +1,7 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_InstanceFleetProvisioningSpecifications AWS CloudFormation Resource (AWS::EMR::Cluster.InstanceFleetProvisioningSpecifications)
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_instancegroupconfig.go b/pkg/goformation/cloudformation/emr/aws-emr-cluster_instancegroupconfig.go
similarity index 96%
rename from goformation/cloudformation/emr/aws-emr-cluster_instancegroupconfig.go
rename to pkg/goformation/cloudformation/emr/aws-emr-cluster_instancegroupconfig.go
index d735f24788..132848e041 100644
--- a/goformation/cloudformation/emr/aws-emr-cluster_instancegroupconfig.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-cluster_instancegroupconfig.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_InstanceGroupConfig AWS CloudFormation Resource (AWS::EMR::Cluster.InstanceGroupConfig)
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_instancetypeconfig.go b/pkg/goformation/cloudformation/emr/aws-emr-cluster_instancetypeconfig.go
similarity index 96%
rename from goformation/cloudformation/emr/aws-emr-cluster_instancetypeconfig.go
rename to pkg/goformation/cloudformation/emr/aws-emr-cluster_instancetypeconfig.go
index 2ef8919e15..212d7e9dd5 100644
--- a/goformation/cloudformation/emr/aws-emr-cluster_instancetypeconfig.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-cluster_instancetypeconfig.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_InstanceTypeConfig AWS CloudFormation Resource (AWS::EMR::Cluster.InstanceTypeConfig)
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_jobflowinstancesconfig.go b/pkg/goformation/cloudformation/emr/aws-emr-cluster_jobflowinstancesconfig.go
similarity index 98%
rename from goformation/cloudformation/emr/aws-emr-cluster_jobflowinstancesconfig.go
rename to pkg/goformation/cloudformation/emr/aws-emr-cluster_jobflowinstancesconfig.go
index 2b4cc862b3..df6393ae96 100644
--- a/goformation/cloudformation/emr/aws-emr-cluster_jobflowinstancesconfig.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-cluster_jobflowinstancesconfig.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_JobFlowInstancesConfig AWS CloudFormation Resource (AWS::EMR::Cluster.JobFlowInstancesConfig)
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_kerberosattributes.go b/pkg/goformation/cloudformation/emr/aws-emr-cluster_kerberosattributes.go
similarity index 95%
rename from goformation/cloudformation/emr/aws-emr-cluster_kerberosattributes.go
rename to pkg/goformation/cloudformation/emr/aws-emr-cluster_kerberosattributes.go
index a7a916ad2e..d6bf4787bc 100644
--- a/goformation/cloudformation/emr/aws-emr-cluster_kerberosattributes.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-cluster_kerberosattributes.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_KerberosAttributes AWS CloudFormation Resource (AWS::EMR::Cluster.KerberosAttributes)
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_keyvalue.go b/pkg/goformation/cloudformation/emr/aws-emr-cluster_keyvalue.go
similarity index 92%
rename from goformation/cloudformation/emr/aws-emr-cluster_keyvalue.go
rename to pkg/goformation/cloudformation/emr/aws-emr-cluster_keyvalue.go
index 0655d18076..0f585e3355 100644
--- a/goformation/cloudformation/emr/aws-emr-cluster_keyvalue.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-cluster_keyvalue.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_KeyValue AWS CloudFormation Resource (AWS::EMR::Cluster.KeyValue)
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_managedscalingpolicy.go b/pkg/goformation/cloudformation/emr/aws-emr-cluster_managedscalingpolicy.go
similarity index 95%
rename from goformation/cloudformation/emr/aws-emr-cluster_managedscalingpolicy.go
rename to pkg/goformation/cloudformation/emr/aws-emr-cluster_managedscalingpolicy.go
index 1714663fd6..83b9d4aa4c 100644
--- a/goformation/cloudformation/emr/aws-emr-cluster_managedscalingpolicy.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-cluster_managedscalingpolicy.go
@@ -1,7 +1,7 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_ManagedScalingPolicy AWS CloudFormation Resource (AWS::EMR::Cluster.ManagedScalingPolicy)
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_metricdimension.go b/pkg/goformation/cloudformation/emr/aws-emr-cluster_metricdimension.go
similarity index 92%
rename from goformation/cloudformation/emr/aws-emr-cluster_metricdimension.go
rename to pkg/goformation/cloudformation/emr/aws-emr-cluster_metricdimension.go
index 517ac1abd2..28db034f17 100644
--- a/goformation/cloudformation/emr/aws-emr-cluster_metricdimension.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-cluster_metricdimension.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_MetricDimension AWS CloudFormation Resource (AWS::EMR::Cluster.MetricDimension)
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_ondemandprovisioningspecification.go b/pkg/goformation/cloudformation/emr/aws-emr-cluster_ondemandprovisioningspecification.go
similarity index 92%
rename from goformation/cloudformation/emr/aws-emr-cluster_ondemandprovisioningspecification.go
rename to pkg/goformation/cloudformation/emr/aws-emr-cluster_ondemandprovisioningspecification.go
index 566fbc8e70..d4bd02866b 100644
--- a/goformation/cloudformation/emr/aws-emr-cluster_ondemandprovisioningspecification.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-cluster_ondemandprovisioningspecification.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_OnDemandProvisioningSpecification AWS CloudFormation Resource (AWS::EMR::Cluster.OnDemandProvisioningSpecification)
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_placementtype.go b/pkg/goformation/cloudformation/emr/aws-emr-cluster_placementtype.go
similarity index 91%
rename from goformation/cloudformation/emr/aws-emr-cluster_placementtype.go
rename to pkg/goformation/cloudformation/emr/aws-emr-cluster_placementtype.go
index 5f6c6827ff..25d6ee6371 100644
--- a/goformation/cloudformation/emr/aws-emr-cluster_placementtype.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-cluster_placementtype.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_PlacementType AWS CloudFormation Resource (AWS::EMR::Cluster.PlacementType)
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_scalingaction.go b/pkg/goformation/cloudformation/emr/aws-emr-cluster_scalingaction.go
similarity index 93%
rename from goformation/cloudformation/emr/aws-emr-cluster_scalingaction.go
rename to pkg/goformation/cloudformation/emr/aws-emr-cluster_scalingaction.go
index 52a09c3686..525b64d152 100644
--- a/goformation/cloudformation/emr/aws-emr-cluster_scalingaction.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-cluster_scalingaction.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_ScalingAction AWS CloudFormation Resource (AWS::EMR::Cluster.ScalingAction)
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_scalingconstraints.go b/pkg/goformation/cloudformation/emr/aws-emr-cluster_scalingconstraints.go
similarity index 93%
rename from goformation/cloudformation/emr/aws-emr-cluster_scalingconstraints.go
rename to pkg/goformation/cloudformation/emr/aws-emr-cluster_scalingconstraints.go
index aae84c3826..8644449276 100644
--- a/goformation/cloudformation/emr/aws-emr-cluster_scalingconstraints.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-cluster_scalingconstraints.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_ScalingConstraints AWS CloudFormation Resource (AWS::EMR::Cluster.ScalingConstraints)
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_scalingrule.go b/pkg/goformation/cloudformation/emr/aws-emr-cluster_scalingrule.go
similarity index 94%
rename from goformation/cloudformation/emr/aws-emr-cluster_scalingrule.go
rename to pkg/goformation/cloudformation/emr/aws-emr-cluster_scalingrule.go
index d060f30020..3405981673 100644
--- a/goformation/cloudformation/emr/aws-emr-cluster_scalingrule.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-cluster_scalingrule.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_ScalingRule AWS CloudFormation Resource (AWS::EMR::Cluster.ScalingRule)
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_scalingtrigger.go b/pkg/goformation/cloudformation/emr/aws-emr-cluster_scalingtrigger.go
similarity index 95%
rename from goformation/cloudformation/emr/aws-emr-cluster_scalingtrigger.go
rename to pkg/goformation/cloudformation/emr/aws-emr-cluster_scalingtrigger.go
index 3bc9f116aa..f281d46e7f 100644
--- a/goformation/cloudformation/emr/aws-emr-cluster_scalingtrigger.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-cluster_scalingtrigger.go
@@ -1,7 +1,7 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_ScalingTrigger AWS CloudFormation Resource (AWS::EMR::Cluster.ScalingTrigger)
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_scriptbootstrapactionconfig.go b/pkg/goformation/cloudformation/emr/aws-emr-cluster_scriptbootstrapactionconfig.go
similarity index 93%
rename from goformation/cloudformation/emr/aws-emr-cluster_scriptbootstrapactionconfig.go
rename to pkg/goformation/cloudformation/emr/aws-emr-cluster_scriptbootstrapactionconfig.go
index b297b12640..c76a9755da 100644
--- a/goformation/cloudformation/emr/aws-emr-cluster_scriptbootstrapactionconfig.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-cluster_scriptbootstrapactionconfig.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_ScriptBootstrapActionConfig AWS CloudFormation Resource (AWS::EMR::Cluster.ScriptBootstrapActionConfig)
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_simplescalingpolicyconfiguration.go b/pkg/goformation/cloudformation/emr/aws-emr-cluster_simplescalingpolicyconfiguration.go
similarity index 94%
rename from goformation/cloudformation/emr/aws-emr-cluster_simplescalingpolicyconfiguration.go
rename to pkg/goformation/cloudformation/emr/aws-emr-cluster_simplescalingpolicyconfiguration.go
index 2410621d9a..05274b3fa6 100644
--- a/goformation/cloudformation/emr/aws-emr-cluster_simplescalingpolicyconfiguration.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-cluster_simplescalingpolicyconfiguration.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_SimpleScalingPolicyConfiguration AWS CloudFormation Resource (AWS::EMR::Cluster.SimpleScalingPolicyConfiguration)
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_spotprovisioningspecification.go b/pkg/goformation/cloudformation/emr/aws-emr-cluster_spotprovisioningspecification.go
similarity index 95%
rename from goformation/cloudformation/emr/aws-emr-cluster_spotprovisioningspecification.go
rename to pkg/goformation/cloudformation/emr/aws-emr-cluster_spotprovisioningspecification.go
index 8cf4503cdc..9424946dbb 100644
--- a/goformation/cloudformation/emr/aws-emr-cluster_spotprovisioningspecification.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-cluster_spotprovisioningspecification.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_SpotProvisioningSpecification AWS CloudFormation Resource (AWS::EMR::Cluster.SpotProvisioningSpecification)
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_stepconfig.go b/pkg/goformation/cloudformation/emr/aws-emr-cluster_stepconfig.go
similarity index 93%
rename from goformation/cloudformation/emr/aws-emr-cluster_stepconfig.go
rename to pkg/goformation/cloudformation/emr/aws-emr-cluster_stepconfig.go
index c0fcfa52cf..6384618f72 100644
--- a/goformation/cloudformation/emr/aws-emr-cluster_stepconfig.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-cluster_stepconfig.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_StepConfig AWS CloudFormation Resource (AWS::EMR::Cluster.StepConfig)
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_volumespecification.go b/pkg/goformation/cloudformation/emr/aws-emr-cluster_volumespecification.go
similarity index 93%
rename from goformation/cloudformation/emr/aws-emr-cluster_volumespecification.go
rename to pkg/goformation/cloudformation/emr/aws-emr-cluster_volumespecification.go
index a06f86e91d..754e259141 100644
--- a/goformation/cloudformation/emr/aws-emr-cluster_volumespecification.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-cluster_volumespecification.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_VolumeSpecification AWS CloudFormation Resource (AWS::EMR::Cluster.VolumeSpecification)
diff --git a/goformation/cloudformation/emr/aws-emr-instancefleetconfig.go b/pkg/goformation/cloudformation/emr/aws-emr-instancefleetconfig.go
similarity index 97%
rename from goformation/cloudformation/emr/aws-emr-instancefleetconfig.go
rename to pkg/goformation/cloudformation/emr/aws-emr-instancefleetconfig.go
index 48d194f535..40701f67d4 100644
--- a/goformation/cloudformation/emr/aws-emr-instancefleetconfig.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-instancefleetconfig.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InstanceFleetConfig AWS CloudFormation Resource (AWS::EMR::InstanceFleetConfig)
diff --git a/goformation/cloudformation/emr/aws-emr-instancefleetconfig_configuration.go b/pkg/goformation/cloudformation/emr/aws-emr-instancefleetconfig_configuration.go
similarity index 94%
rename from goformation/cloudformation/emr/aws-emr-instancefleetconfig_configuration.go
rename to pkg/goformation/cloudformation/emr/aws-emr-instancefleetconfig_configuration.go
index 5afbb17ec4..b5bfb11b45 100644
--- a/goformation/cloudformation/emr/aws-emr-instancefleetconfig_configuration.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-instancefleetconfig_configuration.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InstanceFleetConfig_Configuration AWS CloudFormation Resource (AWS::EMR::InstanceFleetConfig.Configuration)
diff --git a/goformation/cloudformation/emr/aws-emr-instancefleetconfig_ebsblockdeviceconfig.go b/pkg/goformation/cloudformation/emr/aws-emr-instancefleetconfig_ebsblockdeviceconfig.go
similarity index 93%
rename from goformation/cloudformation/emr/aws-emr-instancefleetconfig_ebsblockdeviceconfig.go
rename to pkg/goformation/cloudformation/emr/aws-emr-instancefleetconfig_ebsblockdeviceconfig.go
index 789b84da45..211bb87de9 100644
--- a/goformation/cloudformation/emr/aws-emr-instancefleetconfig_ebsblockdeviceconfig.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-instancefleetconfig_ebsblockdeviceconfig.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InstanceFleetConfig_EbsBlockDeviceConfig AWS CloudFormation Resource (AWS::EMR::InstanceFleetConfig.EbsBlockDeviceConfig)
diff --git a/goformation/cloudformation/emr/aws-emr-instancefleetconfig_ebsconfiguration.go b/pkg/goformation/cloudformation/emr/aws-emr-instancefleetconfig_ebsconfiguration.go
similarity index 93%
rename from goformation/cloudformation/emr/aws-emr-instancefleetconfig_ebsconfiguration.go
rename to pkg/goformation/cloudformation/emr/aws-emr-instancefleetconfig_ebsconfiguration.go
index e864a89c0c..77d6517525 100644
--- a/goformation/cloudformation/emr/aws-emr-instancefleetconfig_ebsconfiguration.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-instancefleetconfig_ebsconfiguration.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InstanceFleetConfig_EbsConfiguration AWS CloudFormation Resource (AWS::EMR::InstanceFleetConfig.EbsConfiguration)
diff --git a/goformation/cloudformation/emr/aws-emr-instancefleetconfig_instancefleetprovisioningspecifications.go b/pkg/goformation/cloudformation/emr/aws-emr-instancefleetconfig_instancefleetprovisioningspecifications.go
similarity index 97%
rename from goformation/cloudformation/emr/aws-emr-instancefleetconfig_instancefleetprovisioningspecifications.go
rename to pkg/goformation/cloudformation/emr/aws-emr-instancefleetconfig_instancefleetprovisioningspecifications.go
index ceb925809f..e185dd7997 100644
--- a/goformation/cloudformation/emr/aws-emr-instancefleetconfig_instancefleetprovisioningspecifications.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-instancefleetconfig_instancefleetprovisioningspecifications.go
@@ -1,7 +1,7 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InstanceFleetConfig_InstanceFleetProvisioningSpecifications AWS CloudFormation Resource (AWS::EMR::InstanceFleetConfig.InstanceFleetProvisioningSpecifications)
diff --git a/goformation/cloudformation/emr/aws-emr-instancefleetconfig_instancetypeconfig.go b/pkg/goformation/cloudformation/emr/aws-emr-instancefleetconfig_instancetypeconfig.go
similarity index 96%
rename from goformation/cloudformation/emr/aws-emr-instancefleetconfig_instancetypeconfig.go
rename to pkg/goformation/cloudformation/emr/aws-emr-instancefleetconfig_instancetypeconfig.go
index abff697049..9289456fe8 100644
--- a/goformation/cloudformation/emr/aws-emr-instancefleetconfig_instancetypeconfig.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-instancefleetconfig_instancetypeconfig.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InstanceFleetConfig_InstanceTypeConfig AWS CloudFormation Resource (AWS::EMR::InstanceFleetConfig.InstanceTypeConfig)
diff --git a/goformation/cloudformation/emr/aws-emr-instancefleetconfig_ondemandprovisioningspecification.go b/pkg/goformation/cloudformation/emr/aws-emr-instancefleetconfig_ondemandprovisioningspecification.go
similarity index 92%
rename from goformation/cloudformation/emr/aws-emr-instancefleetconfig_ondemandprovisioningspecification.go
rename to pkg/goformation/cloudformation/emr/aws-emr-instancefleetconfig_ondemandprovisioningspecification.go
index 92b576cbe0..8c2ca35995 100644
--- a/goformation/cloudformation/emr/aws-emr-instancefleetconfig_ondemandprovisioningspecification.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-instancefleetconfig_ondemandprovisioningspecification.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InstanceFleetConfig_OnDemandProvisioningSpecification AWS CloudFormation Resource (AWS::EMR::InstanceFleetConfig.OnDemandProvisioningSpecification)
diff --git a/goformation/cloudformation/emr/aws-emr-instancefleetconfig_spotprovisioningspecification.go b/pkg/goformation/cloudformation/emr/aws-emr-instancefleetconfig_spotprovisioningspecification.go
similarity index 95%
rename from goformation/cloudformation/emr/aws-emr-instancefleetconfig_spotprovisioningspecification.go
rename to pkg/goformation/cloudformation/emr/aws-emr-instancefleetconfig_spotprovisioningspecification.go
index 464270f2a5..762728cf49 100644
--- a/goformation/cloudformation/emr/aws-emr-instancefleetconfig_spotprovisioningspecification.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-instancefleetconfig_spotprovisioningspecification.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InstanceFleetConfig_SpotProvisioningSpecification AWS CloudFormation Resource (AWS::EMR::InstanceFleetConfig.SpotProvisioningSpecification)
diff --git a/goformation/cloudformation/emr/aws-emr-instancefleetconfig_volumespecification.go b/pkg/goformation/cloudformation/emr/aws-emr-instancefleetconfig_volumespecification.go
similarity index 94%
rename from goformation/cloudformation/emr/aws-emr-instancefleetconfig_volumespecification.go
rename to pkg/goformation/cloudformation/emr/aws-emr-instancefleetconfig_volumespecification.go
index 8258310fdd..adac9ed083 100644
--- a/goformation/cloudformation/emr/aws-emr-instancefleetconfig_volumespecification.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-instancefleetconfig_volumespecification.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InstanceFleetConfig_VolumeSpecification AWS CloudFormation Resource (AWS::EMR::InstanceFleetConfig.VolumeSpecification)
diff --git a/goformation/cloudformation/emr/aws-emr-instancegroupconfig.go b/pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig.go
similarity index 97%
rename from goformation/cloudformation/emr/aws-emr-instancegroupconfig.go
rename to pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig.go
index 1b6206e0ee..9cf68b87f4 100644
--- a/goformation/cloudformation/emr/aws-emr-instancegroupconfig.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InstanceGroupConfig AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig)
diff --git a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_autoscalingpolicy.go b/pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_autoscalingpolicy.go
similarity index 96%
rename from goformation/cloudformation/emr/aws-emr-instancegroupconfig_autoscalingpolicy.go
rename to pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_autoscalingpolicy.go
index 1f7dee2107..b84ba34fd7 100644
--- a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_autoscalingpolicy.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_autoscalingpolicy.go
@@ -1,7 +1,7 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InstanceGroupConfig_AutoScalingPolicy AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.AutoScalingPolicy)
diff --git a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_cloudwatchalarmdefinition.go b/pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_cloudwatchalarmdefinition.go
similarity index 97%
rename from goformation/cloudformation/emr/aws-emr-instancegroupconfig_cloudwatchalarmdefinition.go
rename to pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_cloudwatchalarmdefinition.go
index ded05fcd3f..3f036feaa7 100644
--- a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_cloudwatchalarmdefinition.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_cloudwatchalarmdefinition.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InstanceGroupConfig_CloudWatchAlarmDefinition AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.CloudWatchAlarmDefinition)
diff --git a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_configuration.go b/pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_configuration.go
similarity index 94%
rename from goformation/cloudformation/emr/aws-emr-instancegroupconfig_configuration.go
rename to pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_configuration.go
index c3b5d80780..183eb28508 100644
--- a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_configuration.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_configuration.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InstanceGroupConfig_Configuration AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.Configuration)
diff --git a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_ebsblockdeviceconfig.go b/pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_ebsblockdeviceconfig.go
similarity index 93%
rename from goformation/cloudformation/emr/aws-emr-instancegroupconfig_ebsblockdeviceconfig.go
rename to pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_ebsblockdeviceconfig.go
index 2afeb60de0..d2d923eb50 100644
--- a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_ebsblockdeviceconfig.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_ebsblockdeviceconfig.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InstanceGroupConfig_EbsBlockDeviceConfig AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.EbsBlockDeviceConfig)
diff --git a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_ebsconfiguration.go b/pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_ebsconfiguration.go
similarity index 93%
rename from goformation/cloudformation/emr/aws-emr-instancegroupconfig_ebsconfiguration.go
rename to pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_ebsconfiguration.go
index fca2d68091..9c9c37ec77 100644
--- a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_ebsconfiguration.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_ebsconfiguration.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InstanceGroupConfig_EbsConfiguration AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.EbsConfiguration)
diff --git a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_metricdimension.go b/pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_metricdimension.go
similarity index 93%
rename from goformation/cloudformation/emr/aws-emr-instancegroupconfig_metricdimension.go
rename to pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_metricdimension.go
index c7fc1e2fb3..b03acd8d7c 100644
--- a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_metricdimension.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_metricdimension.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InstanceGroupConfig_MetricDimension AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.MetricDimension)
diff --git a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingaction.go b/pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingaction.go
similarity index 93%
rename from goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingaction.go
rename to pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingaction.go
index b416e3d9f5..b008798d64 100644
--- a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingaction.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingaction.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InstanceGroupConfig_ScalingAction AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.ScalingAction)
diff --git a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingconstraints.go b/pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingconstraints.go
similarity index 93%
rename from goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingconstraints.go
rename to pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingconstraints.go
index b1c7e84fab..c0df17801e 100644
--- a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingconstraints.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingconstraints.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InstanceGroupConfig_ScalingConstraints AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.ScalingConstraints)
diff --git a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingrule.go b/pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingrule.go
similarity index 94%
rename from goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingrule.go
rename to pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingrule.go
index 42651ab83b..ecc127278b 100644
--- a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingrule.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingrule.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InstanceGroupConfig_ScalingRule AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.ScalingRule)
diff --git a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingtrigger.go b/pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingtrigger.go
similarity index 96%
rename from goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingtrigger.go
rename to pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingtrigger.go
index 55c4065c6a..fe8d0c0608 100644
--- a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingtrigger.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingtrigger.go
@@ -1,7 +1,7 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InstanceGroupConfig_ScalingTrigger AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.ScalingTrigger)
diff --git a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_simplescalingpolicyconfiguration.go b/pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_simplescalingpolicyconfiguration.go
similarity index 94%
rename from goformation/cloudformation/emr/aws-emr-instancegroupconfig_simplescalingpolicyconfiguration.go
rename to pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_simplescalingpolicyconfiguration.go
index 2f5c75f2bf..d386693514 100644
--- a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_simplescalingpolicyconfiguration.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_simplescalingpolicyconfiguration.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InstanceGroupConfig_SimpleScalingPolicyConfiguration AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.SimpleScalingPolicyConfiguration)
diff --git a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_volumespecification.go b/pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_volumespecification.go
similarity index 94%
rename from goformation/cloudformation/emr/aws-emr-instancegroupconfig_volumespecification.go
rename to pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_volumespecification.go
index 4e9282a254..eb08fb8071 100644
--- a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_volumespecification.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-instancegroupconfig_volumespecification.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InstanceGroupConfig_VolumeSpecification AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.VolumeSpecification)
diff --git a/goformation/cloudformation/emr/aws-emr-securityconfiguration.go b/pkg/goformation/cloudformation/emr/aws-emr-securityconfiguration.go
similarity index 96%
rename from goformation/cloudformation/emr/aws-emr-securityconfiguration.go
rename to pkg/goformation/cloudformation/emr/aws-emr-securityconfiguration.go
index bb21cfa42d..2c1d6ac99e 100644
--- a/goformation/cloudformation/emr/aws-emr-securityconfiguration.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-securityconfiguration.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SecurityConfiguration AWS CloudFormation Resource (AWS::EMR::SecurityConfiguration)
diff --git a/goformation/cloudformation/emr/aws-emr-step.go b/pkg/goformation/cloudformation/emr/aws-emr-step.go
similarity index 97%
rename from goformation/cloudformation/emr/aws-emr-step.go
rename to pkg/goformation/cloudformation/emr/aws-emr-step.go
index 843cf433f9..104acd104a 100644
--- a/goformation/cloudformation/emr/aws-emr-step.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-step.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Step AWS CloudFormation Resource (AWS::EMR::Step)
diff --git a/goformation/cloudformation/emr/aws-emr-step_hadoopjarstepconfig.go b/pkg/goformation/cloudformation/emr/aws-emr-step_hadoopjarstepconfig.go
similarity index 94%
rename from goformation/cloudformation/emr/aws-emr-step_hadoopjarstepconfig.go
rename to pkg/goformation/cloudformation/emr/aws-emr-step_hadoopjarstepconfig.go
index 1c76c7c312..c2f2455c48 100644
--- a/goformation/cloudformation/emr/aws-emr-step_hadoopjarstepconfig.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-step_hadoopjarstepconfig.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Step_HadoopJarStepConfig AWS CloudFormation Resource (AWS::EMR::Step.HadoopJarStepConfig)
diff --git a/goformation/cloudformation/emr/aws-emr-step_keyvalue.go b/pkg/goformation/cloudformation/emr/aws-emr-step_keyvalue.go
similarity index 92%
rename from goformation/cloudformation/emr/aws-emr-step_keyvalue.go
rename to pkg/goformation/cloudformation/emr/aws-emr-step_keyvalue.go
index aa578ba997..e7f1be9b10 100644
--- a/goformation/cloudformation/emr/aws-emr-step_keyvalue.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-step_keyvalue.go
@@ -1,9 +1,9 @@
 package emr
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Step_KeyValue AWS CloudFormation Resource (AWS::EMR::Step.KeyValue)
diff --git a/goformation/cloudformation/emr/aws-emr-studio.go b/pkg/goformation/cloudformation/emr/aws-emr-studio.go
similarity index 96%
rename from goformation/cloudformation/emr/aws-emr-studio.go
rename to pkg/goformation/cloudformation/emr/aws-emr-studio.go
index 64d1b222f9..1660e671e4 100644
--- a/goformation/cloudformation/emr/aws-emr-studio.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-studio.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Studio AWS CloudFormation Resource (AWS::EMR::Studio)
diff --git a/goformation/cloudformation/emr/aws-emr-studiosessionmapping.go b/pkg/goformation/cloudformation/emr/aws-emr-studiosessionmapping.go
similarity index 97%
rename from goformation/cloudformation/emr/aws-emr-studiosessionmapping.go
rename to pkg/goformation/cloudformation/emr/aws-emr-studiosessionmapping.go
index 8387fe3a89..95e9ed4184 100644
--- a/goformation/cloudformation/emr/aws-emr-studiosessionmapping.go
+++ b/pkg/goformation/cloudformation/emr/aws-emr-studiosessionmapping.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StudioSessionMapping AWS CloudFormation Resource (AWS::EMR::StudioSessionMapping)
diff --git a/goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster.go b/pkg/goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster.go
similarity index 95%
rename from goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster.go
rename to pkg/goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster.go
index 12086748a4..d960e562ac 100644
--- a/goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster.go
+++ b/pkg/goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualCluster AWS CloudFormation Resource (AWS::EMRContainers::VirtualCluster)
diff --git a/goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_containerinfo.go b/pkg/goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_containerinfo.go
similarity index 95%
rename from goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_containerinfo.go
rename to pkg/goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_containerinfo.go
index 1ec3cc906b..4ab5027d26 100644
--- a/goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_containerinfo.go
+++ b/pkg/goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_containerinfo.go
@@ -1,7 +1,7 @@
 package emrcontainers
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualCluster_ContainerInfo AWS CloudFormation Resource (AWS::EMRContainers::VirtualCluster.ContainerInfo)
diff --git a/goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_containerprovider.go b/pkg/goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_containerprovider.go
similarity index 94%
rename from goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_containerprovider.go
rename to pkg/goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_containerprovider.go
index 2772b7e874..8714823e8f 100644
--- a/goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_containerprovider.go
+++ b/pkg/goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_containerprovider.go
@@ -1,9 +1,9 @@
 package emrcontainers
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualCluster_ContainerProvider AWS CloudFormation Resource (AWS::EMRContainers::VirtualCluster.ContainerProvider)
diff --git a/goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_eksinfo.go b/pkg/goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_eksinfo.go
similarity index 91%
rename from goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_eksinfo.go
rename to pkg/goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_eksinfo.go
index 255a99e51e..865a9ceb1c 100644
--- a/goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_eksinfo.go
+++ b/pkg/goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_eksinfo.go
@@ -1,9 +1,9 @@
 package emrcontainers
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualCluster_EksInfo AWS CloudFormation Resource (AWS::EMRContainers::VirtualCluster.EksInfo)
diff --git a/goformation/cloudformation/events/aws-events-apidestination.go b/pkg/goformation/cloudformation/events/aws-events-apidestination.go
similarity index 97%
rename from goformation/cloudformation/events/aws-events-apidestination.go
rename to pkg/goformation/cloudformation/events/aws-events-apidestination.go
index f0024a5f6c..0d0b2a2105 100644
--- a/goformation/cloudformation/events/aws-events-apidestination.go
+++ b/pkg/goformation/cloudformation/events/aws-events-apidestination.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApiDestination AWS CloudFormation Resource (AWS::Events::ApiDestination)
diff --git a/goformation/cloudformation/events/aws-events-archive.go b/pkg/goformation/cloudformation/events/aws-events-archive.go
similarity index 97%
rename from goformation/cloudformation/events/aws-events-archive.go
rename to pkg/goformation/cloudformation/events/aws-events-archive.go
index 69bb6f1542..66fc22fa1b 100644
--- a/goformation/cloudformation/events/aws-events-archive.go
+++ b/pkg/goformation/cloudformation/events/aws-events-archive.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Archive AWS CloudFormation Resource (AWS::Events::Archive)
diff --git a/goformation/cloudformation/events/aws-events-connection.go b/pkg/goformation/cloudformation/events/aws-events-connection.go
similarity index 97%
rename from goformation/cloudformation/events/aws-events-connection.go
rename to pkg/goformation/cloudformation/events/aws-events-connection.go
index 0fc9c4855b..48998aaa2c 100644
--- a/goformation/cloudformation/events/aws-events-connection.go
+++ b/pkg/goformation/cloudformation/events/aws-events-connection.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Connection AWS CloudFormation Resource (AWS::Events::Connection)
diff --git a/goformation/cloudformation/events/aws-events-eventbus.go b/pkg/goformation/cloudformation/events/aws-events-eventbus.go
similarity index 96%
rename from goformation/cloudformation/events/aws-events-eventbus.go
rename to pkg/goformation/cloudformation/events/aws-events-eventbus.go
index aa124cfe8b..7cf91c9100 100644
--- a/goformation/cloudformation/events/aws-events-eventbus.go
+++ b/pkg/goformation/cloudformation/events/aws-events-eventbus.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EventBus AWS CloudFormation Resource (AWS::Events::EventBus)
diff --git a/goformation/cloudformation/events/aws-events-eventbuspolicy.go b/pkg/goformation/cloudformation/events/aws-events-eventbuspolicy.go
similarity index 97%
rename from goformation/cloudformation/events/aws-events-eventbuspolicy.go
rename to pkg/goformation/cloudformation/events/aws-events-eventbuspolicy.go
index b6c925b40a..67e5a979a9 100644
--- a/goformation/cloudformation/events/aws-events-eventbuspolicy.go
+++ b/pkg/goformation/cloudformation/events/aws-events-eventbuspolicy.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EventBusPolicy AWS CloudFormation Resource (AWS::Events::EventBusPolicy)
diff --git a/goformation/cloudformation/events/aws-events-eventbuspolicy_condition.go b/pkg/goformation/cloudformation/events/aws-events-eventbuspolicy_condition.go
similarity index 93%
rename from goformation/cloudformation/events/aws-events-eventbuspolicy_condition.go
rename to pkg/goformation/cloudformation/events/aws-events-eventbuspolicy_condition.go
index 64cd5da028..b0d01a8045 100644
--- a/goformation/cloudformation/events/aws-events-eventbuspolicy_condition.go
+++ b/pkg/goformation/cloudformation/events/aws-events-eventbuspolicy_condition.go
@@ -1,9 +1,9 @@
 package events
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EventBusPolicy_Condition AWS CloudFormation Resource (AWS::Events::EventBusPolicy.Condition)
diff --git a/goformation/cloudformation/events/aws-events-rule.go b/pkg/goformation/cloudformation/events/aws-events-rule.go
similarity index 97%
rename from goformation/cloudformation/events/aws-events-rule.go
rename to pkg/goformation/cloudformation/events/aws-events-rule.go
index 0224dfaeec..bd00e0733a 100644
--- a/goformation/cloudformation/events/aws-events-rule.go
+++ b/pkg/goformation/cloudformation/events/aws-events-rule.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Rule AWS CloudFormation Resource (AWS::Events::Rule)
diff --git a/goformation/cloudformation/events/aws-events-rule_awsvpcconfiguration.go b/pkg/goformation/cloudformation/events/aws-events-rule_awsvpcconfiguration.go
similarity index 93%
rename from goformation/cloudformation/events/aws-events-rule_awsvpcconfiguration.go
rename to pkg/goformation/cloudformation/events/aws-events-rule_awsvpcconfiguration.go
index 506c28081e..49039ad3ce 100644
--- a/goformation/cloudformation/events/aws-events-rule_awsvpcconfiguration.go
+++ b/pkg/goformation/cloudformation/events/aws-events-rule_awsvpcconfiguration.go
@@ -1,9 +1,9 @@
 package events
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Rule_AwsVpcConfiguration AWS CloudFormation Resource (AWS::Events::Rule.AwsVpcConfiguration)
diff --git a/goformation/cloudformation/events/aws-events-rule_batcharrayproperties.go b/pkg/goformation/cloudformation/events/aws-events-rule_batcharrayproperties.go
similarity index 91%
rename from goformation/cloudformation/events/aws-events-rule_batcharrayproperties.go
rename to pkg/goformation/cloudformation/events/aws-events-rule_batcharrayproperties.go
index 4cfec587d7..98ca592df1 100644
--- a/goformation/cloudformation/events/aws-events-rule_batcharrayproperties.go
+++ b/pkg/goformation/cloudformation/events/aws-events-rule_batcharrayproperties.go
@@ -1,9 +1,9 @@
 package events
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Rule_BatchArrayProperties AWS CloudFormation Resource (AWS::Events::Rule.BatchArrayProperties)
diff --git a/goformation/cloudformation/events/aws-events-rule_batchparameters.go b/pkg/goformation/cloudformation/events/aws-events-rule_batchparameters.go
similarity index 94%
rename from goformation/cloudformation/events/aws-events-rule_batchparameters.go
rename to pkg/goformation/cloudformation/events/aws-events-rule_batchparameters.go
index d024a0deb1..2a93fddac7 100644
--- a/goformation/cloudformation/events/aws-events-rule_batchparameters.go
+++ b/pkg/goformation/cloudformation/events/aws-events-rule_batchparameters.go
@@ -1,9 +1,9 @@
 package events
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Rule_BatchParameters AWS CloudFormation Resource (AWS::Events::Rule.BatchParameters)
diff --git a/goformation/cloudformation/events/aws-events-rule_batchretrystrategy.go b/pkg/goformation/cloudformation/events/aws-events-rule_batchretrystrategy.go
similarity index 91%
rename from goformation/cloudformation/events/aws-events-rule_batchretrystrategy.go
rename to pkg/goformation/cloudformation/events/aws-events-rule_batchretrystrategy.go
index ea4526eaff..e7897f346d 100644
--- a/goformation/cloudformation/events/aws-events-rule_batchretrystrategy.go
+++ b/pkg/goformation/cloudformation/events/aws-events-rule_batchretrystrategy.go
@@ -1,9 +1,9 @@
 package events
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Rule_BatchRetryStrategy AWS CloudFormation Resource (AWS::Events::Rule.BatchRetryStrategy)
diff --git a/goformation/cloudformation/events/aws-events-rule_capacityproviderstrategyitem.go b/pkg/goformation/cloudformation/events/aws-events-rule_capacityproviderstrategyitem.go
similarity index 94%
rename from goformation/cloudformation/events/aws-events-rule_capacityproviderstrategyitem.go
rename to pkg/goformation/cloudformation/events/aws-events-rule_capacityproviderstrategyitem.go
index f7b4ebd7ee..232c3a6218 100644
--- a/goformation/cloudformation/events/aws-events-rule_capacityproviderstrategyitem.go
+++ b/pkg/goformation/cloudformation/events/aws-events-rule_capacityproviderstrategyitem.go
@@ -1,9 +1,9 @@
 package events
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Rule_CapacityProviderStrategyItem AWS CloudFormation Resource (AWS::Events::Rule.CapacityProviderStrategyItem)
diff --git a/goformation/cloudformation/events/aws-events-rule_deadletterconfig.go b/pkg/goformation/cloudformation/events/aws-events-rule_deadletterconfig.go
similarity index 91%
rename from goformation/cloudformation/events/aws-events-rule_deadletterconfig.go
rename to pkg/goformation/cloudformation/events/aws-events-rule_deadletterconfig.go
index fa41e85435..70a5096c50 100644
--- a/goformation/cloudformation/events/aws-events-rule_deadletterconfig.go
+++ b/pkg/goformation/cloudformation/events/aws-events-rule_deadletterconfig.go
@@ -1,9 +1,9 @@
 package events
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Rule_DeadLetterConfig AWS CloudFormation Resource (AWS::Events::Rule.DeadLetterConfig)
diff --git a/goformation/cloudformation/events/aws-events-rule_ecsparameters.go b/pkg/goformation/cloudformation/events/aws-events-rule_ecsparameters.go
similarity index 96%
rename from goformation/cloudformation/events/aws-events-rule_ecsparameters.go
rename to pkg/goformation/cloudformation/events/aws-events-rule_ecsparameters.go
index ba38d108dd..28a1f1d321 100644
--- a/goformation/cloudformation/events/aws-events-rule_ecsparameters.go
+++ b/pkg/goformation/cloudformation/events/aws-events-rule_ecsparameters.go
@@ -1,10 +1,10 @@
 package events
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Rule_EcsParameters AWS CloudFormation Resource (AWS::Events::Rule.EcsParameters)
diff --git a/goformation/cloudformation/events/aws-events-rule_httpparameters.go b/pkg/goformation/cloudformation/events/aws-events-rule_httpparameters.go
similarity index 93%
rename from goformation/cloudformation/events/aws-events-rule_httpparameters.go
rename to pkg/goformation/cloudformation/events/aws-events-rule_httpparameters.go
index 155d215fb5..45fff35871 100644
--- a/goformation/cloudformation/events/aws-events-rule_httpparameters.go
+++ b/pkg/goformation/cloudformation/events/aws-events-rule_httpparameters.go
@@ -1,9 +1,9 @@
 package events
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Rule_HttpParameters AWS CloudFormation Resource (AWS::Events::Rule.HttpParameters)
diff --git a/goformation/cloudformation/events/aws-events-rule_inputtransformer.go b/pkg/goformation/cloudformation/events/aws-events-rule_inputtransformer.go
similarity index 92%
rename from goformation/cloudformation/events/aws-events-rule_inputtransformer.go
rename to pkg/goformation/cloudformation/events/aws-events-rule_inputtransformer.go
index fd8ab02396..7457961ead 100644
--- a/goformation/cloudformation/events/aws-events-rule_inputtransformer.go
+++ b/pkg/goformation/cloudformation/events/aws-events-rule_inputtransformer.go
@@ -1,9 +1,9 @@
 package events
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Rule_InputTransformer AWS CloudFormation Resource (AWS::Events::Rule.InputTransformer)
diff --git a/goformation/cloudformation/events/aws-events-rule_kinesisparameters.go b/pkg/goformation/cloudformation/events/aws-events-rule_kinesisparameters.go
similarity index 91%
rename from goformation/cloudformation/events/aws-events-rule_kinesisparameters.go
rename to pkg/goformation/cloudformation/events/aws-events-rule_kinesisparameters.go
index 52a767343a..45f8af3580 100644
--- a/goformation/cloudformation/events/aws-events-rule_kinesisparameters.go
+++ b/pkg/goformation/cloudformation/events/aws-events-rule_kinesisparameters.go
@@ -1,9 +1,9 @@
 package events
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Rule_KinesisParameters AWS CloudFormation Resource (AWS::Events::Rule.KinesisParameters)
diff --git a/goformation/cloudformation/events/aws-events-rule_networkconfiguration.go b/pkg/goformation/cloudformation/events/aws-events-rule_networkconfiguration.go
similarity index 95%
rename from goformation/cloudformation/events/aws-events-rule_networkconfiguration.go
rename to pkg/goformation/cloudformation/events/aws-events-rule_networkconfiguration.go
index 201d124a42..ef61426340 100644
--- a/goformation/cloudformation/events/aws-events-rule_networkconfiguration.go
+++ b/pkg/goformation/cloudformation/events/aws-events-rule_networkconfiguration.go
@@ -1,7 +1,7 @@
 package events
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Rule_NetworkConfiguration AWS CloudFormation Resource (AWS::Events::Rule.NetworkConfiguration)
diff --git a/goformation/cloudformation/events/aws-events-rule_placementconstraint.go b/pkg/goformation/cloudformation/events/aws-events-rule_placementconstraint.go
similarity index 92%
rename from goformation/cloudformation/events/aws-events-rule_placementconstraint.go
rename to pkg/goformation/cloudformation/events/aws-events-rule_placementconstraint.go
index f9cfc20414..2f323fc07b 100644
--- a/goformation/cloudformation/events/aws-events-rule_placementconstraint.go
+++ b/pkg/goformation/cloudformation/events/aws-events-rule_placementconstraint.go
@@ -1,9 +1,9 @@
 package events
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Rule_PlacementConstraint AWS CloudFormation Resource (AWS::Events::Rule.PlacementConstraint)
diff --git a/goformation/cloudformation/events/aws-events-rule_placementstrategy.go b/pkg/goformation/cloudformation/events/aws-events-rule_placementstrategy.go
similarity index 92%
rename from goformation/cloudformation/events/aws-events-rule_placementstrategy.go
rename to pkg/goformation/cloudformation/events/aws-events-rule_placementstrategy.go
index 754e7833f7..fa6cf1d058 100644
--- a/goformation/cloudformation/events/aws-events-rule_placementstrategy.go
+++ b/pkg/goformation/cloudformation/events/aws-events-rule_placementstrategy.go
@@ -1,9 +1,9 @@
 package events
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Rule_PlacementStrategy AWS CloudFormation Resource (AWS::Events::Rule.PlacementStrategy)
diff --git a/goformation/cloudformation/events/aws-events-rule_redshiftdataparameters.go b/pkg/goformation/cloudformation/events/aws-events-rule_redshiftdataparameters.go
similarity index 95%
rename from goformation/cloudformation/events/aws-events-rule_redshiftdataparameters.go
rename to pkg/goformation/cloudformation/events/aws-events-rule_redshiftdataparameters.go
index cef2d2cc45..66b961d550 100644
--- a/goformation/cloudformation/events/aws-events-rule_redshiftdataparameters.go
+++ b/pkg/goformation/cloudformation/events/aws-events-rule_redshiftdataparameters.go
@@ -1,9 +1,9 @@
 package events
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Rule_RedshiftDataParameters AWS CloudFormation Resource (AWS::Events::Rule.RedshiftDataParameters)
diff --git a/goformation/cloudformation/events/aws-events-rule_retrypolicy.go b/pkg/goformation/cloudformation/events/aws-events-rule_retrypolicy.go
similarity index 92%
rename from goformation/cloudformation/events/aws-events-rule_retrypolicy.go
rename to pkg/goformation/cloudformation/events/aws-events-rule_retrypolicy.go
index 570f44d482..bb20fc570f 100644
--- a/goformation/cloudformation/events/aws-events-rule_retrypolicy.go
+++ b/pkg/goformation/cloudformation/events/aws-events-rule_retrypolicy.go
@@ -1,9 +1,9 @@
 package events
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Rule_RetryPolicy AWS CloudFormation Resource (AWS::Events::Rule.RetryPolicy)
diff --git a/goformation/cloudformation/events/aws-events-rule_runcommandparameters.go b/pkg/goformation/cloudformation/events/aws-events-rule_runcommandparameters.go
similarity index 95%
rename from goformation/cloudformation/events/aws-events-rule_runcommandparameters.go
rename to pkg/goformation/cloudformation/events/aws-events-rule_runcommandparameters.go
index ff3c6f8b8b..b92ac743b8 100644
--- a/goformation/cloudformation/events/aws-events-rule_runcommandparameters.go
+++ b/pkg/goformation/cloudformation/events/aws-events-rule_runcommandparameters.go
@@ -1,7 +1,7 @@
 package events
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Rule_RunCommandParameters AWS CloudFormation Resource (AWS::Events::Rule.RunCommandParameters)
diff --git a/goformation/cloudformation/events/aws-events-rule_runcommandtarget.go b/pkg/goformation/cloudformation/events/aws-events-rule_runcommandtarget.go
similarity index 92%
rename from goformation/cloudformation/events/aws-events-rule_runcommandtarget.go
rename to pkg/goformation/cloudformation/events/aws-events-rule_runcommandtarget.go
index aaa51813ed..3216b42065 100644
--- a/goformation/cloudformation/events/aws-events-rule_runcommandtarget.go
+++ b/pkg/goformation/cloudformation/events/aws-events-rule_runcommandtarget.go
@@ -1,9 +1,9 @@
 package events
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Rule_RunCommandTarget AWS CloudFormation Resource (AWS::Events::Rule.RunCommandTarget)
diff --git a/goformation/cloudformation/events/aws-events-rule_sqsparameters.go b/pkg/goformation/cloudformation/events/aws-events-rule_sqsparameters.go
similarity index 91%
rename from goformation/cloudformation/events/aws-events-rule_sqsparameters.go
rename to pkg/goformation/cloudformation/events/aws-events-rule_sqsparameters.go
index 6f5e0531d3..0c5a284970 100644
--- a/goformation/cloudformation/events/aws-events-rule_sqsparameters.go
+++ b/pkg/goformation/cloudformation/events/aws-events-rule_sqsparameters.go
@@ -1,9 +1,9 @@
 package events
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Rule_SqsParameters AWS CloudFormation Resource (AWS::Events::Rule.SqsParameters)
diff --git a/goformation/cloudformation/events/aws-events-rule_tag.go b/pkg/goformation/cloudformation/events/aws-events-rule_tag.go
similarity index 92%
rename from goformation/cloudformation/events/aws-events-rule_tag.go
rename to pkg/goformation/cloudformation/events/aws-events-rule_tag.go
index 4602c33b08..f6b5a621b5 100644
--- a/goformation/cloudformation/events/aws-events-rule_tag.go
+++ b/pkg/goformation/cloudformation/events/aws-events-rule_tag.go
@@ -1,9 +1,9 @@
 package events
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Rule_Tag AWS CloudFormation Resource (AWS::Events::Rule.Tag)
diff --git a/goformation/cloudformation/events/aws-events-rule_target.go b/pkg/goformation/cloudformation/events/aws-events-rule_target.go
similarity index 97%
rename from goformation/cloudformation/events/aws-events-rule_target.go
rename to pkg/goformation/cloudformation/events/aws-events-rule_target.go
index 78d1e1c85a..9f35a4a0b9 100644
--- a/goformation/cloudformation/events/aws-events-rule_target.go
+++ b/pkg/goformation/cloudformation/events/aws-events-rule_target.go
@@ -1,9 +1,9 @@
 package events
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Rule_Target AWS CloudFormation Resource (AWS::Events::Rule.Target)
diff --git a/goformation/cloudformation/eventschemas/aws-eventschemas-discoverer.go b/pkg/goformation/cloudformation/eventschemas/aws-eventschemas-discoverer.go
similarity index 97%
rename from goformation/cloudformation/eventschemas/aws-eventschemas-discoverer.go
rename to pkg/goformation/cloudformation/eventschemas/aws-eventschemas-discoverer.go
index 4cec171e19..b71c343779 100644
--- a/goformation/cloudformation/eventschemas/aws-eventschemas-discoverer.go
+++ b/pkg/goformation/cloudformation/eventschemas/aws-eventschemas-discoverer.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Discoverer AWS CloudFormation Resource (AWS::EventSchemas::Discoverer)
diff --git a/goformation/cloudformation/eventschemas/aws-eventschemas-discoverer_tagsentry.go b/pkg/goformation/cloudformation/eventschemas/aws-eventschemas-discoverer_tagsentry.go
similarity index 92%
rename from goformation/cloudformation/eventschemas/aws-eventschemas-discoverer_tagsentry.go
rename to pkg/goformation/cloudformation/eventschemas/aws-eventschemas-discoverer_tagsentry.go
index a21a671380..fdaa4c6ca0 100644
--- a/goformation/cloudformation/eventschemas/aws-eventschemas-discoverer_tagsentry.go
+++ b/pkg/goformation/cloudformation/eventschemas/aws-eventschemas-discoverer_tagsentry.go
@@ -1,9 +1,9 @@
 package eventschemas
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Discoverer_TagsEntry AWS CloudFormation Resource (AWS::EventSchemas::Discoverer.TagsEntry)
diff --git a/goformation/cloudformation/eventschemas/aws-eventschemas-registry.go b/pkg/goformation/cloudformation/eventschemas/aws-eventschemas-registry.go
similarity index 96%
rename from goformation/cloudformation/eventschemas/aws-eventschemas-registry.go
rename to pkg/goformation/cloudformation/eventschemas/aws-eventschemas-registry.go
index bfa97fe69e..7c86bf05af 100644
--- a/goformation/cloudformation/eventschemas/aws-eventschemas-registry.go
+++ b/pkg/goformation/cloudformation/eventschemas/aws-eventschemas-registry.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Registry AWS CloudFormation Resource (AWS::EventSchemas::Registry)
diff --git a/goformation/cloudformation/eventschemas/aws-eventschemas-registry_tagsentry.go b/pkg/goformation/cloudformation/eventschemas/aws-eventschemas-registry_tagsentry.go
similarity index 92%
rename from goformation/cloudformation/eventschemas/aws-eventschemas-registry_tagsentry.go
rename to pkg/goformation/cloudformation/eventschemas/aws-eventschemas-registry_tagsentry.go
index e863af093d..17b463901d 100644
--- a/goformation/cloudformation/eventschemas/aws-eventschemas-registry_tagsentry.go
+++ b/pkg/goformation/cloudformation/eventschemas/aws-eventschemas-registry_tagsentry.go
@@ -1,9 +1,9 @@
 package eventschemas
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Registry_TagsEntry AWS CloudFormation Resource (AWS::EventSchemas::Registry.TagsEntry)
diff --git a/goformation/cloudformation/eventschemas/aws-eventschemas-registrypolicy.go b/pkg/goformation/cloudformation/eventschemas/aws-eventschemas-registrypolicy.go
similarity index 96%
rename from goformation/cloudformation/eventschemas/aws-eventschemas-registrypolicy.go
rename to pkg/goformation/cloudformation/eventschemas/aws-eventschemas-registrypolicy.go
index 3d2821b190..5d0631e772 100644
--- a/goformation/cloudformation/eventschemas/aws-eventschemas-registrypolicy.go
+++ b/pkg/goformation/cloudformation/eventschemas/aws-eventschemas-registrypolicy.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RegistryPolicy AWS CloudFormation Resource (AWS::EventSchemas::RegistryPolicy)
diff --git a/goformation/cloudformation/eventschemas/aws-eventschemas-schema.go b/pkg/goformation/cloudformation/eventschemas/aws-eventschemas-schema.go
similarity index 97%
rename from goformation/cloudformation/eventschemas/aws-eventschemas-schema.go
rename to pkg/goformation/cloudformation/eventschemas/aws-eventschemas-schema.go
index 88ed15fa3d..a10f7a0f55 100644
--- a/goformation/cloudformation/eventschemas/aws-eventschemas-schema.go
+++ b/pkg/goformation/cloudformation/eventschemas/aws-eventschemas-schema.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Schema AWS CloudFormation Resource (AWS::EventSchemas::Schema)
diff --git a/goformation/cloudformation/eventschemas/aws-eventschemas-schema_tagsentry.go b/pkg/goformation/cloudformation/eventschemas/aws-eventschemas-schema_tagsentry.go
similarity index 92%
rename from goformation/cloudformation/eventschemas/aws-eventschemas-schema_tagsentry.go
rename to pkg/goformation/cloudformation/eventschemas/aws-eventschemas-schema_tagsentry.go
index 447ca59341..82cf6f3e38 100644
--- a/goformation/cloudformation/eventschemas/aws-eventschemas-schema_tagsentry.go
+++ b/pkg/goformation/cloudformation/eventschemas/aws-eventschemas-schema_tagsentry.go
@@ -1,9 +1,9 @@
 package eventschemas
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Schema_TagsEntry AWS CloudFormation Resource (AWS::EventSchemas::Schema.TagsEntry)
diff --git a/goformation/cloudformation/evidently/aws-evidently-experiment.go b/pkg/goformation/cloudformation/evidently/aws-evidently-experiment.go
similarity index 96%
rename from goformation/cloudformation/evidently/aws-evidently-experiment.go
rename to pkg/goformation/cloudformation/evidently/aws-evidently-experiment.go
index bc0ef5603a..ba101aea7b 100644
--- a/goformation/cloudformation/evidently/aws-evidently-experiment.go
+++ b/pkg/goformation/cloudformation/evidently/aws-evidently-experiment.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Experiment AWS CloudFormation Resource (AWS::Evidently::Experiment)
diff --git a/goformation/cloudformation/evidently/aws-evidently-experiment_metricgoalobject.go b/pkg/goformation/cloudformation/evidently/aws-evidently-experiment_metricgoalobject.go
similarity index 95%
rename from goformation/cloudformation/evidently/aws-evidently-experiment_metricgoalobject.go
rename to pkg/goformation/cloudformation/evidently/aws-evidently-experiment_metricgoalobject.go
index 0ba8e1bcb0..5cb4b6426c 100644
--- a/goformation/cloudformation/evidently/aws-evidently-experiment_metricgoalobject.go
+++ b/pkg/goformation/cloudformation/evidently/aws-evidently-experiment_metricgoalobject.go
@@ -1,9 +1,9 @@
 package evidently
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Experiment_MetricGoalObject AWS CloudFormation Resource (AWS::Evidently::Experiment.MetricGoalObject)
diff --git a/goformation/cloudformation/evidently/aws-evidently-experiment_onlineabconfigobject.go b/pkg/goformation/cloudformation/evidently/aws-evidently-experiment_onlineabconfigobject.go
similarity index 93%
rename from goformation/cloudformation/evidently/aws-evidently-experiment_onlineabconfigobject.go
rename to pkg/goformation/cloudformation/evidently/aws-evidently-experiment_onlineabconfigobject.go
index b151921866..c8d0400b43 100644
--- a/goformation/cloudformation/evidently/aws-evidently-experiment_onlineabconfigobject.go
+++ b/pkg/goformation/cloudformation/evidently/aws-evidently-experiment_onlineabconfigobject.go
@@ -1,9 +1,9 @@
 package evidently
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Experiment_OnlineAbConfigObject AWS CloudFormation Resource (AWS::Evidently::Experiment.OnlineAbConfigObject)
diff --git a/goformation/cloudformation/evidently/aws-evidently-experiment_treatmentobject.go b/pkg/goformation/cloudformation/evidently/aws-evidently-experiment_treatmentobject.go
similarity index 94%
rename from goformation/cloudformation/evidently/aws-evidently-experiment_treatmentobject.go
rename to pkg/goformation/cloudformation/evidently/aws-evidently-experiment_treatmentobject.go
index fb9964b251..758876fffe 100644
--- a/goformation/cloudformation/evidently/aws-evidently-experiment_treatmentobject.go
+++ b/pkg/goformation/cloudformation/evidently/aws-evidently-experiment_treatmentobject.go
@@ -1,9 +1,9 @@
 package evidently
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Experiment_TreatmentObject AWS CloudFormation Resource (AWS::Evidently::Experiment.TreatmentObject)
diff --git a/goformation/cloudformation/evidently/aws-evidently-experiment_treatmenttoweight.go b/pkg/goformation/cloudformation/evidently/aws-evidently-experiment_treatmenttoweight.go
similarity index 93%
rename from goformation/cloudformation/evidently/aws-evidently-experiment_treatmenttoweight.go
rename to pkg/goformation/cloudformation/evidently/aws-evidently-experiment_treatmenttoweight.go
index 41ca5fc8cf..605fc425de 100644
--- a/goformation/cloudformation/evidently/aws-evidently-experiment_treatmenttoweight.go
+++ b/pkg/goformation/cloudformation/evidently/aws-evidently-experiment_treatmenttoweight.go
@@ -1,9 +1,9 @@
 package evidently
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Experiment_TreatmentToWeight AWS CloudFormation Resource (AWS::Evidently::Experiment.TreatmentToWeight)
diff --git a/goformation/cloudformation/evidently/aws-evidently-feature.go b/pkg/goformation/cloudformation/evidently/aws-evidently-feature.go
similarity index 96%
rename from goformation/cloudformation/evidently/aws-evidently-feature.go
rename to pkg/goformation/cloudformation/evidently/aws-evidently-feature.go
index f6f50ace76..70e2e6ba97 100644
--- a/goformation/cloudformation/evidently/aws-evidently-feature.go
+++ b/pkg/goformation/cloudformation/evidently/aws-evidently-feature.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Feature AWS CloudFormation Resource (AWS::Evidently::Feature)
diff --git a/goformation/cloudformation/evidently/aws-evidently-feature_entityoverride.go b/pkg/goformation/cloudformation/evidently/aws-evidently-feature_entityoverride.go
similarity index 92%
rename from goformation/cloudformation/evidently/aws-evidently-feature_entityoverride.go
rename to pkg/goformation/cloudformation/evidently/aws-evidently-feature_entityoverride.go
index 624ce285f5..db025f22e0 100644
--- a/goformation/cloudformation/evidently/aws-evidently-feature_entityoverride.go
+++ b/pkg/goformation/cloudformation/evidently/aws-evidently-feature_entityoverride.go
@@ -1,9 +1,9 @@
 package evidently
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Feature_EntityOverride AWS CloudFormation Resource (AWS::Evidently::Feature.EntityOverride)
diff --git a/goformation/cloudformation/evidently/aws-evidently-feature_variationobject.go b/pkg/goformation/cloudformation/evidently/aws-evidently-feature_variationobject.go
similarity index 95%
rename from goformation/cloudformation/evidently/aws-evidently-feature_variationobject.go
rename to pkg/goformation/cloudformation/evidently/aws-evidently-feature_variationobject.go
index 1bd791322a..da4228fb96 100644
--- a/goformation/cloudformation/evidently/aws-evidently-feature_variationobject.go
+++ b/pkg/goformation/cloudformation/evidently/aws-evidently-feature_variationobject.go
@@ -1,9 +1,9 @@
 package evidently
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Feature_VariationObject AWS CloudFormation Resource (AWS::Evidently::Feature.VariationObject)
diff --git a/goformation/cloudformation/evidently/aws-evidently-launch.go b/pkg/goformation/cloudformation/evidently/aws-evidently-launch.go
similarity index 96%
rename from goformation/cloudformation/evidently/aws-evidently-launch.go
rename to pkg/goformation/cloudformation/evidently/aws-evidently-launch.go
index 50695fb090..641fda9518 100644
--- a/goformation/cloudformation/evidently/aws-evidently-launch.go
+++ b/pkg/goformation/cloudformation/evidently/aws-evidently-launch.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Launch AWS CloudFormation Resource (AWS::Evidently::Launch)
diff --git a/goformation/cloudformation/evidently/aws-evidently-launch_grouptoweight.go b/pkg/goformation/cloudformation/evidently/aws-evidently-launch_grouptoweight.go
similarity index 92%
rename from goformation/cloudformation/evidently/aws-evidently-launch_grouptoweight.go
rename to pkg/goformation/cloudformation/evidently/aws-evidently-launch_grouptoweight.go
index 4d2b5e845a..573c261aa6 100644
--- a/goformation/cloudformation/evidently/aws-evidently-launch_grouptoweight.go
+++ b/pkg/goformation/cloudformation/evidently/aws-evidently-launch_grouptoweight.go
@@ -1,9 +1,9 @@
 package evidently
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Launch_GroupToWeight AWS CloudFormation Resource (AWS::Evidently::Launch.GroupToWeight)
diff --git a/goformation/cloudformation/evidently/aws-evidently-launch_launchgroupobject.go b/pkg/goformation/cloudformation/evidently/aws-evidently-launch_launchgroupobject.go
similarity index 94%
rename from goformation/cloudformation/evidently/aws-evidently-launch_launchgroupobject.go
rename to pkg/goformation/cloudformation/evidently/aws-evidently-launch_launchgroupobject.go
index 44dcb6405f..b1284ffb8c 100644
--- a/goformation/cloudformation/evidently/aws-evidently-launch_launchgroupobject.go
+++ b/pkg/goformation/cloudformation/evidently/aws-evidently-launch_launchgroupobject.go
@@ -1,9 +1,9 @@
 package evidently
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Launch_LaunchGroupObject AWS CloudFormation Resource (AWS::Evidently::Launch.LaunchGroupObject)
diff --git a/goformation/cloudformation/evidently/aws-evidently-launch_metricdefinitionobject.go b/pkg/goformation/cloudformation/evidently/aws-evidently-launch_metricdefinitionobject.go
similarity index 95%
rename from goformation/cloudformation/evidently/aws-evidently-launch_metricdefinitionobject.go
rename to pkg/goformation/cloudformation/evidently/aws-evidently-launch_metricdefinitionobject.go
index 38f56422dd..0c9aa7191f 100644
--- a/goformation/cloudformation/evidently/aws-evidently-launch_metricdefinitionobject.go
+++ b/pkg/goformation/cloudformation/evidently/aws-evidently-launch_metricdefinitionobject.go
@@ -1,9 +1,9 @@
 package evidently
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Launch_MetricDefinitionObject AWS CloudFormation Resource (AWS::Evidently::Launch.MetricDefinitionObject)
diff --git a/goformation/cloudformation/evidently/aws-evidently-launch_stepconfig.go b/pkg/goformation/cloudformation/evidently/aws-evidently-launch_stepconfig.go
similarity index 92%
rename from goformation/cloudformation/evidently/aws-evidently-launch_stepconfig.go
rename to pkg/goformation/cloudformation/evidently/aws-evidently-launch_stepconfig.go
index 85362b32ac..4f7f964262 100644
--- a/goformation/cloudformation/evidently/aws-evidently-launch_stepconfig.go
+++ b/pkg/goformation/cloudformation/evidently/aws-evidently-launch_stepconfig.go
@@ -1,9 +1,9 @@
 package evidently
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Launch_StepConfig AWS CloudFormation Resource (AWS::Evidently::Launch.StepConfig)
diff --git a/goformation/cloudformation/evidently/aws-evidently-project.go b/pkg/goformation/cloudformation/evidently/aws-evidently-project.go
similarity index 95%
rename from goformation/cloudformation/evidently/aws-evidently-project.go
rename to pkg/goformation/cloudformation/evidently/aws-evidently-project.go
index 12330d45aa..33140076e2 100644
--- a/goformation/cloudformation/evidently/aws-evidently-project.go
+++ b/pkg/goformation/cloudformation/evidently/aws-evidently-project.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project AWS CloudFormation Resource (AWS::Evidently::Project)
diff --git a/goformation/cloudformation/evidently/aws-evidently-project_datadeliveryobject.go b/pkg/goformation/cloudformation/evidently/aws-evidently-project_datadeliveryobject.go
similarity index 92%
rename from goformation/cloudformation/evidently/aws-evidently-project_datadeliveryobject.go
rename to pkg/goformation/cloudformation/evidently/aws-evidently-project_datadeliveryobject.go
index a00dbd4844..37927ecd22 100644
--- a/goformation/cloudformation/evidently/aws-evidently-project_datadeliveryobject.go
+++ b/pkg/goformation/cloudformation/evidently/aws-evidently-project_datadeliveryobject.go
@@ -1,9 +1,9 @@
 package evidently
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project_DataDeliveryObject AWS CloudFormation Resource (AWS::Evidently::Project.DataDeliveryObject)
diff --git a/goformation/cloudformation/evidently/aws-evidently-project_s3destination.go b/pkg/goformation/cloudformation/evidently/aws-evidently-project_s3destination.go
similarity index 92%
rename from goformation/cloudformation/evidently/aws-evidently-project_s3destination.go
rename to pkg/goformation/cloudformation/evidently/aws-evidently-project_s3destination.go
index 78a00595b3..5741608118 100644
--- a/goformation/cloudformation/evidently/aws-evidently-project_s3destination.go
+++ b/pkg/goformation/cloudformation/evidently/aws-evidently-project_s3destination.go
@@ -1,9 +1,9 @@
 package evidently
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project_S3Destination AWS CloudFormation Resource (AWS::Evidently::Project.S3Destination)
diff --git a/goformation/cloudformation/finspace/aws-finspace-environment.go b/pkg/goformation/cloudformation/finspace/aws-finspace-environment.go
similarity index 97%
rename from goformation/cloudformation/finspace/aws-finspace-environment.go
rename to pkg/goformation/cloudformation/finspace/aws-finspace-environment.go
index b83372c62d..6d0426cbc9 100644
--- a/goformation/cloudformation/finspace/aws-finspace-environment.go
+++ b/pkg/goformation/cloudformation/finspace/aws-finspace-environment.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Environment AWS CloudFormation Resource (AWS::FinSpace::Environment)
diff --git a/goformation/cloudformation/finspace/aws-finspace-environment_federationparameters.go b/pkg/goformation/cloudformation/finspace/aws-finspace-environment_federationparameters.go
similarity index 95%
rename from goformation/cloudformation/finspace/aws-finspace-environment_federationparameters.go
rename to pkg/goformation/cloudformation/finspace/aws-finspace-environment_federationparameters.go
index 11df394cc0..74073aab4b 100644
--- a/goformation/cloudformation/finspace/aws-finspace-environment_federationparameters.go
+++ b/pkg/goformation/cloudformation/finspace/aws-finspace-environment_federationparameters.go
@@ -1,9 +1,9 @@
 package finspace
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Environment_FederationParameters AWS CloudFormation Resource (AWS::FinSpace::Environment.FederationParameters)
diff --git a/goformation/cloudformation/finspace/aws-finspace-environment_superuserparameters.go b/pkg/goformation/cloudformation/finspace/aws-finspace-environment_superuserparameters.go
similarity index 94%
rename from goformation/cloudformation/finspace/aws-finspace-environment_superuserparameters.go
rename to pkg/goformation/cloudformation/finspace/aws-finspace-environment_superuserparameters.go
index 505246e3b3..284a256f33 100644
--- a/goformation/cloudformation/finspace/aws-finspace-environment_superuserparameters.go
+++ b/pkg/goformation/cloudformation/finspace/aws-finspace-environment_superuserparameters.go
@@ -1,9 +1,9 @@
 package finspace
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Environment_SuperuserParameters AWS CloudFormation Resource (AWS::FinSpace::Environment.SuperuserParameters)
diff --git a/goformation/cloudformation/fis/aws-fis-experimenttemplate.go b/pkg/goformation/cloudformation/fis/aws-fis-experimenttemplate.go
similarity index 97%
rename from goformation/cloudformation/fis/aws-fis-experimenttemplate.go
rename to pkg/goformation/cloudformation/fis/aws-fis-experimenttemplate.go
index 6fb80e94c6..294f8da1b3 100644
--- a/goformation/cloudformation/fis/aws-fis-experimenttemplate.go
+++ b/pkg/goformation/cloudformation/fis/aws-fis-experimenttemplate.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ExperimentTemplate AWS CloudFormation Resource (AWS::FIS::ExperimentTemplate)
diff --git a/goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplateaction.go b/pkg/goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplateaction.go
similarity index 95%
rename from goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplateaction.go
rename to pkg/goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplateaction.go
index 0339ac704e..ee7d8f7d24 100644
--- a/goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplateaction.go
+++ b/pkg/goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplateaction.go
@@ -1,9 +1,9 @@
 package fis
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ExperimentTemplate_ExperimentTemplateAction AWS CloudFormation Resource (AWS::FIS::ExperimentTemplate.ExperimentTemplateAction)
diff --git a/goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatestopcondition.go b/pkg/goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatestopcondition.go
similarity index 93%
rename from goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatestopcondition.go
rename to pkg/goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatestopcondition.go
index ebab49c0e2..c41a504281 100644
--- a/goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatestopcondition.go
+++ b/pkg/goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatestopcondition.go
@@ -1,9 +1,9 @@
 package fis
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ExperimentTemplate_ExperimentTemplateStopCondition AWS CloudFormation Resource (AWS::FIS::ExperimentTemplate.ExperimentTemplateStopCondition)
diff --git a/goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatetarget.go b/pkg/goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatetarget.go
similarity index 95%
rename from goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatetarget.go
rename to pkg/goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatetarget.go
index f9f4a6441e..753bcb490a 100644
--- a/goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatetarget.go
+++ b/pkg/goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatetarget.go
@@ -1,9 +1,9 @@
 package fis
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ExperimentTemplate_ExperimentTemplateTarget AWS CloudFormation Resource (AWS::FIS::ExperimentTemplate.ExperimentTemplateTarget)
diff --git a/goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatetargetfilter.go b/pkg/goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatetargetfilter.go
similarity index 93%
rename from goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatetargetfilter.go
rename to pkg/goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatetargetfilter.go
index 99f5c046af..f244703da1 100644
--- a/goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatetargetfilter.go
+++ b/pkg/goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatetargetfilter.go
@@ -1,9 +1,9 @@
 package fis
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ExperimentTemplate_ExperimentTemplateTargetFilter AWS CloudFormation Resource (AWS::FIS::ExperimentTemplate.ExperimentTemplateTargetFilter)
diff --git a/goformation/cloudformation/fms/aws-fms-notificationchannel.go b/pkg/goformation/cloudformation/fms/aws-fms-notificationchannel.go
similarity index 96%
rename from goformation/cloudformation/fms/aws-fms-notificationchannel.go
rename to pkg/goformation/cloudformation/fms/aws-fms-notificationchannel.go
index e00f926f39..1192738bab 100644
--- a/goformation/cloudformation/fms/aws-fms-notificationchannel.go
+++ b/pkg/goformation/cloudformation/fms/aws-fms-notificationchannel.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NotificationChannel AWS CloudFormation Resource (AWS::FMS::NotificationChannel)
diff --git a/goformation/cloudformation/fms/aws-fms-policy.go b/pkg/goformation/cloudformation/fms/aws-fms-policy.go
similarity index 97%
rename from goformation/cloudformation/fms/aws-fms-policy.go
rename to pkg/goformation/cloudformation/fms/aws-fms-policy.go
index 2d3647f8a2..b679ded83b 100644
--- a/goformation/cloudformation/fms/aws-fms-policy.go
+++ b/pkg/goformation/cloudformation/fms/aws-fms-policy.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Policy AWS CloudFormation Resource (AWS::FMS::Policy)
diff --git a/goformation/cloudformation/fms/aws-fms-policy_iemap.go b/pkg/goformation/cloudformation/fms/aws-fms-policy_iemap.go
similarity index 92%
rename from goformation/cloudformation/fms/aws-fms-policy_iemap.go
rename to pkg/goformation/cloudformation/fms/aws-fms-policy_iemap.go
index 2a4fd0d68e..d9959593f4 100644
--- a/goformation/cloudformation/fms/aws-fms-policy_iemap.go
+++ b/pkg/goformation/cloudformation/fms/aws-fms-policy_iemap.go
@@ -1,9 +1,9 @@
 package fms
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Policy_IEMap AWS CloudFormation Resource (AWS::FMS::Policy.IEMap)
diff --git a/goformation/cloudformation/fms/aws-fms-policy_policytag.go b/pkg/goformation/cloudformation/fms/aws-fms-policy_policytag.go
similarity index 92%
rename from goformation/cloudformation/fms/aws-fms-policy_policytag.go
rename to pkg/goformation/cloudformation/fms/aws-fms-policy_policytag.go
index 934bd4d24e..69dc2768bd 100644
--- a/goformation/cloudformation/fms/aws-fms-policy_policytag.go
+++ b/pkg/goformation/cloudformation/fms/aws-fms-policy_policytag.go
@@ -1,9 +1,9 @@
 package fms
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Policy_PolicyTag AWS CloudFormation Resource (AWS::FMS::Policy.PolicyTag)
diff --git a/goformation/cloudformation/fms/aws-fms-policy_resourcetag.go b/pkg/goformation/cloudformation/fms/aws-fms-policy_resourcetag.go
similarity index 92%
rename from goformation/cloudformation/fms/aws-fms-policy_resourcetag.go
rename to pkg/goformation/cloudformation/fms/aws-fms-policy_resourcetag.go
index 9f0e2d1f8e..39ec01df6b 100644
--- a/goformation/cloudformation/fms/aws-fms-policy_resourcetag.go
+++ b/pkg/goformation/cloudformation/fms/aws-fms-policy_resourcetag.go
@@ -1,9 +1,9 @@
 package fms
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Policy_ResourceTag AWS CloudFormation Resource (AWS::FMS::Policy.ResourceTag)
diff --git a/goformation/cloudformation/frauddetector/aws-frauddetector-detector.go b/pkg/goformation/cloudformation/frauddetector/aws-frauddetector-detector.go
similarity index 96%
rename from goformation/cloudformation/frauddetector/aws-frauddetector-detector.go
rename to pkg/goformation/cloudformation/frauddetector/aws-frauddetector-detector.go
index fb587ac642..0c75a19a7a 100644
--- a/goformation/cloudformation/frauddetector/aws-frauddetector-detector.go
+++ b/pkg/goformation/cloudformation/frauddetector/aws-frauddetector-detector.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Detector AWS CloudFormation Resource (AWS::FraudDetector::Detector)
diff --git a/goformation/cloudformation/frauddetector/aws-frauddetector-detector_entitytype.go b/pkg/goformation/cloudformation/frauddetector/aws-frauddetector-detector_entitytype.go
similarity index 93%
rename from goformation/cloudformation/frauddetector/aws-frauddetector-detector_entitytype.go
rename to pkg/goformation/cloudformation/frauddetector/aws-frauddetector-detector_entitytype.go
index 25938cf193..d794828e2d 100644
--- a/goformation/cloudformation/frauddetector/aws-frauddetector-detector_entitytype.go
+++ b/pkg/goformation/cloudformation/frauddetector/aws-frauddetector-detector_entitytype.go
@@ -1,10 +1,10 @@
 package frauddetector
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Detector_EntityType AWS CloudFormation Resource (AWS::FraudDetector::Detector.EntityType)
diff --git a/goformation/cloudformation/frauddetector/aws-frauddetector-detector_eventtype.go b/pkg/goformation/cloudformation/frauddetector/aws-frauddetector-detector_eventtype.go
similarity index 94%
rename from goformation/cloudformation/frauddetector/aws-frauddetector-detector_eventtype.go
rename to pkg/goformation/cloudformation/frauddetector/aws-frauddetector-detector_eventtype.go
index 7d4d3a5f90..900a5b7225 100644
--- a/goformation/cloudformation/frauddetector/aws-frauddetector-detector_eventtype.go
+++ b/pkg/goformation/cloudformation/frauddetector/aws-frauddetector-detector_eventtype.go
@@ -1,10 +1,10 @@
 package frauddetector
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Detector_EventType AWS CloudFormation Resource (AWS::FraudDetector::Detector.EventType)
diff --git a/goformation/cloudformation/frauddetector/aws-frauddetector-detector_eventvariable.go b/pkg/goformation/cloudformation/frauddetector/aws-frauddetector-detector_eventvariable.go
similarity index 95%
rename from goformation/cloudformation/frauddetector/aws-frauddetector-detector_eventvariable.go
rename to pkg/goformation/cloudformation/frauddetector/aws-frauddetector-detector_eventvariable.go
index effa5fbad2..3a96237f6a 100644
--- a/goformation/cloudformation/frauddetector/aws-frauddetector-detector_eventvariable.go
+++ b/pkg/goformation/cloudformation/frauddetector/aws-frauddetector-detector_eventvariable.go
@@ -1,10 +1,10 @@
 package frauddetector
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Detector_EventVariable AWS CloudFormation Resource (AWS::FraudDetector::Detector.EventVariable)
diff --git a/goformation/cloudformation/frauddetector/aws-frauddetector-detector_label.go b/pkg/goformation/cloudformation/frauddetector/aws-frauddetector-detector_label.go
similarity index 93%
rename from goformation/cloudformation/frauddetector/aws-frauddetector-detector_label.go
rename to pkg/goformation/cloudformation/frauddetector/aws-frauddetector-detector_label.go
index b35d2793dd..add83dd1b2 100644
--- a/goformation/cloudformation/frauddetector/aws-frauddetector-detector_label.go
+++ b/pkg/goformation/cloudformation/frauddetector/aws-frauddetector-detector_label.go
@@ -1,10 +1,10 @@
 package frauddetector
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Detector_Label AWS CloudFormation Resource (AWS::FraudDetector::Detector.Label)
diff --git a/goformation/cloudformation/frauddetector/aws-frauddetector-detector_model.go b/pkg/goformation/cloudformation/frauddetector/aws-frauddetector-detector_model.go
similarity index 91%
rename from goformation/cloudformation/frauddetector/aws-frauddetector-detector_model.go
rename to pkg/goformation/cloudformation/frauddetector/aws-frauddetector-detector_model.go
index c9bcdc6255..419ccbf58d 100644
--- a/goformation/cloudformation/frauddetector/aws-frauddetector-detector_model.go
+++ b/pkg/goformation/cloudformation/frauddetector/aws-frauddetector-detector_model.go
@@ -1,9 +1,9 @@
 package frauddetector
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Detector_Model AWS CloudFormation Resource (AWS::FraudDetector::Detector.Model)
diff --git a/goformation/cloudformation/frauddetector/aws-frauddetector-detector_outcome.go b/pkg/goformation/cloudformation/frauddetector/aws-frauddetector-detector_outcome.go
similarity index 93%
rename from goformation/cloudformation/frauddetector/aws-frauddetector-detector_outcome.go
rename to pkg/goformation/cloudformation/frauddetector/aws-frauddetector-detector_outcome.go
index 3d9be83cc5..f5e038ac0b 100644
--- a/goformation/cloudformation/frauddetector/aws-frauddetector-detector_outcome.go
+++ b/pkg/goformation/cloudformation/frauddetector/aws-frauddetector-detector_outcome.go
@@ -1,10 +1,10 @@
 package frauddetector
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Detector_Outcome AWS CloudFormation Resource (AWS::FraudDetector::Detector.Outcome)
diff --git a/goformation/cloudformation/frauddetector/aws-frauddetector-detector_rule.go b/pkg/goformation/cloudformation/frauddetector/aws-frauddetector-detector_rule.go
similarity index 95%
rename from goformation/cloudformation/frauddetector/aws-frauddetector-detector_rule.go
rename to pkg/goformation/cloudformation/frauddetector/aws-frauddetector-detector_rule.go
index 21f404ba45..f7a892ebfa 100644
--- a/goformation/cloudformation/frauddetector/aws-frauddetector-detector_rule.go
+++ b/pkg/goformation/cloudformation/frauddetector/aws-frauddetector-detector_rule.go
@@ -1,10 +1,10 @@
 package frauddetector
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Detector_Rule AWS CloudFormation Resource (AWS::FraudDetector::Detector.Rule)
diff --git a/goformation/cloudformation/frauddetector/aws-frauddetector-entitytype.go b/pkg/goformation/cloudformation/frauddetector/aws-frauddetector-entitytype.go
similarity index 95%
rename from goformation/cloudformation/frauddetector/aws-frauddetector-entitytype.go
rename to pkg/goformation/cloudformation/frauddetector/aws-frauddetector-entitytype.go
index 16e8db728e..f034b8c355 100644
--- a/goformation/cloudformation/frauddetector/aws-frauddetector-entitytype.go
+++ b/pkg/goformation/cloudformation/frauddetector/aws-frauddetector-entitytype.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EntityType AWS CloudFormation Resource (AWS::FraudDetector::EntityType)
diff --git a/goformation/cloudformation/frauddetector/aws-frauddetector-eventtype.go b/pkg/goformation/cloudformation/frauddetector/aws-frauddetector-eventtype.go
similarity index 96%
rename from goformation/cloudformation/frauddetector/aws-frauddetector-eventtype.go
rename to pkg/goformation/cloudformation/frauddetector/aws-frauddetector-eventtype.go
index 2e9fcf16e8..7fe3f577bf 100644
--- a/goformation/cloudformation/frauddetector/aws-frauddetector-eventtype.go
+++ b/pkg/goformation/cloudformation/frauddetector/aws-frauddetector-eventtype.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EventType AWS CloudFormation Resource (AWS::FraudDetector::EventType)
diff --git a/goformation/cloudformation/frauddetector/aws-frauddetector-eventtype_entitytype.go b/pkg/goformation/cloudformation/frauddetector/aws-frauddetector-eventtype_entitytype.go
similarity index 93%
rename from goformation/cloudformation/frauddetector/aws-frauddetector-eventtype_entitytype.go
rename to pkg/goformation/cloudformation/frauddetector/aws-frauddetector-eventtype_entitytype.go
index 2310f53842..9ae148ccc7 100644
--- a/goformation/cloudformation/frauddetector/aws-frauddetector-eventtype_entitytype.go
+++ b/pkg/goformation/cloudformation/frauddetector/aws-frauddetector-eventtype_entitytype.go
@@ -1,10 +1,10 @@
 package frauddetector
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EventType_EntityType AWS CloudFormation Resource (AWS::FraudDetector::EventType.EntityType)
diff --git a/goformation/cloudformation/frauddetector/aws-frauddetector-eventtype_eventvariable.go b/pkg/goformation/cloudformation/frauddetector/aws-frauddetector-eventtype_eventvariable.go
similarity index 95%
rename from goformation/cloudformation/frauddetector/aws-frauddetector-eventtype_eventvariable.go
rename to pkg/goformation/cloudformation/frauddetector/aws-frauddetector-eventtype_eventvariable.go
index c4edd730f0..4d44ccdc5f 100644
--- a/goformation/cloudformation/frauddetector/aws-frauddetector-eventtype_eventvariable.go
+++ b/pkg/goformation/cloudformation/frauddetector/aws-frauddetector-eventtype_eventvariable.go
@@ -1,10 +1,10 @@
 package frauddetector
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EventType_EventVariable AWS CloudFormation Resource (AWS::FraudDetector::EventType.EventVariable)
diff --git a/goformation/cloudformation/frauddetector/aws-frauddetector-eventtype_label.go b/pkg/goformation/cloudformation/frauddetector/aws-frauddetector-eventtype_label.go
similarity index 93%
rename from goformation/cloudformation/frauddetector/aws-frauddetector-eventtype_label.go
rename to pkg/goformation/cloudformation/frauddetector/aws-frauddetector-eventtype_label.go
index 1016049055..d6e763bb9b 100644
--- a/goformation/cloudformation/frauddetector/aws-frauddetector-eventtype_label.go
+++ b/pkg/goformation/cloudformation/frauddetector/aws-frauddetector-eventtype_label.go
@@ -1,10 +1,10 @@
 package frauddetector
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EventType_Label AWS CloudFormation Resource (AWS::FraudDetector::EventType.Label)
diff --git a/goformation/cloudformation/frauddetector/aws-frauddetector-label.go b/pkg/goformation/cloudformation/frauddetector/aws-frauddetector-label.go
similarity index 95%
rename from goformation/cloudformation/frauddetector/aws-frauddetector-label.go
rename to pkg/goformation/cloudformation/frauddetector/aws-frauddetector-label.go
index f1e983a54e..9ab291a781 100644
--- a/goformation/cloudformation/frauddetector/aws-frauddetector-label.go
+++ b/pkg/goformation/cloudformation/frauddetector/aws-frauddetector-label.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Label AWS CloudFormation Resource (AWS::FraudDetector::Label)
diff --git a/goformation/cloudformation/frauddetector/aws-frauddetector-outcome.go b/pkg/goformation/cloudformation/frauddetector/aws-frauddetector-outcome.go
similarity index 95%
rename from goformation/cloudformation/frauddetector/aws-frauddetector-outcome.go
rename to pkg/goformation/cloudformation/frauddetector/aws-frauddetector-outcome.go
index 4c54733e9e..35575c68e1 100644
--- a/goformation/cloudformation/frauddetector/aws-frauddetector-outcome.go
+++ b/pkg/goformation/cloudformation/frauddetector/aws-frauddetector-outcome.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Outcome AWS CloudFormation Resource (AWS::FraudDetector::Outcome)
diff --git a/goformation/cloudformation/frauddetector/aws-frauddetector-variable.go b/pkg/goformation/cloudformation/frauddetector/aws-frauddetector-variable.go
similarity index 96%
rename from goformation/cloudformation/frauddetector/aws-frauddetector-variable.go
rename to pkg/goformation/cloudformation/frauddetector/aws-frauddetector-variable.go
index fff736ba08..614eedd0a1 100644
--- a/goformation/cloudformation/frauddetector/aws-frauddetector-variable.go
+++ b/pkg/goformation/cloudformation/frauddetector/aws-frauddetector-variable.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Variable AWS CloudFormation Resource (AWS::FraudDetector::Variable)
diff --git a/goformation/cloudformation/fsx/aws-fsx-filesystem.go b/pkg/goformation/cloudformation/fsx/aws-fsx-filesystem.go
similarity index 97%
rename from goformation/cloudformation/fsx/aws-fsx-filesystem.go
rename to pkg/goformation/cloudformation/fsx/aws-fsx-filesystem.go
index 4b393fbada..7d502db026 100644
--- a/goformation/cloudformation/fsx/aws-fsx-filesystem.go
+++ b/pkg/goformation/cloudformation/fsx/aws-fsx-filesystem.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FileSystem AWS CloudFormation Resource (AWS::FSx::FileSystem)
diff --git a/goformation/cloudformation/fsx/aws-fsx-filesystem_auditlogconfiguration.go b/pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_auditlogconfiguration.go
similarity index 94%
rename from goformation/cloudformation/fsx/aws-fsx-filesystem_auditlogconfiguration.go
rename to pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_auditlogconfiguration.go
index 7a022911f2..fa04db43c1 100644
--- a/goformation/cloudformation/fsx/aws-fsx-filesystem_auditlogconfiguration.go
+++ b/pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_auditlogconfiguration.go
@@ -1,9 +1,9 @@
 package fsx
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FileSystem_AuditLogConfiguration AWS CloudFormation Resource (AWS::FSx::FileSystem.AuditLogConfiguration)
diff --git a/goformation/cloudformation/fsx/aws-fsx-filesystem_clientconfigurations.go b/pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_clientconfigurations.go
similarity index 93%
rename from goformation/cloudformation/fsx/aws-fsx-filesystem_clientconfigurations.go
rename to pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_clientconfigurations.go
index bed51de0a4..227b650a2a 100644
--- a/goformation/cloudformation/fsx/aws-fsx-filesystem_clientconfigurations.go
+++ b/pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_clientconfigurations.go
@@ -1,9 +1,9 @@
 package fsx
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FileSystem_ClientConfigurations AWS CloudFormation Resource (AWS::FSx::FileSystem.ClientConfigurations)
diff --git a/goformation/cloudformation/fsx/aws-fsx-filesystem_diskiopsconfiguration.go b/pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_diskiopsconfiguration.go
similarity index 93%
rename from goformation/cloudformation/fsx/aws-fsx-filesystem_diskiopsconfiguration.go
rename to pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_diskiopsconfiguration.go
index 9faacc5003..b629a5cc2d 100644
--- a/goformation/cloudformation/fsx/aws-fsx-filesystem_diskiopsconfiguration.go
+++ b/pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_diskiopsconfiguration.go
@@ -1,9 +1,9 @@
 package fsx
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FileSystem_DiskIopsConfiguration AWS CloudFormation Resource (AWS::FSx::FileSystem.DiskIopsConfiguration)
diff --git a/goformation/cloudformation/fsx/aws-fsx-filesystem_lustreconfiguration.go b/pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_lustreconfiguration.go
similarity index 97%
rename from goformation/cloudformation/fsx/aws-fsx-filesystem_lustreconfiguration.go
rename to pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_lustreconfiguration.go
index 7387f51df0..22c5e5f398 100644
--- a/goformation/cloudformation/fsx/aws-fsx-filesystem_lustreconfiguration.go
+++ b/pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_lustreconfiguration.go
@@ -1,9 +1,9 @@
 package fsx
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FileSystem_LustreConfiguration AWS CloudFormation Resource (AWS::FSx::FileSystem.LustreConfiguration)
diff --git a/goformation/cloudformation/fsx/aws-fsx-filesystem_nfsexports.go b/pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_nfsexports.go
similarity index 95%
rename from goformation/cloudformation/fsx/aws-fsx-filesystem_nfsexports.go
rename to pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_nfsexports.go
index f662f3587c..feceeb913b 100644
--- a/goformation/cloudformation/fsx/aws-fsx-filesystem_nfsexports.go
+++ b/pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_nfsexports.go
@@ -1,7 +1,7 @@
 package fsx
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FileSystem_NfsExports AWS CloudFormation Resource (AWS::FSx::FileSystem.NfsExports)
diff --git a/goformation/cloudformation/fsx/aws-fsx-filesystem_ontapconfiguration.go b/pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_ontapconfiguration.go
similarity index 97%
rename from goformation/cloudformation/fsx/aws-fsx-filesystem_ontapconfiguration.go
rename to pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_ontapconfiguration.go
index a1806f2737..c6944879b0 100644
--- a/goformation/cloudformation/fsx/aws-fsx-filesystem_ontapconfiguration.go
+++ b/pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_ontapconfiguration.go
@@ -1,9 +1,9 @@
 package fsx
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FileSystem_OntapConfiguration AWS CloudFormation Resource (AWS::FSx::FileSystem.OntapConfiguration)
diff --git a/goformation/cloudformation/fsx/aws-fsx-filesystem_openzfsconfiguration.go b/pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_openzfsconfiguration.go
similarity index 96%
rename from goformation/cloudformation/fsx/aws-fsx-filesystem_openzfsconfiguration.go
rename to pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_openzfsconfiguration.go
index 0b3cf5d61d..8198d3cfcb 100644
--- a/goformation/cloudformation/fsx/aws-fsx-filesystem_openzfsconfiguration.go
+++ b/pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_openzfsconfiguration.go
@@ -1,9 +1,9 @@
 package fsx
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FileSystem_OpenZFSConfiguration AWS CloudFormation Resource (AWS::FSx::FileSystem.OpenZFSConfiguration)
diff --git a/goformation/cloudformation/fsx/aws-fsx-filesystem_rootvolumeconfiguration.go b/pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_rootvolumeconfiguration.go
similarity index 95%
rename from goformation/cloudformation/fsx/aws-fsx-filesystem_rootvolumeconfiguration.go
rename to pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_rootvolumeconfiguration.go
index e0b41061f5..323d0b95ee 100644
--- a/goformation/cloudformation/fsx/aws-fsx-filesystem_rootvolumeconfiguration.go
+++ b/pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_rootvolumeconfiguration.go
@@ -1,9 +1,9 @@
 package fsx
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FileSystem_RootVolumeConfiguration AWS CloudFormation Resource (AWS::FSx::FileSystem.RootVolumeConfiguration)
diff --git a/goformation/cloudformation/fsx/aws-fsx-filesystem_selfmanagedactivedirectoryconfiguration.go b/pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_selfmanagedactivedirectoryconfiguration.go
similarity index 96%
rename from goformation/cloudformation/fsx/aws-fsx-filesystem_selfmanagedactivedirectoryconfiguration.go
rename to pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_selfmanagedactivedirectoryconfiguration.go
index 74f0c691ed..158ac5262e 100644
--- a/goformation/cloudformation/fsx/aws-fsx-filesystem_selfmanagedactivedirectoryconfiguration.go
+++ b/pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_selfmanagedactivedirectoryconfiguration.go
@@ -1,9 +1,9 @@
 package fsx
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FileSystem_SelfManagedActiveDirectoryConfiguration AWS CloudFormation Resource (AWS::FSx::FileSystem.SelfManagedActiveDirectoryConfiguration)
diff --git a/goformation/cloudformation/fsx/aws-fsx-filesystem_userandgroupquotas.go b/pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_userandgroupquotas.go
similarity index 94%
rename from goformation/cloudformation/fsx/aws-fsx-filesystem_userandgroupquotas.go
rename to pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_userandgroupquotas.go
index 1a484bf4f2..2c59694715 100644
--- a/goformation/cloudformation/fsx/aws-fsx-filesystem_userandgroupquotas.go
+++ b/pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_userandgroupquotas.go
@@ -1,9 +1,9 @@
 package fsx
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FileSystem_UserAndGroupQuotas AWS CloudFormation Resource (AWS::FSx::FileSystem.UserAndGroupQuotas)
diff --git a/goformation/cloudformation/fsx/aws-fsx-filesystem_windowsconfiguration.go b/pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_windowsconfiguration.go
similarity index 97%
rename from goformation/cloudformation/fsx/aws-fsx-filesystem_windowsconfiguration.go
rename to pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_windowsconfiguration.go
index 397fd892ed..d4421bf15b 100644
--- a/goformation/cloudformation/fsx/aws-fsx-filesystem_windowsconfiguration.go
+++ b/pkg/goformation/cloudformation/fsx/aws-fsx-filesystem_windowsconfiguration.go
@@ -1,9 +1,9 @@
 package fsx
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FileSystem_WindowsConfiguration AWS CloudFormation Resource (AWS::FSx::FileSystem.WindowsConfiguration)
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-alias.go b/pkg/goformation/cloudformation/gamelift/aws-gamelift-alias.go
similarity index 96%
rename from goformation/cloudformation/gamelift/aws-gamelift-alias.go
rename to pkg/goformation/cloudformation/gamelift/aws-gamelift-alias.go
index 14a230f26f..f57a996d4a 100644
--- a/goformation/cloudformation/gamelift/aws-gamelift-alias.go
+++ b/pkg/goformation/cloudformation/gamelift/aws-gamelift-alias.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Alias AWS CloudFormation Resource (AWS::GameLift::Alias)
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-alias_routingstrategy.go b/pkg/goformation/cloudformation/gamelift/aws-gamelift-alias_routingstrategy.go
similarity index 93%
rename from goformation/cloudformation/gamelift/aws-gamelift-alias_routingstrategy.go
rename to pkg/goformation/cloudformation/gamelift/aws-gamelift-alias_routingstrategy.go
index 081c9f2009..bcad9a3a84 100644
--- a/goformation/cloudformation/gamelift/aws-gamelift-alias_routingstrategy.go
+++ b/pkg/goformation/cloudformation/gamelift/aws-gamelift-alias_routingstrategy.go
@@ -1,9 +1,9 @@
 package gamelift
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Alias_RoutingStrategy AWS CloudFormation Resource (AWS::GameLift::Alias.RoutingStrategy)
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-build.go b/pkg/goformation/cloudformation/gamelift/aws-gamelift-build.go
similarity index 97%
rename from goformation/cloudformation/gamelift/aws-gamelift-build.go
rename to pkg/goformation/cloudformation/gamelift/aws-gamelift-build.go
index 085f0d5c83..b110782d1f 100644
--- a/goformation/cloudformation/gamelift/aws-gamelift-build.go
+++ b/pkg/goformation/cloudformation/gamelift/aws-gamelift-build.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Build AWS CloudFormation Resource (AWS::GameLift::Build)
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-build_s3location.go b/pkg/goformation/cloudformation/gamelift/aws-gamelift-build_s3location.go
similarity index 94%
rename from goformation/cloudformation/gamelift/aws-gamelift-build_s3location.go
rename to pkg/goformation/cloudformation/gamelift/aws-gamelift-build_s3location.go
index fed12457f2..aac199bc3b 100644
--- a/goformation/cloudformation/gamelift/aws-gamelift-build_s3location.go
+++ b/pkg/goformation/cloudformation/gamelift/aws-gamelift-build_s3location.go
@@ -1,9 +1,9 @@
 package gamelift
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Build_S3Location AWS CloudFormation Resource (AWS::GameLift::Build.S3Location)
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-fleet.go b/pkg/goformation/cloudformation/gamelift/aws-gamelift-fleet.go
similarity index 98%
rename from goformation/cloudformation/gamelift/aws-gamelift-fleet.go
rename to pkg/goformation/cloudformation/gamelift/aws-gamelift-fleet.go
index 600ebdde01..aeaca026af 100644
--- a/goformation/cloudformation/gamelift/aws-gamelift-fleet.go
+++ b/pkg/goformation/cloudformation/gamelift/aws-gamelift-fleet.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Fleet AWS CloudFormation Resource (AWS::GameLift::Fleet)
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-fleet_certificateconfiguration.go b/pkg/goformation/cloudformation/gamelift/aws-gamelift-fleet_certificateconfiguration.go
similarity index 92%
rename from goformation/cloudformation/gamelift/aws-gamelift-fleet_certificateconfiguration.go
rename to pkg/goformation/cloudformation/gamelift/aws-gamelift-fleet_certificateconfiguration.go
index b430137a01..df80076ba4 100644
--- a/goformation/cloudformation/gamelift/aws-gamelift-fleet_certificateconfiguration.go
+++ b/pkg/goformation/cloudformation/gamelift/aws-gamelift-fleet_certificateconfiguration.go
@@ -1,9 +1,9 @@
 package gamelift
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Fleet_CertificateConfiguration AWS CloudFormation Resource (AWS::GameLift::Fleet.CertificateConfiguration)
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-fleet_ippermission.go b/pkg/goformation/cloudformation/gamelift/aws-gamelift-fleet_ippermission.go
similarity index 94%
rename from goformation/cloudformation/gamelift/aws-gamelift-fleet_ippermission.go
rename to pkg/goformation/cloudformation/gamelift/aws-gamelift-fleet_ippermission.go
index 7da2ead1e5..b3c7d09177 100644
--- a/goformation/cloudformation/gamelift/aws-gamelift-fleet_ippermission.go
+++ b/pkg/goformation/cloudformation/gamelift/aws-gamelift-fleet_ippermission.go
@@ -1,9 +1,9 @@
 package gamelift
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Fleet_IpPermission AWS CloudFormation Resource (AWS::GameLift::Fleet.IpPermission)
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-fleet_locationcapacity.go b/pkg/goformation/cloudformation/gamelift/aws-gamelift-fleet_locationcapacity.go
similarity index 93%
rename from goformation/cloudformation/gamelift/aws-gamelift-fleet_locationcapacity.go
rename to pkg/goformation/cloudformation/gamelift/aws-gamelift-fleet_locationcapacity.go
index 5f1491bced..748cad90d2 100644
--- a/goformation/cloudformation/gamelift/aws-gamelift-fleet_locationcapacity.go
+++ b/pkg/goformation/cloudformation/gamelift/aws-gamelift-fleet_locationcapacity.go
@@ -1,9 +1,9 @@
 package gamelift
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Fleet_LocationCapacity AWS CloudFormation Resource (AWS::GameLift::Fleet.LocationCapacity)
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-fleet_locationconfiguration.go b/pkg/goformation/cloudformation/gamelift/aws-gamelift-fleet_locationconfiguration.go
similarity index 93%
rename from goformation/cloudformation/gamelift/aws-gamelift-fleet_locationconfiguration.go
rename to pkg/goformation/cloudformation/gamelift/aws-gamelift-fleet_locationconfiguration.go
index c951849e74..75a984df9c 100644
--- a/goformation/cloudformation/gamelift/aws-gamelift-fleet_locationconfiguration.go
+++ b/pkg/goformation/cloudformation/gamelift/aws-gamelift-fleet_locationconfiguration.go
@@ -1,9 +1,9 @@
 package gamelift
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Fleet_LocationConfiguration AWS CloudFormation Resource (AWS::GameLift::Fleet.LocationConfiguration)
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-fleet_resourcecreationlimitpolicy.go b/pkg/goformation/cloudformation/gamelift/aws-gamelift-fleet_resourcecreationlimitpolicy.go
similarity index 93%
rename from goformation/cloudformation/gamelift/aws-gamelift-fleet_resourcecreationlimitpolicy.go
rename to pkg/goformation/cloudformation/gamelift/aws-gamelift-fleet_resourcecreationlimitpolicy.go
index bf11af8ec6..470d7e927d 100644
--- a/goformation/cloudformation/gamelift/aws-gamelift-fleet_resourcecreationlimitpolicy.go
+++ b/pkg/goformation/cloudformation/gamelift/aws-gamelift-fleet_resourcecreationlimitpolicy.go
@@ -1,9 +1,9 @@
 package gamelift
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Fleet_ResourceCreationLimitPolicy AWS CloudFormation Resource (AWS::GameLift::Fleet.ResourceCreationLimitPolicy)
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-fleet_runtimeconfiguration.go b/pkg/goformation/cloudformation/gamelift/aws-gamelift-fleet_runtimeconfiguration.go
similarity index 94%
rename from goformation/cloudformation/gamelift/aws-gamelift-fleet_runtimeconfiguration.go
rename to pkg/goformation/cloudformation/gamelift/aws-gamelift-fleet_runtimeconfiguration.go
index 938d9a7ab6..4ca55df5fa 100644
--- a/goformation/cloudformation/gamelift/aws-gamelift-fleet_runtimeconfiguration.go
+++ b/pkg/goformation/cloudformation/gamelift/aws-gamelift-fleet_runtimeconfiguration.go
@@ -1,9 +1,9 @@
 package gamelift
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Fleet_RuntimeConfiguration AWS CloudFormation Resource (AWS::GameLift::Fleet.RuntimeConfiguration)
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-fleet_serverprocess.go b/pkg/goformation/cloudformation/gamelift/aws-gamelift-fleet_serverprocess.go
similarity index 93%
rename from goformation/cloudformation/gamelift/aws-gamelift-fleet_serverprocess.go
rename to pkg/goformation/cloudformation/gamelift/aws-gamelift-fleet_serverprocess.go
index 84c9991d47..c4f6e87a74 100644
--- a/goformation/cloudformation/gamelift/aws-gamelift-fleet_serverprocess.go
+++ b/pkg/goformation/cloudformation/gamelift/aws-gamelift-fleet_serverprocess.go
@@ -1,9 +1,9 @@
 package gamelift
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Fleet_ServerProcess AWS CloudFormation Resource (AWS::GameLift::Fleet.ServerProcess)
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup.go b/pkg/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup.go
similarity index 97%
rename from goformation/cloudformation/gamelift/aws-gamelift-gameservergroup.go
rename to pkg/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup.go
index fb17e1d9b5..63982f2f1d 100644
--- a/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup.go
+++ b/pkg/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GameServerGroup AWS CloudFormation Resource (AWS::GameLift::GameServerGroup)
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_autoscalingpolicy.go b/pkg/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_autoscalingpolicy.go
similarity index 93%
rename from goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_autoscalingpolicy.go
rename to pkg/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_autoscalingpolicy.go
index de6d75089b..cc5513ddfa 100644
--- a/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_autoscalingpolicy.go
+++ b/pkg/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_autoscalingpolicy.go
@@ -1,9 +1,9 @@
 package gamelift
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GameServerGroup_AutoScalingPolicy AWS CloudFormation Resource (AWS::GameLift::GameServerGroup.AutoScalingPolicy)
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_instancedefinition.go b/pkg/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_instancedefinition.go
similarity index 93%
rename from goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_instancedefinition.go
rename to pkg/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_instancedefinition.go
index 2ee1fde6b3..44471e465a 100644
--- a/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_instancedefinition.go
+++ b/pkg/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_instancedefinition.go
@@ -1,9 +1,9 @@
 package gamelift
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GameServerGroup_InstanceDefinition AWS CloudFormation Resource (AWS::GameLift::GameServerGroup.InstanceDefinition)
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_instancedefinitions.go b/pkg/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_instancedefinitions.go
similarity index 95%
rename from goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_instancedefinitions.go
rename to pkg/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_instancedefinitions.go
index 8de652cf5a..5b8ffcf18b 100644
--- a/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_instancedefinitions.go
+++ b/pkg/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_instancedefinitions.go
@@ -1,7 +1,7 @@
 package gamelift
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GameServerGroup_InstanceDefinitions AWS CloudFormation Resource (AWS::GameLift::GameServerGroup.InstanceDefinitions)
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_launchtemplate.go b/pkg/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_launchtemplate.go
similarity index 94%
rename from goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_launchtemplate.go
rename to pkg/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_launchtemplate.go
index 38557432bd..37a073e5d8 100644
--- a/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_launchtemplate.go
+++ b/pkg/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_launchtemplate.go
@@ -1,9 +1,9 @@
 package gamelift
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GameServerGroup_LaunchTemplate AWS CloudFormation Resource (AWS::GameLift::GameServerGroup.LaunchTemplate)
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_tags.go b/pkg/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_tags.go
similarity index 90%
rename from goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_tags.go
rename to pkg/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_tags.go
index dc18f29fe0..181d7e5d38 100644
--- a/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_tags.go
+++ b/pkg/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_tags.go
@@ -1,8 +1,8 @@
 package gamelift
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GameServerGroup_Tags AWS CloudFormation Resource (AWS::GameLift::GameServerGroup.Tags)
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_targettrackingconfiguration.go b/pkg/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_targettrackingconfiguration.go
similarity index 92%
rename from goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_targettrackingconfiguration.go
rename to pkg/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_targettrackingconfiguration.go
index 968a760225..f2fe376de5 100644
--- a/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_targettrackingconfiguration.go
+++ b/pkg/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_targettrackingconfiguration.go
@@ -1,9 +1,9 @@
 package gamelift
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GameServerGroup_TargetTrackingConfiguration AWS CloudFormation Resource (AWS::GameLift::GameServerGroup.TargetTrackingConfiguration)
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_vpcsubnets.go b/pkg/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_vpcsubnets.go
similarity index 91%
rename from goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_vpcsubnets.go
rename to pkg/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_vpcsubnets.go
index 5d8368bf56..f689878dbd 100644
--- a/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_vpcsubnets.go
+++ b/pkg/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_vpcsubnets.go
@@ -1,9 +1,9 @@
 package gamelift
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GameServerGroup_VpcSubnets AWS CloudFormation Resource (AWS::GameLift::GameServerGroup.VpcSubnets)
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue.go b/pkg/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue.go
similarity index 97%
rename from goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue.go
rename to pkg/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue.go
index 4b5b98b78e..76c8a6df5e 100644
--- a/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue.go
+++ b/pkg/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GameSessionQueue AWS CloudFormation Resource (AWS::GameLift::GameSessionQueue)
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_destination.go b/pkg/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_destination.go
similarity index 91%
rename from goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_destination.go
rename to pkg/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_destination.go
index 1f129bb632..3de2f70c4c 100644
--- a/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_destination.go
+++ b/pkg/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_destination.go
@@ -1,9 +1,9 @@
 package gamelift
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GameSessionQueue_Destination AWS CloudFormation Resource (AWS::GameLift::GameSessionQueue.Destination)
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_filterconfiguration.go b/pkg/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_filterconfiguration.go
similarity index 92%
rename from goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_filterconfiguration.go
rename to pkg/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_filterconfiguration.go
index f33e192671..015c24ed64 100644
--- a/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_filterconfiguration.go
+++ b/pkg/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_filterconfiguration.go
@@ -1,9 +1,9 @@
 package gamelift
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GameSessionQueue_FilterConfiguration AWS CloudFormation Resource (AWS::GameLift::GameSessionQueue.FilterConfiguration)
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_playerlatencypolicy.go b/pkg/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_playerlatencypolicy.go
similarity index 93%
rename from goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_playerlatencypolicy.go
rename to pkg/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_playerlatencypolicy.go
index c66a6e0b3b..52ab7e8ab4 100644
--- a/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_playerlatencypolicy.go
+++ b/pkg/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_playerlatencypolicy.go
@@ -1,9 +1,9 @@
 package gamelift
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GameSessionQueue_PlayerLatencyPolicy AWS CloudFormation Resource (AWS::GameLift::GameSessionQueue.PlayerLatencyPolicy)
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_priorityconfiguration.go b/pkg/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_priorityconfiguration.go
similarity index 93%
rename from goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_priorityconfiguration.go
rename to pkg/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_priorityconfiguration.go
index 7c2d962e8e..179ca57d81 100644
--- a/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_priorityconfiguration.go
+++ b/pkg/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_priorityconfiguration.go
@@ -1,9 +1,9 @@
 package gamelift
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GameSessionQueue_PriorityConfiguration AWS CloudFormation Resource (AWS::GameLift::GameSessionQueue.PriorityConfiguration)
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-matchmakingconfiguration.go b/pkg/goformation/cloudformation/gamelift/aws-gamelift-matchmakingconfiguration.go
similarity index 98%
rename from goformation/cloudformation/gamelift/aws-gamelift-matchmakingconfiguration.go
rename to pkg/goformation/cloudformation/gamelift/aws-gamelift-matchmakingconfiguration.go
index 72eb46b79a..8479f361eb 100644
--- a/goformation/cloudformation/gamelift/aws-gamelift-matchmakingconfiguration.go
+++ b/pkg/goformation/cloudformation/gamelift/aws-gamelift-matchmakingconfiguration.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MatchmakingConfiguration AWS CloudFormation Resource (AWS::GameLift::MatchmakingConfiguration)
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-matchmakingconfiguration_gameproperty.go b/pkg/goformation/cloudformation/gamelift/aws-gamelift-matchmakingconfiguration_gameproperty.go
similarity index 93%
rename from goformation/cloudformation/gamelift/aws-gamelift-matchmakingconfiguration_gameproperty.go
rename to pkg/goformation/cloudformation/gamelift/aws-gamelift-matchmakingconfiguration_gameproperty.go
index 5e3fa5c22a..cf30cad877 100644
--- a/goformation/cloudformation/gamelift/aws-gamelift-matchmakingconfiguration_gameproperty.go
+++ b/pkg/goformation/cloudformation/gamelift/aws-gamelift-matchmakingconfiguration_gameproperty.go
@@ -1,9 +1,9 @@
 package gamelift
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MatchmakingConfiguration_GameProperty AWS CloudFormation Resource (AWS::GameLift::MatchmakingConfiguration.GameProperty)
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-matchmakingruleset.go b/pkg/goformation/cloudformation/gamelift/aws-gamelift-matchmakingruleset.go
similarity index 96%
rename from goformation/cloudformation/gamelift/aws-gamelift-matchmakingruleset.go
rename to pkg/goformation/cloudformation/gamelift/aws-gamelift-matchmakingruleset.go
index e560e966c8..99801c2cf8 100644
--- a/goformation/cloudformation/gamelift/aws-gamelift-matchmakingruleset.go
+++ b/pkg/goformation/cloudformation/gamelift/aws-gamelift-matchmakingruleset.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MatchmakingRuleSet AWS CloudFormation Resource (AWS::GameLift::MatchmakingRuleSet)
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-script.go b/pkg/goformation/cloudformation/gamelift/aws-gamelift-script.go
similarity index 96%
rename from goformation/cloudformation/gamelift/aws-gamelift-script.go
rename to pkg/goformation/cloudformation/gamelift/aws-gamelift-script.go
index f0ddbf0fba..c0d31772fd 100644
--- a/goformation/cloudformation/gamelift/aws-gamelift-script.go
+++ b/pkg/goformation/cloudformation/gamelift/aws-gamelift-script.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Script AWS CloudFormation Resource (AWS::GameLift::Script)
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-script_s3location.go b/pkg/goformation/cloudformation/gamelift/aws-gamelift-script_s3location.go
similarity index 94%
rename from goformation/cloudformation/gamelift/aws-gamelift-script_s3location.go
rename to pkg/goformation/cloudformation/gamelift/aws-gamelift-script_s3location.go
index f06ba5a927..e2477281d8 100644
--- a/goformation/cloudformation/gamelift/aws-gamelift-script_s3location.go
+++ b/pkg/goformation/cloudformation/gamelift/aws-gamelift-script_s3location.go
@@ -1,9 +1,9 @@
 package gamelift
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Script_S3Location AWS CloudFormation Resource (AWS::GameLift::Script.S3Location)
diff --git a/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-accelerator.go b/pkg/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-accelerator.go
similarity index 95%
rename from goformation/cloudformation/globalaccelerator/aws-globalaccelerator-accelerator.go
rename to pkg/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-accelerator.go
index 22fe9c22be..e2c6ae21ab 100644
--- a/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-accelerator.go
+++ b/pkg/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-accelerator.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Accelerator AWS CloudFormation Resource (AWS::GlobalAccelerator::Accelerator)
diff --git a/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup.go b/pkg/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup.go
similarity index 98%
rename from goformation/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup.go
rename to pkg/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup.go
index 5d631beb30..8b923e8e53 100644
--- a/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup.go
+++ b/pkg/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EndpointGroup AWS CloudFormation Resource (AWS::GlobalAccelerator::EndpointGroup)
diff --git a/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup_endpointconfiguration.go b/pkg/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup_endpointconfiguration.go
similarity index 94%
rename from goformation/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup_endpointconfiguration.go
rename to pkg/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup_endpointconfiguration.go
index 472642f0fe..04d6763b8c 100644
--- a/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup_endpointconfiguration.go
+++ b/pkg/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup_endpointconfiguration.go
@@ -1,9 +1,9 @@
 package globalaccelerator
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EndpointGroup_EndpointConfiguration AWS CloudFormation Resource (AWS::GlobalAccelerator::EndpointGroup.EndpointConfiguration)
diff --git a/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup_portoverride.go b/pkg/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup_portoverride.go
similarity index 93%
rename from goformation/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup_portoverride.go
rename to pkg/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup_portoverride.go
index 16c9bd0139..7939899b0b 100644
--- a/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup_portoverride.go
+++ b/pkg/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup_portoverride.go
@@ -1,9 +1,9 @@
 package globalaccelerator
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EndpointGroup_PortOverride AWS CloudFormation Resource (AWS::GlobalAccelerator::EndpointGroup.PortOverride)
diff --git a/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-listener.go b/pkg/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-listener.go
similarity index 97%
rename from goformation/cloudformation/globalaccelerator/aws-globalaccelerator-listener.go
rename to pkg/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-listener.go
index ba105d4444..de01835df5 100644
--- a/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-listener.go
+++ b/pkg/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-listener.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Listener AWS CloudFormation Resource (AWS::GlobalAccelerator::Listener)
diff --git a/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-listener_portrange.go b/pkg/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-listener_portrange.go
similarity index 92%
rename from goformation/cloudformation/globalaccelerator/aws-globalaccelerator-listener_portrange.go
rename to pkg/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-listener_portrange.go
index 396737a5cc..374b5848f0 100644
--- a/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-listener_portrange.go
+++ b/pkg/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-listener_portrange.go
@@ -1,9 +1,9 @@
 package globalaccelerator
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Listener_PortRange AWS CloudFormation Resource (AWS::GlobalAccelerator::Listener.PortRange)
diff --git a/goformation/cloudformation/glue/aws-glue-classifier.go b/pkg/goformation/cloudformation/glue/aws-glue-classifier.go
similarity index 98%
rename from goformation/cloudformation/glue/aws-glue-classifier.go
rename to pkg/goformation/cloudformation/glue/aws-glue-classifier.go
index 2f61a80082..aa4312f3df 100644
--- a/goformation/cloudformation/glue/aws-glue-classifier.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-classifier.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Classifier AWS CloudFormation Resource (AWS::Glue::Classifier)
diff --git a/goformation/cloudformation/glue/aws-glue-classifier_csvclassifier.go b/pkg/goformation/cloudformation/glue/aws-glue-classifier_csvclassifier.go
similarity index 95%
rename from goformation/cloudformation/glue/aws-glue-classifier_csvclassifier.go
rename to pkg/goformation/cloudformation/glue/aws-glue-classifier_csvclassifier.go
index d41665db39..16aa346668 100644
--- a/goformation/cloudformation/glue/aws-glue-classifier_csvclassifier.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-classifier_csvclassifier.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Classifier_CsvClassifier AWS CloudFormation Resource (AWS::Glue::Classifier.CsvClassifier)
diff --git a/goformation/cloudformation/glue/aws-glue-classifier_grokclassifier.go b/pkg/goformation/cloudformation/glue/aws-glue-classifier_grokclassifier.go
similarity index 94%
rename from goformation/cloudformation/glue/aws-glue-classifier_grokclassifier.go
rename to pkg/goformation/cloudformation/glue/aws-glue-classifier_grokclassifier.go
index 9fa4ef88cc..03ab5d2816 100644
--- a/goformation/cloudformation/glue/aws-glue-classifier_grokclassifier.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-classifier_grokclassifier.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Classifier_GrokClassifier AWS CloudFormation Resource (AWS::Glue::Classifier.GrokClassifier)
diff --git a/goformation/cloudformation/glue/aws-glue-classifier_jsonclassifier.go b/pkg/goformation/cloudformation/glue/aws-glue-classifier_jsonclassifier.go
similarity index 92%
rename from goformation/cloudformation/glue/aws-glue-classifier_jsonclassifier.go
rename to pkg/goformation/cloudformation/glue/aws-glue-classifier_jsonclassifier.go
index 06d314a013..1e4ebe126b 100644
--- a/goformation/cloudformation/glue/aws-glue-classifier_jsonclassifier.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-classifier_jsonclassifier.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Classifier_JsonClassifier AWS CloudFormation Resource (AWS::Glue::Classifier.JsonClassifier)
diff --git a/goformation/cloudformation/glue/aws-glue-classifier_xmlclassifier.go b/pkg/goformation/cloudformation/glue/aws-glue-classifier_xmlclassifier.go
similarity index 93%
rename from goformation/cloudformation/glue/aws-glue-classifier_xmlclassifier.go
rename to pkg/goformation/cloudformation/glue/aws-glue-classifier_xmlclassifier.go
index a54156211b..5b53936a5a 100644
--- a/goformation/cloudformation/glue/aws-glue-classifier_xmlclassifier.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-classifier_xmlclassifier.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Classifier_XMLClassifier AWS CloudFormation Resource (AWS::Glue::Classifier.XMLClassifier)
diff --git a/goformation/cloudformation/glue/aws-glue-connection.go b/pkg/goformation/cloudformation/glue/aws-glue-connection.go
similarity index 96%
rename from goformation/cloudformation/glue/aws-glue-connection.go
rename to pkg/goformation/cloudformation/glue/aws-glue-connection.go
index d47c752ff3..df608272a3 100644
--- a/goformation/cloudformation/glue/aws-glue-connection.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-connection.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Connection AWS CloudFormation Resource (AWS::Glue::Connection)
diff --git a/goformation/cloudformation/glue/aws-glue-connection_connectioninput.go b/pkg/goformation/cloudformation/glue/aws-glue-connection_connectioninput.go
similarity index 95%
rename from goformation/cloudformation/glue/aws-glue-connection_connectioninput.go
rename to pkg/goformation/cloudformation/glue/aws-glue-connection_connectioninput.go
index 1e66c47fd1..b4e055a71e 100644
--- a/goformation/cloudformation/glue/aws-glue-connection_connectioninput.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-connection_connectioninput.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Connection_ConnectionInput AWS CloudFormation Resource (AWS::Glue::Connection.ConnectionInput)
diff --git a/goformation/cloudformation/glue/aws-glue-connection_physicalconnectionrequirements.go b/pkg/goformation/cloudformation/glue/aws-glue-connection_physicalconnectionrequirements.go
similarity index 94%
rename from goformation/cloudformation/glue/aws-glue-connection_physicalconnectionrequirements.go
rename to pkg/goformation/cloudformation/glue/aws-glue-connection_physicalconnectionrequirements.go
index 8f445520f9..fdf8624ff6 100644
--- a/goformation/cloudformation/glue/aws-glue-connection_physicalconnectionrequirements.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-connection_physicalconnectionrequirements.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Connection_PhysicalConnectionRequirements AWS CloudFormation Resource (AWS::Glue::Connection.PhysicalConnectionRequirements)
diff --git a/goformation/cloudformation/glue/aws-glue-crawler.go b/pkg/goformation/cloudformation/glue/aws-glue-crawler.go
similarity index 98%
rename from goformation/cloudformation/glue/aws-glue-crawler.go
rename to pkg/goformation/cloudformation/glue/aws-glue-crawler.go
index 9069c76f72..9a8a4f0ccf 100644
--- a/goformation/cloudformation/glue/aws-glue-crawler.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-crawler.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Crawler AWS CloudFormation Resource (AWS::Glue::Crawler)
diff --git a/goformation/cloudformation/glue/aws-glue-crawler_catalogtarget.go b/pkg/goformation/cloudformation/glue/aws-glue-crawler_catalogtarget.go
similarity index 92%
rename from goformation/cloudformation/glue/aws-glue-crawler_catalogtarget.go
rename to pkg/goformation/cloudformation/glue/aws-glue-crawler_catalogtarget.go
index 800f586e8e..0aead01297 100644
--- a/goformation/cloudformation/glue/aws-glue-crawler_catalogtarget.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-crawler_catalogtarget.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Crawler_CatalogTarget AWS CloudFormation Resource (AWS::Glue::Crawler.CatalogTarget)
diff --git a/goformation/cloudformation/glue/aws-glue-crawler_dynamodbtarget.go b/pkg/goformation/cloudformation/glue/aws-glue-crawler_dynamodbtarget.go
similarity index 91%
rename from goformation/cloudformation/glue/aws-glue-crawler_dynamodbtarget.go
rename to pkg/goformation/cloudformation/glue/aws-glue-crawler_dynamodbtarget.go
index 3980a9026a..a6391569c4 100644
--- a/goformation/cloudformation/glue/aws-glue-crawler_dynamodbtarget.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-crawler_dynamodbtarget.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Crawler_DynamoDBTarget AWS CloudFormation Resource (AWS::Glue::Crawler.DynamoDBTarget)
diff --git a/goformation/cloudformation/glue/aws-glue-crawler_jdbctarget.go b/pkg/goformation/cloudformation/glue/aws-glue-crawler_jdbctarget.go
similarity index 93%
rename from goformation/cloudformation/glue/aws-glue-crawler_jdbctarget.go
rename to pkg/goformation/cloudformation/glue/aws-glue-crawler_jdbctarget.go
index e0d3a729d4..08df707ccc 100644
--- a/goformation/cloudformation/glue/aws-glue-crawler_jdbctarget.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-crawler_jdbctarget.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Crawler_JdbcTarget AWS CloudFormation Resource (AWS::Glue::Crawler.JdbcTarget)
diff --git a/goformation/cloudformation/glue/aws-glue-crawler_recrawlpolicy.go b/pkg/goformation/cloudformation/glue/aws-glue-crawler_recrawlpolicy.go
similarity index 91%
rename from goformation/cloudformation/glue/aws-glue-crawler_recrawlpolicy.go
rename to pkg/goformation/cloudformation/glue/aws-glue-crawler_recrawlpolicy.go
index eda4bd6c14..4f4376e5f7 100644
--- a/goformation/cloudformation/glue/aws-glue-crawler_recrawlpolicy.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-crawler_recrawlpolicy.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Crawler_RecrawlPolicy AWS CloudFormation Resource (AWS::Glue::Crawler.RecrawlPolicy)
diff --git a/goformation/cloudformation/glue/aws-glue-crawler_s3target.go b/pkg/goformation/cloudformation/glue/aws-glue-crawler_s3target.go
similarity index 93%
rename from goformation/cloudformation/glue/aws-glue-crawler_s3target.go
rename to pkg/goformation/cloudformation/glue/aws-glue-crawler_s3target.go
index 1d67969c81..d5ce8177bf 100644
--- a/goformation/cloudformation/glue/aws-glue-crawler_s3target.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-crawler_s3target.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Crawler_S3Target AWS CloudFormation Resource (AWS::Glue::Crawler.S3Target)
diff --git a/goformation/cloudformation/glue/aws-glue-crawler_schedule.go b/pkg/goformation/cloudformation/glue/aws-glue-crawler_schedule.go
similarity index 91%
rename from goformation/cloudformation/glue/aws-glue-crawler_schedule.go
rename to pkg/goformation/cloudformation/glue/aws-glue-crawler_schedule.go
index 8560a9525a..c54c2e17da 100644
--- a/goformation/cloudformation/glue/aws-glue-crawler_schedule.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-crawler_schedule.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Crawler_Schedule AWS CloudFormation Resource (AWS::Glue::Crawler.Schedule)
diff --git a/goformation/cloudformation/glue/aws-glue-crawler_schemachangepolicy.go b/pkg/goformation/cloudformation/glue/aws-glue-crawler_schemachangepolicy.go
similarity index 93%
rename from goformation/cloudformation/glue/aws-glue-crawler_schemachangepolicy.go
rename to pkg/goformation/cloudformation/glue/aws-glue-crawler_schemachangepolicy.go
index 88d1bfe446..608b6f6199 100644
--- a/goformation/cloudformation/glue/aws-glue-crawler_schemachangepolicy.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-crawler_schemachangepolicy.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Crawler_SchemaChangePolicy AWS CloudFormation Resource (AWS::Glue::Crawler.SchemaChangePolicy)
diff --git a/goformation/cloudformation/glue/aws-glue-crawler_targets.go b/pkg/goformation/cloudformation/glue/aws-glue-crawler_targets.go
similarity index 97%
rename from goformation/cloudformation/glue/aws-glue-crawler_targets.go
rename to pkg/goformation/cloudformation/glue/aws-glue-crawler_targets.go
index 667f896b57..809cac9f27 100644
--- a/goformation/cloudformation/glue/aws-glue-crawler_targets.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-crawler_targets.go
@@ -1,7 +1,7 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Crawler_Targets AWS CloudFormation Resource (AWS::Glue::Crawler.Targets)
diff --git a/goformation/cloudformation/glue/aws-glue-database.go b/pkg/goformation/cloudformation/glue/aws-glue-database.go
similarity index 96%
rename from goformation/cloudformation/glue/aws-glue-database.go
rename to pkg/goformation/cloudformation/glue/aws-glue-database.go
index fbb1ea6ccb..73198cb795 100644
--- a/goformation/cloudformation/glue/aws-glue-database.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-database.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Database AWS CloudFormation Resource (AWS::Glue::Database)
diff --git a/goformation/cloudformation/glue/aws-glue-database_databaseidentifier.go b/pkg/goformation/cloudformation/glue/aws-glue-database_databaseidentifier.go
similarity index 92%
rename from goformation/cloudformation/glue/aws-glue-database_databaseidentifier.go
rename to pkg/goformation/cloudformation/glue/aws-glue-database_databaseidentifier.go
index 301e93a8df..105fffcdc0 100644
--- a/goformation/cloudformation/glue/aws-glue-database_databaseidentifier.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-database_databaseidentifier.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Database_DatabaseIdentifier AWS CloudFormation Resource (AWS::Glue::Database.DatabaseIdentifier)
diff --git a/goformation/cloudformation/glue/aws-glue-database_databaseinput.go b/pkg/goformation/cloudformation/glue/aws-glue-database_databaseinput.go
similarity index 95%
rename from goformation/cloudformation/glue/aws-glue-database_databaseinput.go
rename to pkg/goformation/cloudformation/glue/aws-glue-database_databaseinput.go
index 6850d9e602..f745e8b807 100644
--- a/goformation/cloudformation/glue/aws-glue-database_databaseinput.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-database_databaseinput.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Database_DatabaseInput AWS CloudFormation Resource (AWS::Glue::Database.DatabaseInput)
diff --git a/goformation/cloudformation/glue/aws-glue-database_datalakeprincipal.go b/pkg/goformation/cloudformation/glue/aws-glue-database_datalakeprincipal.go
similarity index 92%
rename from goformation/cloudformation/glue/aws-glue-database_datalakeprincipal.go
rename to pkg/goformation/cloudformation/glue/aws-glue-database_datalakeprincipal.go
index e42fe35edf..fdcff7c42c 100644
--- a/goformation/cloudformation/glue/aws-glue-database_datalakeprincipal.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-database_datalakeprincipal.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Database_DataLakePrincipal AWS CloudFormation Resource (AWS::Glue::Database.DataLakePrincipal)
diff --git a/goformation/cloudformation/glue/aws-glue-database_principalprivileges.go b/pkg/goformation/cloudformation/glue/aws-glue-database_principalprivileges.go
similarity index 93%
rename from goformation/cloudformation/glue/aws-glue-database_principalprivileges.go
rename to pkg/goformation/cloudformation/glue/aws-glue-database_principalprivileges.go
index 8a89f3e64d..58bd305487 100644
--- a/goformation/cloudformation/glue/aws-glue-database_principalprivileges.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-database_principalprivileges.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Database_PrincipalPrivileges AWS CloudFormation Resource (AWS::Glue::Database.PrincipalPrivileges)
diff --git a/goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings.go b/pkg/goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings.go
similarity index 96%
rename from goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings.go
rename to pkg/goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings.go
index 0d00898733..9661777777 100644
--- a/goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataCatalogEncryptionSettings AWS CloudFormation Resource (AWS::Glue::DataCatalogEncryptionSettings)
diff --git a/goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings_connectionpasswordencryption.go b/pkg/goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings_connectionpasswordencryption.go
similarity index 94%
rename from goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings_connectionpasswordencryption.go
rename to pkg/goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings_connectionpasswordencryption.go
index bccd324b21..c929b740bf 100644
--- a/goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings_connectionpasswordencryption.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings_connectionpasswordencryption.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataCatalogEncryptionSettings_ConnectionPasswordEncryption AWS CloudFormation Resource (AWS::Glue::DataCatalogEncryptionSettings.ConnectionPasswordEncryption)
diff --git a/goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings_datacatalogencryptionsettings.go b/pkg/goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings_datacatalogencryptionsettings.go
similarity index 97%
rename from goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings_datacatalogencryptionsettings.go
rename to pkg/goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings_datacatalogencryptionsettings.go
index 2621eebcff..e36b3b4604 100644
--- a/goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings_datacatalogencryptionsettings.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings_datacatalogencryptionsettings.go
@@ -1,7 +1,7 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataCatalogEncryptionSettings_DataCatalogEncryptionSettings AWS CloudFormation Resource (AWS::Glue::DataCatalogEncryptionSettings.DataCatalogEncryptionSettings)
diff --git a/goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings_encryptionatrest.go b/pkg/goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings_encryptionatrest.go
similarity index 93%
rename from goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings_encryptionatrest.go
rename to pkg/goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings_encryptionatrest.go
index 8c50e8152f..94c01319c4 100644
--- a/goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings_encryptionatrest.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings_encryptionatrest.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataCatalogEncryptionSettings_EncryptionAtRest AWS CloudFormation Resource (AWS::Glue::DataCatalogEncryptionSettings.EncryptionAtRest)
diff --git a/goformation/cloudformation/glue/aws-glue-devendpoint.go b/pkg/goformation/cloudformation/glue/aws-glue-devendpoint.go
similarity index 98%
rename from goformation/cloudformation/glue/aws-glue-devendpoint.go
rename to pkg/goformation/cloudformation/glue/aws-glue-devendpoint.go
index fa31910cda..09af8adab8 100644
--- a/goformation/cloudformation/glue/aws-glue-devendpoint.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-devendpoint.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DevEndpoint AWS CloudFormation Resource (AWS::Glue::DevEndpoint)
diff --git a/goformation/cloudformation/glue/aws-glue-job.go b/pkg/goformation/cloudformation/glue/aws-glue-job.go
similarity index 98%
rename from goformation/cloudformation/glue/aws-glue-job.go
rename to pkg/goformation/cloudformation/glue/aws-glue-job.go
index c953f1603d..4b9a5aafe2 100644
--- a/goformation/cloudformation/glue/aws-glue-job.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-job.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Job AWS CloudFormation Resource (AWS::Glue::Job)
diff --git a/goformation/cloudformation/glue/aws-glue-job_connectionslist.go b/pkg/goformation/cloudformation/glue/aws-glue-job_connectionslist.go
similarity index 91%
rename from goformation/cloudformation/glue/aws-glue-job_connectionslist.go
rename to pkg/goformation/cloudformation/glue/aws-glue-job_connectionslist.go
index 5b4766f16c..1b050cb002 100644
--- a/goformation/cloudformation/glue/aws-glue-job_connectionslist.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-job_connectionslist.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Job_ConnectionsList AWS CloudFormation Resource (AWS::Glue::Job.ConnectionsList)
diff --git a/goformation/cloudformation/glue/aws-glue-job_executionproperty.go b/pkg/goformation/cloudformation/glue/aws-glue-job_executionproperty.go
similarity index 91%
rename from goformation/cloudformation/glue/aws-glue-job_executionproperty.go
rename to pkg/goformation/cloudformation/glue/aws-glue-job_executionproperty.go
index 7f57ec4438..6e9d4e183b 100644
--- a/goformation/cloudformation/glue/aws-glue-job_executionproperty.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-job_executionproperty.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Job_ExecutionProperty AWS CloudFormation Resource (AWS::Glue::Job.ExecutionProperty)
diff --git a/goformation/cloudformation/glue/aws-glue-job_jobcommand.go b/pkg/goformation/cloudformation/glue/aws-glue-job_jobcommand.go
similarity index 93%
rename from goformation/cloudformation/glue/aws-glue-job_jobcommand.go
rename to pkg/goformation/cloudformation/glue/aws-glue-job_jobcommand.go
index c81fbcef7d..d9dc98a3d0 100644
--- a/goformation/cloudformation/glue/aws-glue-job_jobcommand.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-job_jobcommand.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Job_JobCommand AWS CloudFormation Resource (AWS::Glue::Job.JobCommand)
diff --git a/goformation/cloudformation/glue/aws-glue-job_notificationproperty.go b/pkg/goformation/cloudformation/glue/aws-glue-job_notificationproperty.go
similarity index 91%
rename from goformation/cloudformation/glue/aws-glue-job_notificationproperty.go
rename to pkg/goformation/cloudformation/glue/aws-glue-job_notificationproperty.go
index 64d3bbe0ee..efc3d3c762 100644
--- a/goformation/cloudformation/glue/aws-glue-job_notificationproperty.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-job_notificationproperty.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Job_NotificationProperty AWS CloudFormation Resource (AWS::Glue::Job.NotificationProperty)
diff --git a/goformation/cloudformation/glue/aws-glue-mltransform.go b/pkg/goformation/cloudformation/glue/aws-glue-mltransform.go
similarity index 98%
rename from goformation/cloudformation/glue/aws-glue-mltransform.go
rename to pkg/goformation/cloudformation/glue/aws-glue-mltransform.go
index cca4c6d21e..c22213b4a7 100644
--- a/goformation/cloudformation/glue/aws-glue-mltransform.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-mltransform.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MLTransform AWS CloudFormation Resource (AWS::Glue::MLTransform)
diff --git a/goformation/cloudformation/glue/aws-glue-mltransform_findmatchesparameters.go b/pkg/goformation/cloudformation/glue/aws-glue-mltransform_findmatchesparameters.go
similarity index 95%
rename from goformation/cloudformation/glue/aws-glue-mltransform_findmatchesparameters.go
rename to pkg/goformation/cloudformation/glue/aws-glue-mltransform_findmatchesparameters.go
index b18ed0fdf0..cf1db03fa2 100644
--- a/goformation/cloudformation/glue/aws-glue-mltransform_findmatchesparameters.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-mltransform_findmatchesparameters.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MLTransform_FindMatchesParameters AWS CloudFormation Resource (AWS::Glue::MLTransform.FindMatchesParameters)
diff --git a/goformation/cloudformation/glue/aws-glue-mltransform_gluetables.go b/pkg/goformation/cloudformation/glue/aws-glue-mltransform_gluetables.go
similarity index 94%
rename from goformation/cloudformation/glue/aws-glue-mltransform_gluetables.go
rename to pkg/goformation/cloudformation/glue/aws-glue-mltransform_gluetables.go
index 591a609373..55b062e262 100644
--- a/goformation/cloudformation/glue/aws-glue-mltransform_gluetables.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-mltransform_gluetables.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MLTransform_GlueTables AWS CloudFormation Resource (AWS::Glue::MLTransform.GlueTables)
diff --git a/goformation/cloudformation/glue/aws-glue-mltransform_inputrecordtables.go b/pkg/goformation/cloudformation/glue/aws-glue-mltransform_inputrecordtables.go
similarity index 95%
rename from goformation/cloudformation/glue/aws-glue-mltransform_inputrecordtables.go
rename to pkg/goformation/cloudformation/glue/aws-glue-mltransform_inputrecordtables.go
index ea9475e937..d3077c98d0 100644
--- a/goformation/cloudformation/glue/aws-glue-mltransform_inputrecordtables.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-mltransform_inputrecordtables.go
@@ -1,7 +1,7 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MLTransform_InputRecordTables AWS CloudFormation Resource (AWS::Glue::MLTransform.InputRecordTables)
diff --git a/goformation/cloudformation/glue/aws-glue-mltransform_mluserdataencryption.go b/pkg/goformation/cloudformation/glue/aws-glue-mltransform_mluserdataencryption.go
similarity index 93%
rename from goformation/cloudformation/glue/aws-glue-mltransform_mluserdataencryption.go
rename to pkg/goformation/cloudformation/glue/aws-glue-mltransform_mluserdataencryption.go
index b448118100..33f536d3b7 100644
--- a/goformation/cloudformation/glue/aws-glue-mltransform_mluserdataencryption.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-mltransform_mluserdataencryption.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MLTransform_MLUserDataEncryption AWS CloudFormation Resource (AWS::Glue::MLTransform.MLUserDataEncryption)
diff --git a/goformation/cloudformation/glue/aws-glue-mltransform_transformencryption.go b/pkg/goformation/cloudformation/glue/aws-glue-mltransform_transformencryption.go
similarity index 93%
rename from goformation/cloudformation/glue/aws-glue-mltransform_transformencryption.go
rename to pkg/goformation/cloudformation/glue/aws-glue-mltransform_transformencryption.go
index 8968ccb607..548aab45ce 100644
--- a/goformation/cloudformation/glue/aws-glue-mltransform_transformencryption.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-mltransform_transformencryption.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MLTransform_TransformEncryption AWS CloudFormation Resource (AWS::Glue::MLTransform.TransformEncryption)
diff --git a/goformation/cloudformation/glue/aws-glue-mltransform_transformparameters.go b/pkg/goformation/cloudformation/glue/aws-glue-mltransform_transformparameters.go
similarity index 93%
rename from goformation/cloudformation/glue/aws-glue-mltransform_transformparameters.go
rename to pkg/goformation/cloudformation/glue/aws-glue-mltransform_transformparameters.go
index a74c2915f7..86d5d89a38 100644
--- a/goformation/cloudformation/glue/aws-glue-mltransform_transformparameters.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-mltransform_transformparameters.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MLTransform_TransformParameters AWS CloudFormation Resource (AWS::Glue::MLTransform.TransformParameters)
diff --git a/goformation/cloudformation/glue/aws-glue-partition.go b/pkg/goformation/cloudformation/glue/aws-glue-partition.go
similarity index 97%
rename from goformation/cloudformation/glue/aws-glue-partition.go
rename to pkg/goformation/cloudformation/glue/aws-glue-partition.go
index 726fbd52f3..dc158ee1b0 100644
--- a/goformation/cloudformation/glue/aws-glue-partition.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-partition.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Partition AWS CloudFormation Resource (AWS::Glue::Partition)
diff --git a/goformation/cloudformation/glue/aws-glue-partition_column.go b/pkg/goformation/cloudformation/glue/aws-glue-partition_column.go
similarity index 93%
rename from goformation/cloudformation/glue/aws-glue-partition_column.go
rename to pkg/goformation/cloudformation/glue/aws-glue-partition_column.go
index b820ccaeb2..371e463a79 100644
--- a/goformation/cloudformation/glue/aws-glue-partition_column.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-partition_column.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Partition_Column AWS CloudFormation Resource (AWS::Glue::Partition.Column)
diff --git a/goformation/cloudformation/glue/aws-glue-partition_order.go b/pkg/goformation/cloudformation/glue/aws-glue-partition_order.go
similarity index 92%
rename from goformation/cloudformation/glue/aws-glue-partition_order.go
rename to pkg/goformation/cloudformation/glue/aws-glue-partition_order.go
index 8d9cd3e87b..12b05d58cf 100644
--- a/goformation/cloudformation/glue/aws-glue-partition_order.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-partition_order.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Partition_Order AWS CloudFormation Resource (AWS::Glue::Partition.Order)
diff --git a/goformation/cloudformation/glue/aws-glue-partition_partitioninput.go b/pkg/goformation/cloudformation/glue/aws-glue-partition_partitioninput.go
similarity index 93%
rename from goformation/cloudformation/glue/aws-glue-partition_partitioninput.go
rename to pkg/goformation/cloudformation/glue/aws-glue-partition_partitioninput.go
index e7494dc1f4..438dbe0b73 100644
--- a/goformation/cloudformation/glue/aws-glue-partition_partitioninput.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-partition_partitioninput.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Partition_PartitionInput AWS CloudFormation Resource (AWS::Glue::Partition.PartitionInput)
diff --git a/goformation/cloudformation/glue/aws-glue-partition_schemaid.go b/pkg/goformation/cloudformation/glue/aws-glue-partition_schemaid.go
similarity index 93%
rename from goformation/cloudformation/glue/aws-glue-partition_schemaid.go
rename to pkg/goformation/cloudformation/glue/aws-glue-partition_schemaid.go
index 94a268ffac..cf711a9de1 100644
--- a/goformation/cloudformation/glue/aws-glue-partition_schemaid.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-partition_schemaid.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Partition_SchemaId AWS CloudFormation Resource (AWS::Glue::Partition.SchemaId)
diff --git a/goformation/cloudformation/glue/aws-glue-partition_schemareference.go b/pkg/goformation/cloudformation/glue/aws-glue-partition_schemareference.go
similarity index 93%
rename from goformation/cloudformation/glue/aws-glue-partition_schemareference.go
rename to pkg/goformation/cloudformation/glue/aws-glue-partition_schemareference.go
index 68142d69b4..25ac60eae0 100644
--- a/goformation/cloudformation/glue/aws-glue-partition_schemareference.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-partition_schemareference.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Partition_SchemaReference AWS CloudFormation Resource (AWS::Glue::Partition.SchemaReference)
diff --git a/goformation/cloudformation/glue/aws-glue-partition_serdeinfo.go b/pkg/goformation/cloudformation/glue/aws-glue-partition_serdeinfo.go
similarity index 93%
rename from goformation/cloudformation/glue/aws-glue-partition_serdeinfo.go
rename to pkg/goformation/cloudformation/glue/aws-glue-partition_serdeinfo.go
index 8c480c5237..268e474997 100644
--- a/goformation/cloudformation/glue/aws-glue-partition_serdeinfo.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-partition_serdeinfo.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Partition_SerdeInfo AWS CloudFormation Resource (AWS::Glue::Partition.SerdeInfo)
diff --git a/goformation/cloudformation/glue/aws-glue-partition_skewedinfo.go b/pkg/goformation/cloudformation/glue/aws-glue-partition_skewedinfo.go
similarity index 93%
rename from goformation/cloudformation/glue/aws-glue-partition_skewedinfo.go
rename to pkg/goformation/cloudformation/glue/aws-glue-partition_skewedinfo.go
index b4f4d78545..802deda8c2 100644
--- a/goformation/cloudformation/glue/aws-glue-partition_skewedinfo.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-partition_skewedinfo.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Partition_SkewedInfo AWS CloudFormation Resource (AWS::Glue::Partition.SkewedInfo)
diff --git a/goformation/cloudformation/glue/aws-glue-partition_storagedescriptor.go b/pkg/goformation/cloudformation/glue/aws-glue-partition_storagedescriptor.go
similarity index 97%
rename from goformation/cloudformation/glue/aws-glue-partition_storagedescriptor.go
rename to pkg/goformation/cloudformation/glue/aws-glue-partition_storagedescriptor.go
index 93a65d558b..cd3ebfacfa 100644
--- a/goformation/cloudformation/glue/aws-glue-partition_storagedescriptor.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-partition_storagedescriptor.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Partition_StorageDescriptor AWS CloudFormation Resource (AWS::Glue::Partition.StorageDescriptor)
diff --git a/goformation/cloudformation/glue/aws-glue-registry.go b/pkg/goformation/cloudformation/glue/aws-glue-registry.go
similarity index 95%
rename from goformation/cloudformation/glue/aws-glue-registry.go
rename to pkg/goformation/cloudformation/glue/aws-glue-registry.go
index 038c81f08b..e89a1d6537 100644
--- a/goformation/cloudformation/glue/aws-glue-registry.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-registry.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Registry AWS CloudFormation Resource (AWS::Glue::Registry)
diff --git a/goformation/cloudformation/glue/aws-glue-schema.go b/pkg/goformation/cloudformation/glue/aws-glue-schema.go
similarity index 96%
rename from goformation/cloudformation/glue/aws-glue-schema.go
rename to pkg/goformation/cloudformation/glue/aws-glue-schema.go
index 4c00b6f293..bb004b666e 100644
--- a/goformation/cloudformation/glue/aws-glue-schema.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-schema.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Schema AWS CloudFormation Resource (AWS::Glue::Schema)
diff --git a/goformation/cloudformation/glue/aws-glue-schema_registry.go b/pkg/goformation/cloudformation/glue/aws-glue-schema_registry.go
similarity index 92%
rename from goformation/cloudformation/glue/aws-glue-schema_registry.go
rename to pkg/goformation/cloudformation/glue/aws-glue-schema_registry.go
index de0abaa1a6..81d213f7ea 100644
--- a/goformation/cloudformation/glue/aws-glue-schema_registry.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-schema_registry.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Schema_Registry AWS CloudFormation Resource (AWS::Glue::Schema.Registry)
diff --git a/goformation/cloudformation/glue/aws-glue-schema_schemaversion.go b/pkg/goformation/cloudformation/glue/aws-glue-schema_schemaversion.go
similarity index 92%
rename from goformation/cloudformation/glue/aws-glue-schema_schemaversion.go
rename to pkg/goformation/cloudformation/glue/aws-glue-schema_schemaversion.go
index c7fbd8911f..d21dc9abdc 100644
--- a/goformation/cloudformation/glue/aws-glue-schema_schemaversion.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-schema_schemaversion.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Schema_SchemaVersion AWS CloudFormation Resource (AWS::Glue::Schema.SchemaVersion)
diff --git a/goformation/cloudformation/glue/aws-glue-schemaversion.go b/pkg/goformation/cloudformation/glue/aws-glue-schemaversion.go
similarity index 96%
rename from goformation/cloudformation/glue/aws-glue-schemaversion.go
rename to pkg/goformation/cloudformation/glue/aws-glue-schemaversion.go
index 63dd83f92a..932c04dcde 100644
--- a/goformation/cloudformation/glue/aws-glue-schemaversion.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-schemaversion.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SchemaVersion AWS CloudFormation Resource (AWS::Glue::SchemaVersion)
diff --git a/goformation/cloudformation/glue/aws-glue-schemaversion_schema.go b/pkg/goformation/cloudformation/glue/aws-glue-schemaversion_schema.go
similarity index 93%
rename from goformation/cloudformation/glue/aws-glue-schemaversion_schema.go
rename to pkg/goformation/cloudformation/glue/aws-glue-schemaversion_schema.go
index aab2e1f4fc..4d56fbdb8b 100644
--- a/goformation/cloudformation/glue/aws-glue-schemaversion_schema.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-schemaversion_schema.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SchemaVersion_Schema AWS CloudFormation Resource (AWS::Glue::SchemaVersion.Schema)
diff --git a/goformation/cloudformation/glue/aws-glue-schemaversionmetadata.go b/pkg/goformation/cloudformation/glue/aws-glue-schemaversionmetadata.go
similarity index 97%
rename from goformation/cloudformation/glue/aws-glue-schemaversionmetadata.go
rename to pkg/goformation/cloudformation/glue/aws-glue-schemaversionmetadata.go
index 43c41daa2b..c14b320340 100644
--- a/goformation/cloudformation/glue/aws-glue-schemaversionmetadata.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-schemaversionmetadata.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SchemaVersionMetadata AWS CloudFormation Resource (AWS::Glue::SchemaVersionMetadata)
diff --git a/goformation/cloudformation/glue/aws-glue-securityconfiguration.go b/pkg/goformation/cloudformation/glue/aws-glue-securityconfiguration.go
similarity index 96%
rename from goformation/cloudformation/glue/aws-glue-securityconfiguration.go
rename to pkg/goformation/cloudformation/glue/aws-glue-securityconfiguration.go
index f7a53a079b..454ab005da 100644
--- a/goformation/cloudformation/glue/aws-glue-securityconfiguration.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-securityconfiguration.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SecurityConfiguration AWS CloudFormation Resource (AWS::Glue::SecurityConfiguration)
diff --git a/goformation/cloudformation/glue/aws-glue-securityconfiguration_cloudwatchencryption.go b/pkg/goformation/cloudformation/glue/aws-glue-securityconfiguration_cloudwatchencryption.go
similarity index 93%
rename from goformation/cloudformation/glue/aws-glue-securityconfiguration_cloudwatchencryption.go
rename to pkg/goformation/cloudformation/glue/aws-glue-securityconfiguration_cloudwatchencryption.go
index 56c647a3f1..f99439c5b9 100644
--- a/goformation/cloudformation/glue/aws-glue-securityconfiguration_cloudwatchencryption.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-securityconfiguration_cloudwatchencryption.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SecurityConfiguration_CloudWatchEncryption AWS CloudFormation Resource (AWS::Glue::SecurityConfiguration.CloudWatchEncryption)
diff --git a/goformation/cloudformation/glue/aws-glue-securityconfiguration_encryptionconfiguration.go b/pkg/goformation/cloudformation/glue/aws-glue-securityconfiguration_encryptionconfiguration.go
similarity index 97%
rename from goformation/cloudformation/glue/aws-glue-securityconfiguration_encryptionconfiguration.go
rename to pkg/goformation/cloudformation/glue/aws-glue-securityconfiguration_encryptionconfiguration.go
index b336e3e405..7408bf04b3 100644
--- a/goformation/cloudformation/glue/aws-glue-securityconfiguration_encryptionconfiguration.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-securityconfiguration_encryptionconfiguration.go
@@ -1,7 +1,7 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SecurityConfiguration_EncryptionConfiguration AWS CloudFormation Resource (AWS::Glue::SecurityConfiguration.EncryptionConfiguration)
diff --git a/goformation/cloudformation/glue/aws-glue-securityconfiguration_jobbookmarksencryption.go b/pkg/goformation/cloudformation/glue/aws-glue-securityconfiguration_jobbookmarksencryption.go
similarity index 93%
rename from goformation/cloudformation/glue/aws-glue-securityconfiguration_jobbookmarksencryption.go
rename to pkg/goformation/cloudformation/glue/aws-glue-securityconfiguration_jobbookmarksencryption.go
index 59bb9c9aaa..4074eab48c 100644
--- a/goformation/cloudformation/glue/aws-glue-securityconfiguration_jobbookmarksencryption.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-securityconfiguration_jobbookmarksencryption.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SecurityConfiguration_JobBookmarksEncryption AWS CloudFormation Resource (AWS::Glue::SecurityConfiguration.JobBookmarksEncryption)
diff --git a/goformation/cloudformation/glue/aws-glue-securityconfiguration_s3encryption.go b/pkg/goformation/cloudformation/glue/aws-glue-securityconfiguration_s3encryption.go
similarity index 93%
rename from goformation/cloudformation/glue/aws-glue-securityconfiguration_s3encryption.go
rename to pkg/goformation/cloudformation/glue/aws-glue-securityconfiguration_s3encryption.go
index c239983f92..e1b9a153df 100644
--- a/goformation/cloudformation/glue/aws-glue-securityconfiguration_s3encryption.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-securityconfiguration_s3encryption.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SecurityConfiguration_S3Encryption AWS CloudFormation Resource (AWS::Glue::SecurityConfiguration.S3Encryption)
diff --git a/goformation/cloudformation/glue/aws-glue-securityconfiguration_s3encryptions.go b/pkg/goformation/cloudformation/glue/aws-glue-securityconfiguration_s3encryptions.go
similarity index 94%
rename from goformation/cloudformation/glue/aws-glue-securityconfiguration_s3encryptions.go
rename to pkg/goformation/cloudformation/glue/aws-glue-securityconfiguration_s3encryptions.go
index 0b8bea3b1b..c7bce7e874 100644
--- a/goformation/cloudformation/glue/aws-glue-securityconfiguration_s3encryptions.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-securityconfiguration_s3encryptions.go
@@ -1,7 +1,7 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SecurityConfiguration_S3Encryptions AWS CloudFormation Resource (AWS::Glue::SecurityConfiguration.S3Encryptions)
diff --git a/goformation/cloudformation/glue/aws-glue-table.go b/pkg/goformation/cloudformation/glue/aws-glue-table.go
similarity index 96%
rename from goformation/cloudformation/glue/aws-glue-table.go
rename to pkg/goformation/cloudformation/glue/aws-glue-table.go
index 01dc3404cc..8d2934c8a9 100644
--- a/goformation/cloudformation/glue/aws-glue-table.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-table.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Table AWS CloudFormation Resource (AWS::Glue::Table)
diff --git a/goformation/cloudformation/glue/aws-glue-table_column.go b/pkg/goformation/cloudformation/glue/aws-glue-table_column.go
similarity index 93%
rename from goformation/cloudformation/glue/aws-glue-table_column.go
rename to pkg/goformation/cloudformation/glue/aws-glue-table_column.go
index bcb78f0576..33ffac2e15 100644
--- a/goformation/cloudformation/glue/aws-glue-table_column.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-table_column.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Table_Column AWS CloudFormation Resource (AWS::Glue::Table.Column)
diff --git a/goformation/cloudformation/glue/aws-glue-table_order.go b/pkg/goformation/cloudformation/glue/aws-glue-table_order.go
similarity index 92%
rename from goformation/cloudformation/glue/aws-glue-table_order.go
rename to pkg/goformation/cloudformation/glue/aws-glue-table_order.go
index 1cc9df3034..5649ceb54c 100644
--- a/goformation/cloudformation/glue/aws-glue-table_order.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-table_order.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Table_Order AWS CloudFormation Resource (AWS::Glue::Table.Order)
diff --git a/goformation/cloudformation/glue/aws-glue-table_schemaid.go b/pkg/goformation/cloudformation/glue/aws-glue-table_schemaid.go
similarity index 93%
rename from goformation/cloudformation/glue/aws-glue-table_schemaid.go
rename to pkg/goformation/cloudformation/glue/aws-glue-table_schemaid.go
index 1c21167f4d..4d5278ebed 100644
--- a/goformation/cloudformation/glue/aws-glue-table_schemaid.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-table_schemaid.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Table_SchemaId AWS CloudFormation Resource (AWS::Glue::Table.SchemaId)
diff --git a/goformation/cloudformation/glue/aws-glue-table_schemareference.go b/pkg/goformation/cloudformation/glue/aws-glue-table_schemareference.go
similarity index 93%
rename from goformation/cloudformation/glue/aws-glue-table_schemareference.go
rename to pkg/goformation/cloudformation/glue/aws-glue-table_schemareference.go
index 10c55531d8..ff4d6cb2b9 100644
--- a/goformation/cloudformation/glue/aws-glue-table_schemareference.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-table_schemareference.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Table_SchemaReference AWS CloudFormation Resource (AWS::Glue::Table.SchemaReference)
diff --git a/goformation/cloudformation/glue/aws-glue-table_serdeinfo.go b/pkg/goformation/cloudformation/glue/aws-glue-table_serdeinfo.go
similarity index 93%
rename from goformation/cloudformation/glue/aws-glue-table_serdeinfo.go
rename to pkg/goformation/cloudformation/glue/aws-glue-table_serdeinfo.go
index c8b6e1d60b..780c88f4cd 100644
--- a/goformation/cloudformation/glue/aws-glue-table_serdeinfo.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-table_serdeinfo.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Table_SerdeInfo AWS CloudFormation Resource (AWS::Glue::Table.SerdeInfo)
diff --git a/goformation/cloudformation/glue/aws-glue-table_skewedinfo.go b/pkg/goformation/cloudformation/glue/aws-glue-table_skewedinfo.go
similarity index 93%
rename from goformation/cloudformation/glue/aws-glue-table_skewedinfo.go
rename to pkg/goformation/cloudformation/glue/aws-glue-table_skewedinfo.go
index 644a22877c..5d33e43ff7 100644
--- a/goformation/cloudformation/glue/aws-glue-table_skewedinfo.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-table_skewedinfo.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Table_SkewedInfo AWS CloudFormation Resource (AWS::Glue::Table.SkewedInfo)
diff --git a/goformation/cloudformation/glue/aws-glue-table_storagedescriptor.go b/pkg/goformation/cloudformation/glue/aws-glue-table_storagedescriptor.go
similarity index 97%
rename from goformation/cloudformation/glue/aws-glue-table_storagedescriptor.go
rename to pkg/goformation/cloudformation/glue/aws-glue-table_storagedescriptor.go
index bfda0f29c7..ae9bb3f289 100644
--- a/goformation/cloudformation/glue/aws-glue-table_storagedescriptor.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-table_storagedescriptor.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Table_StorageDescriptor AWS CloudFormation Resource (AWS::Glue::Table.StorageDescriptor)
diff --git a/goformation/cloudformation/glue/aws-glue-table_tableidentifier.go b/pkg/goformation/cloudformation/glue/aws-glue-table_tableidentifier.go
similarity index 93%
rename from goformation/cloudformation/glue/aws-glue-table_tableidentifier.go
rename to pkg/goformation/cloudformation/glue/aws-glue-table_tableidentifier.go
index 7a19e65346..d5f7dea99f 100644
--- a/goformation/cloudformation/glue/aws-glue-table_tableidentifier.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-table_tableidentifier.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Table_TableIdentifier AWS CloudFormation Resource (AWS::Glue::Table.TableIdentifier)
diff --git a/goformation/cloudformation/glue/aws-glue-table_tableinput.go b/pkg/goformation/cloudformation/glue/aws-glue-table_tableinput.go
similarity index 96%
rename from goformation/cloudformation/glue/aws-glue-table_tableinput.go
rename to pkg/goformation/cloudformation/glue/aws-glue-table_tableinput.go
index 6008fefd95..d842106a5f 100644
--- a/goformation/cloudformation/glue/aws-glue-table_tableinput.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-table_tableinput.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Table_TableInput AWS CloudFormation Resource (AWS::Glue::Table.TableInput)
diff --git a/goformation/cloudformation/glue/aws-glue-trigger.go b/pkg/goformation/cloudformation/glue/aws-glue-trigger.go
similarity index 97%
rename from goformation/cloudformation/glue/aws-glue-trigger.go
rename to pkg/goformation/cloudformation/glue/aws-glue-trigger.go
index 653d33d8bb..119bbdf8c5 100644
--- a/goformation/cloudformation/glue/aws-glue-trigger.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-trigger.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Trigger AWS CloudFormation Resource (AWS::Glue::Trigger)
diff --git a/goformation/cloudformation/glue/aws-glue-trigger_action.go b/pkg/goformation/cloudformation/glue/aws-glue-trigger_action.go
similarity index 95%
rename from goformation/cloudformation/glue/aws-glue-trigger_action.go
rename to pkg/goformation/cloudformation/glue/aws-glue-trigger_action.go
index e594844f83..52f393566f 100644
--- a/goformation/cloudformation/glue/aws-glue-trigger_action.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-trigger_action.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Trigger_Action AWS CloudFormation Resource (AWS::Glue::Trigger.Action)
diff --git a/goformation/cloudformation/glue/aws-glue-trigger_condition.go b/pkg/goformation/cloudformation/glue/aws-glue-trigger_condition.go
similarity index 94%
rename from goformation/cloudformation/glue/aws-glue-trigger_condition.go
rename to pkg/goformation/cloudformation/glue/aws-glue-trigger_condition.go
index 6ebbc36d78..ec92ea620e 100644
--- a/goformation/cloudformation/glue/aws-glue-trigger_condition.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-trigger_condition.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Trigger_Condition AWS CloudFormation Resource (AWS::Glue::Trigger.Condition)
diff --git a/goformation/cloudformation/glue/aws-glue-trigger_notificationproperty.go b/pkg/goformation/cloudformation/glue/aws-glue-trigger_notificationproperty.go
similarity index 91%
rename from goformation/cloudformation/glue/aws-glue-trigger_notificationproperty.go
rename to pkg/goformation/cloudformation/glue/aws-glue-trigger_notificationproperty.go
index 497db54d27..7e4faa473d 100644
--- a/goformation/cloudformation/glue/aws-glue-trigger_notificationproperty.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-trigger_notificationproperty.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Trigger_NotificationProperty AWS CloudFormation Resource (AWS::Glue::Trigger.NotificationProperty)
diff --git a/goformation/cloudformation/glue/aws-glue-trigger_predicate.go b/pkg/goformation/cloudformation/glue/aws-glue-trigger_predicate.go
similarity index 92%
rename from goformation/cloudformation/glue/aws-glue-trigger_predicate.go
rename to pkg/goformation/cloudformation/glue/aws-glue-trigger_predicate.go
index 5d53233a4a..c54355715e 100644
--- a/goformation/cloudformation/glue/aws-glue-trigger_predicate.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-trigger_predicate.go
@@ -1,9 +1,9 @@
 package glue
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Trigger_Predicate AWS CloudFormation Resource (AWS::Glue::Trigger.Predicate)
diff --git a/goformation/cloudformation/glue/aws-glue-workflow.go b/pkg/goformation/cloudformation/glue/aws-glue-workflow.go
similarity index 97%
rename from goformation/cloudformation/glue/aws-glue-workflow.go
rename to pkg/goformation/cloudformation/glue/aws-glue-workflow.go
index 0c67578e77..59b989eabc 100644
--- a/goformation/cloudformation/glue/aws-glue-workflow.go
+++ b/pkg/goformation/cloudformation/glue/aws-glue-workflow.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Workflow AWS CloudFormation Resource (AWS::Glue::Workflow)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-connectordefinition.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-connectordefinition.go
similarity index 97%
rename from goformation/cloudformation/greengrass/aws-greengrass-connectordefinition.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-connectordefinition.go
index a21ecfd221..4f914d4e48 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-connectordefinition.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-connectordefinition.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorDefinition AWS CloudFormation Resource (AWS::Greengrass::ConnectorDefinition)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-connectordefinition_connector.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-connectordefinition_connector.go
similarity index 93%
rename from goformation/cloudformation/greengrass/aws-greengrass-connectordefinition_connector.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-connectordefinition_connector.go
index f8418ceda5..cac3f103ab 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-connectordefinition_connector.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-connectordefinition_connector.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorDefinition_Connector AWS CloudFormation Resource (AWS::Greengrass::ConnectorDefinition.Connector)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-connectordefinition_connectordefinitionversion.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-connectordefinition_connectordefinitionversion.go
similarity index 96%
rename from goformation/cloudformation/greengrass/aws-greengrass-connectordefinition_connectordefinitionversion.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-connectordefinition_connectordefinitionversion.go
index 0f2af4e029..e660332d12 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-connectordefinition_connectordefinitionversion.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-connectordefinition_connectordefinitionversion.go
@@ -1,7 +1,7 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorDefinition_ConnectorDefinitionVersion AWS CloudFormation Resource (AWS::Greengrass::ConnectorDefinition.ConnectorDefinitionVersion)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-connectordefinitionversion.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-connectordefinitionversion.go
similarity index 96%
rename from goformation/cloudformation/greengrass/aws-greengrass-connectordefinitionversion.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-connectordefinitionversion.go
index b2470ee7d0..fe674dfa81 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-connectordefinitionversion.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-connectordefinitionversion.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorDefinitionVersion AWS CloudFormation Resource (AWS::Greengrass::ConnectorDefinitionVersion)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-connectordefinitionversion_connector.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-connectordefinitionversion_connector.go
similarity index 94%
rename from goformation/cloudformation/greengrass/aws-greengrass-connectordefinitionversion_connector.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-connectordefinitionversion_connector.go
index 5c328fc820..3fe451baad 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-connectordefinitionversion_connector.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-connectordefinitionversion_connector.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectorDefinitionVersion_Connector AWS CloudFormation Resource (AWS::Greengrass::ConnectorDefinitionVersion.Connector)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-coredefinition.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-coredefinition.go
similarity index 96%
rename from goformation/cloudformation/greengrass/aws-greengrass-coredefinition.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-coredefinition.go
index e1b948e882..6ce532c945 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-coredefinition.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-coredefinition.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CoreDefinition AWS CloudFormation Resource (AWS::Greengrass::CoreDefinition)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-coredefinition_core.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-coredefinition_core.go
similarity index 94%
rename from goformation/cloudformation/greengrass/aws-greengrass-coredefinition_core.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-coredefinition_core.go
index b350beb75f..b7bc98db43 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-coredefinition_core.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-coredefinition_core.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CoreDefinition_Core AWS CloudFormation Resource (AWS::Greengrass::CoreDefinition.Core)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-coredefinition_coredefinitionversion.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-coredefinition_coredefinitionversion.go
similarity index 95%
rename from goformation/cloudformation/greengrass/aws-greengrass-coredefinition_coredefinitionversion.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-coredefinition_coredefinitionversion.go
index bf701e8439..b1aa00d8a7 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-coredefinition_coredefinitionversion.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-coredefinition_coredefinitionversion.go
@@ -1,7 +1,7 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CoreDefinition_CoreDefinitionVersion AWS CloudFormation Resource (AWS::Greengrass::CoreDefinition.CoreDefinitionVersion)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-coredefinitionversion.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-coredefinitionversion.go
similarity index 96%
rename from goformation/cloudformation/greengrass/aws-greengrass-coredefinitionversion.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-coredefinitionversion.go
index 07d2a98691..d4ed317773 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-coredefinitionversion.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-coredefinitionversion.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CoreDefinitionVersion AWS CloudFormation Resource (AWS::Greengrass::CoreDefinitionVersion)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-coredefinitionversion_core.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-coredefinitionversion_core.go
similarity index 94%
rename from goformation/cloudformation/greengrass/aws-greengrass-coredefinitionversion_core.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-coredefinitionversion_core.go
index 2a398fc89a..504bfb40ea 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-coredefinitionversion_core.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-coredefinitionversion_core.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CoreDefinitionVersion_Core AWS CloudFormation Resource (AWS::Greengrass::CoreDefinitionVersion.Core)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-devicedefinition.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-devicedefinition.go
similarity index 97%
rename from goformation/cloudformation/greengrass/aws-greengrass-devicedefinition.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-devicedefinition.go
index 0ad211c46b..6e1c0a251c 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-devicedefinition.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-devicedefinition.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeviceDefinition AWS CloudFormation Resource (AWS::Greengrass::DeviceDefinition)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-devicedefinition_device.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-devicedefinition_device.go
similarity index 94%
rename from goformation/cloudformation/greengrass/aws-greengrass-devicedefinition_device.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-devicedefinition_device.go
index 598df01ad5..c0e64d2a9c 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-devicedefinition_device.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-devicedefinition_device.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeviceDefinition_Device AWS CloudFormation Resource (AWS::Greengrass::DeviceDefinition.Device)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-devicedefinition_devicedefinitionversion.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-devicedefinition_devicedefinitionversion.go
similarity index 95%
rename from goformation/cloudformation/greengrass/aws-greengrass-devicedefinition_devicedefinitionversion.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-devicedefinition_devicedefinitionversion.go
index da3ad517ff..b42733b1af 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-devicedefinition_devicedefinitionversion.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-devicedefinition_devicedefinitionversion.go
@@ -1,7 +1,7 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeviceDefinition_DeviceDefinitionVersion AWS CloudFormation Resource (AWS::Greengrass::DeviceDefinition.DeviceDefinitionVersion)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-devicedefinitionversion.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-devicedefinitionversion.go
similarity index 96%
rename from goformation/cloudformation/greengrass/aws-greengrass-devicedefinitionversion.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-devicedefinitionversion.go
index 941630f235..fbbcbdb52e 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-devicedefinitionversion.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-devicedefinitionversion.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeviceDefinitionVersion AWS CloudFormation Resource (AWS::Greengrass::DeviceDefinitionVersion)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-devicedefinitionversion_device.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-devicedefinitionversion_device.go
similarity index 94%
rename from goformation/cloudformation/greengrass/aws-greengrass-devicedefinitionversion_device.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-devicedefinitionversion_device.go
index 5f2da9c549..6d50820658 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-devicedefinitionversion_device.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-devicedefinitionversion_device.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeviceDefinitionVersion_Device AWS CloudFormation Resource (AWS::Greengrass::DeviceDefinitionVersion.Device)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition.go
similarity index 97%
rename from goformation/cloudformation/greengrass/aws-greengrass-functiondefinition.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition.go
index 2bc224695d..15c34f4faf 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FunctionDefinition AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinition)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_defaultconfig.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_defaultconfig.go
similarity index 95%
rename from goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_defaultconfig.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_defaultconfig.go
index 240370e969..9c5b4ece0d 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_defaultconfig.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_defaultconfig.go
@@ -1,7 +1,7 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FunctionDefinition_DefaultConfig AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinition.DefaultConfig)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_environment.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_environment.go
similarity index 94%
rename from goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_environment.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_environment.go
index 9f6dfbd92f..03884c5d77 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_environment.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_environment.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FunctionDefinition_Environment AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinition.Environment)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_execution.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_execution.go
similarity index 93%
rename from goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_execution.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_execution.go
index 41f37c678a..16284ca8e0 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_execution.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_execution.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FunctionDefinition_Execution AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinition.Execution)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_function.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_function.go
similarity index 94%
rename from goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_function.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_function.go
index 8bfa89ff67..e46831c83c 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_function.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_function.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FunctionDefinition_Function AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinition.Function)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_functionconfiguration.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_functionconfiguration.go
similarity index 96%
rename from goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_functionconfiguration.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_functionconfiguration.go
index 3d652d86f2..44be078831 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_functionconfiguration.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_functionconfiguration.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FunctionDefinition_FunctionConfiguration AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinition.FunctionConfiguration)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_functiondefinitionversion.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_functiondefinitionversion.go
similarity index 96%
rename from goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_functiondefinitionversion.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_functiondefinitionversion.go
index 6d37d41059..fc614df098 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_functiondefinitionversion.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_functiondefinitionversion.go
@@ -1,7 +1,7 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FunctionDefinition_FunctionDefinitionVersion AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinition.FunctionDefinitionVersion)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_resourceaccesspolicy.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_resourceaccesspolicy.go
similarity index 93%
rename from goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_resourceaccesspolicy.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_resourceaccesspolicy.go
index dfe6ad028c..26ee79ccf2 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_resourceaccesspolicy.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_resourceaccesspolicy.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FunctionDefinition_ResourceAccessPolicy AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinition.ResourceAccessPolicy)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_runas.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_runas.go
similarity index 92%
rename from goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_runas.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_runas.go
index 4718c18229..0a0e4091c6 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_runas.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_runas.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FunctionDefinition_RunAs AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinition.RunAs)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion.go
similarity index 97%
rename from goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion.go
index 7fb271b88f..80c5a3a069 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FunctionDefinitionVersion AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinitionVersion)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_defaultconfig.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_defaultconfig.go
similarity index 95%
rename from goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_defaultconfig.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_defaultconfig.go
index e3e287099f..232a1fce17 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_defaultconfig.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_defaultconfig.go
@@ -1,7 +1,7 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FunctionDefinitionVersion_DefaultConfig AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinitionVersion.DefaultConfig)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_environment.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_environment.go
similarity index 95%
rename from goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_environment.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_environment.go
index d8e0439a18..1ba0bf883e 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_environment.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_environment.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FunctionDefinitionVersion_Environment AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinitionVersion.Environment)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_execution.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_execution.go
similarity index 93%
rename from goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_execution.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_execution.go
index d57534a8f0..efc4bb06d6 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_execution.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_execution.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FunctionDefinitionVersion_Execution AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinitionVersion.Execution)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_function.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_function.go
similarity index 94%
rename from goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_function.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_function.go
index 29ca749844..6dfd15ad11 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_function.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_function.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FunctionDefinitionVersion_Function AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinitionVersion.Function)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_functionconfiguration.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_functionconfiguration.go
similarity index 96%
rename from goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_functionconfiguration.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_functionconfiguration.go
index 446f7e0859..958c02e04b 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_functionconfiguration.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_functionconfiguration.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FunctionDefinitionVersion_FunctionConfiguration AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinitionVersion.FunctionConfiguration)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_resourceaccesspolicy.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_resourceaccesspolicy.go
similarity index 93%
rename from goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_resourceaccesspolicy.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_resourceaccesspolicy.go
index 20a1699535..512869eb11 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_resourceaccesspolicy.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_resourceaccesspolicy.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FunctionDefinitionVersion_ResourceAccessPolicy AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinitionVersion.ResourceAccessPolicy)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_runas.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_runas.go
similarity index 93%
rename from goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_runas.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_runas.go
index 4cc89d0c64..4642b28488 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_runas.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_runas.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FunctionDefinitionVersion_RunAs AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinitionVersion.RunAs)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-group.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-group.go
similarity index 97%
rename from goformation/cloudformation/greengrass/aws-greengrass-group.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-group.go
index b6f7a2d8fe..7b44f41308 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-group.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-group.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Group AWS CloudFormation Resource (AWS::Greengrass::Group)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-group_groupversion.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-group_groupversion.go
similarity index 96%
rename from goformation/cloudformation/greengrass/aws-greengrass-group_groupversion.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-group_groupversion.go
index db4356a220..e765789071 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-group_groupversion.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-group_groupversion.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Group_GroupVersion AWS CloudFormation Resource (AWS::Greengrass::Group.GroupVersion)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-groupversion.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-groupversion.go
similarity index 97%
rename from goformation/cloudformation/greengrass/aws-greengrass-groupversion.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-groupversion.go
index 0aa9a01243..52c3f56731 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-groupversion.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-groupversion.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GroupVersion AWS CloudFormation Resource (AWS::Greengrass::GroupVersion)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinition.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinition.go
similarity index 97%
rename from goformation/cloudformation/greengrass/aws-greengrass-loggerdefinition.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinition.go
index 32ff22e2ea..8fc39dfd3d 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinition.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinition.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LoggerDefinition AWS CloudFormation Resource (AWS::Greengrass::LoggerDefinition)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinition_logger.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinition_logger.go
similarity index 94%
rename from goformation/cloudformation/greengrass/aws-greengrass-loggerdefinition_logger.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinition_logger.go
index d6cc18d344..11f1867598 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinition_logger.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinition_logger.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LoggerDefinition_Logger AWS CloudFormation Resource (AWS::Greengrass::LoggerDefinition.Logger)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinition_loggerdefinitionversion.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinition_loggerdefinitionversion.go
similarity index 95%
rename from goformation/cloudformation/greengrass/aws-greengrass-loggerdefinition_loggerdefinitionversion.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinition_loggerdefinitionversion.go
index 08232f9d8b..28c2b84009 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinition_loggerdefinitionversion.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinition_loggerdefinitionversion.go
@@ -1,7 +1,7 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LoggerDefinition_LoggerDefinitionVersion AWS CloudFormation Resource (AWS::Greengrass::LoggerDefinition.LoggerDefinitionVersion)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinitionversion.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinitionversion.go
similarity index 96%
rename from goformation/cloudformation/greengrass/aws-greengrass-loggerdefinitionversion.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinitionversion.go
index b4f68bcea5..60acd3e117 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinitionversion.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinitionversion.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LoggerDefinitionVersion AWS CloudFormation Resource (AWS::Greengrass::LoggerDefinitionVersion)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinitionversion_logger.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinitionversion_logger.go
similarity index 95%
rename from goformation/cloudformation/greengrass/aws-greengrass-loggerdefinitionversion_logger.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinitionversion_logger.go
index 3f9042a9c0..05ca34d49d 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinitionversion_logger.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinitionversion_logger.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LoggerDefinitionVersion_Logger AWS CloudFormation Resource (AWS::Greengrass::LoggerDefinitionVersion.Logger)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition.go
similarity index 97%
rename from goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition.go
index ca26801b92..bb15f22e9a 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceDefinition AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinition)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_groupownersetting.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_groupownersetting.go
similarity index 93%
rename from goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_groupownersetting.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_groupownersetting.go
index 1252a8c14e..3fa179e184 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_groupownersetting.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_groupownersetting.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceDefinition_GroupOwnerSetting AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinition.GroupOwnerSetting)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_localdeviceresourcedata.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_localdeviceresourcedata.go
similarity index 93%
rename from goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_localdeviceresourcedata.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_localdeviceresourcedata.go
index abf7cd4680..bdda8de122 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_localdeviceresourcedata.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_localdeviceresourcedata.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceDefinition_LocalDeviceResourceData AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinition.LocalDeviceResourceData)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_localvolumeresourcedata.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_localvolumeresourcedata.go
similarity index 94%
rename from goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_localvolumeresourcedata.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_localvolumeresourcedata.go
index 27bb7013f4..36b6f6845e 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_localvolumeresourcedata.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_localvolumeresourcedata.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceDefinition_LocalVolumeResourceData AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinition.LocalVolumeResourceData)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedatacontainer.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedatacontainer.go
similarity index 98%
rename from goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedatacontainer.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedatacontainer.go
index de6139d027..4aceae592d 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedatacontainer.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedatacontainer.go
@@ -1,7 +1,7 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceDefinition_ResourceDataContainer AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinition.ResourceDataContainer)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedefinitionversion.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedefinitionversion.go
similarity index 96%
rename from goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedefinitionversion.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedefinitionversion.go
index 51f4fa3b8b..560757e6aa 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedefinitionversion.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedefinitionversion.go
@@ -1,7 +1,7 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceDefinition_ResourceDefinitionVersion AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinition.ResourceDefinitionVersion)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedownloadownersetting.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedownloadownersetting.go
similarity index 93%
rename from goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedownloadownersetting.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedownloadownersetting.go
index 4b980db44c..caf0a264a2 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedownloadownersetting.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedownloadownersetting.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceDefinition_ResourceDownloadOwnerSetting AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinition.ResourceDownloadOwnerSetting)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourceinstance.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourceinstance.go
similarity index 94%
rename from goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourceinstance.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourceinstance.go
index 6de8ce37c6..e4260a715d 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourceinstance.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourceinstance.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceDefinition_ResourceInstance AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinition.ResourceInstance)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_s3machinelearningmodelresourcedata.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_s3machinelearningmodelresourcedata.go
similarity index 94%
rename from goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_s3machinelearningmodelresourcedata.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_s3machinelearningmodelresourcedata.go
index f526e5a38c..64d733dd89 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_s3machinelearningmodelresourcedata.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_s3machinelearningmodelresourcedata.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceDefinition_S3MachineLearningModelResourceData AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinition.S3MachineLearningModelResourceData)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_sagemakermachinelearningmodelresourcedata.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_sagemakermachinelearningmodelresourcedata.go
similarity index 95%
rename from goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_sagemakermachinelearningmodelresourcedata.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_sagemakermachinelearningmodelresourcedata.go
index abcc56c486..b8be556069 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_sagemakermachinelearningmodelresourcedata.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_sagemakermachinelearningmodelresourcedata.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceDefinition_SageMakerMachineLearningModelResourceData AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinition.SageMakerMachineLearningModelResourceData)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_secretsmanagersecretresourcedata.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_secretsmanagersecretresourcedata.go
similarity index 93%
rename from goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_secretsmanagersecretresourcedata.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_secretsmanagersecretresourcedata.go
index 6e4b8400ff..46be18caf1 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_secretsmanagersecretresourcedata.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_secretsmanagersecretresourcedata.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceDefinition_SecretsManagerSecretResourceData AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinition.SecretsManagerSecretResourceData)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion.go
similarity index 96%
rename from goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion.go
index f4039e6374..876627e5e1 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceDefinitionVersion AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinitionVersion)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_groupownersetting.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_groupownersetting.go
similarity index 93%
rename from goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_groupownersetting.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_groupownersetting.go
index 2d4ca7f1c0..013ee43899 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_groupownersetting.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_groupownersetting.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceDefinitionVersion_GroupOwnerSetting AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinitionVersion.GroupOwnerSetting)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_localdeviceresourcedata.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_localdeviceresourcedata.go
similarity index 93%
rename from goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_localdeviceresourcedata.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_localdeviceresourcedata.go
index 49ffd57d69..b334d3b381 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_localdeviceresourcedata.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_localdeviceresourcedata.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceDefinitionVersion_LocalDeviceResourceData AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinitionVersion.LocalDeviceResourceData)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_localvolumeresourcedata.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_localvolumeresourcedata.go
similarity index 94%
rename from goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_localvolumeresourcedata.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_localvolumeresourcedata.go
index e02c1f48c3..b290176a9f 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_localvolumeresourcedata.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_localvolumeresourcedata.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceDefinitionVersion_LocalVolumeResourceData AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinitionVersion.LocalVolumeResourceData)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourcedatacontainer.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourcedatacontainer.go
similarity index 98%
rename from goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourcedatacontainer.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourcedatacontainer.go
index b2ff7159b5..4504215b92 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourcedatacontainer.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourcedatacontainer.go
@@ -1,7 +1,7 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceDefinitionVersion_ResourceDataContainer AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinitionVersion.ResourceDataContainer)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourcedownloadownersetting.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourcedownloadownersetting.go
similarity index 93%
rename from goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourcedownloadownersetting.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourcedownloadownersetting.go
index efe05d678d..57b65b26dd 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourcedownloadownersetting.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourcedownloadownersetting.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceDefinitionVersion_ResourceDownloadOwnerSetting AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinitionVersion.ResourceDownloadOwnerSetting)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourceinstance.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourceinstance.go
similarity index 94%
rename from goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourceinstance.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourceinstance.go
index a934a5248f..d58f0dcdeb 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourceinstance.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourceinstance.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceDefinitionVersion_ResourceInstance AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinitionVersion.ResourceInstance)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_s3machinelearningmodelresourcedata.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_s3machinelearningmodelresourcedata.go
similarity index 94%
rename from goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_s3machinelearningmodelresourcedata.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_s3machinelearningmodelresourcedata.go
index a5a78524e2..5d355613d2 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_s3machinelearningmodelresourcedata.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_s3machinelearningmodelresourcedata.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceDefinitionVersion_S3MachineLearningModelResourceData AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinitionVersion.S3MachineLearningModelResourceData)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_sagemakermachinelearningmodelresourcedata.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_sagemakermachinelearningmodelresourcedata.go
similarity index 95%
rename from goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_sagemakermachinelearningmodelresourcedata.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_sagemakermachinelearningmodelresourcedata.go
index 48ef8a4c11..a10edb62e0 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_sagemakermachinelearningmodelresourcedata.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_sagemakermachinelearningmodelresourcedata.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceDefinitionVersion_SageMakerMachineLearningModelResourceData AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinitionVersion.SageMakerMachineLearningModelResourceData)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_secretsmanagersecretresourcedata.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_secretsmanagersecretresourcedata.go
similarity index 94%
rename from goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_secretsmanagersecretresourcedata.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_secretsmanagersecretresourcedata.go
index 9b38f543ff..00c83b5aec 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_secretsmanagersecretresourcedata.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_secretsmanagersecretresourcedata.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceDefinitionVersion_SecretsManagerSecretResourceData AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinitionVersion.SecretsManagerSecretResourceData)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinition.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinition.go
similarity index 97%
rename from goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinition.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinition.go
index 546d4651c8..82d07a7de3 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinition.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinition.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SubscriptionDefinition AWS CloudFormation Resource (AWS::Greengrass::SubscriptionDefinition)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinition_subscription.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinition_subscription.go
similarity index 94%
rename from goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinition_subscription.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinition_subscription.go
index 418d2e3845..198f3cb67c 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinition_subscription.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinition_subscription.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SubscriptionDefinition_Subscription AWS CloudFormation Resource (AWS::Greengrass::SubscriptionDefinition.Subscription)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinition_subscriptiondefinitionversion.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinition_subscriptiondefinitionversion.go
similarity index 96%
rename from goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinition_subscriptiondefinitionversion.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinition_subscriptiondefinitionversion.go
index 166ef82676..216c68caf7 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinition_subscriptiondefinitionversion.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinition_subscriptiondefinitionversion.go
@@ -1,7 +1,7 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SubscriptionDefinition_SubscriptionDefinitionVersion AWS CloudFormation Resource (AWS::Greengrass::SubscriptionDefinition.SubscriptionDefinitionVersion)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinitionversion.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinitionversion.go
similarity index 97%
rename from goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinitionversion.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinitionversion.go
index 4dfad95d3d..beed097044 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinitionversion.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinitionversion.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SubscriptionDefinitionVersion AWS CloudFormation Resource (AWS::Greengrass::SubscriptionDefinitionVersion)
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinitionversion_subscription.go b/pkg/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinitionversion_subscription.go
similarity index 94%
rename from goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinitionversion_subscription.go
rename to pkg/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinitionversion_subscription.go
index 974b1b90fd..56b0932f4a 100644
--- a/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinitionversion_subscription.go
+++ b/pkg/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinitionversion_subscription.go
@@ -1,9 +1,9 @@
 package greengrass
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SubscriptionDefinitionVersion_Subscription AWS CloudFormation Resource (AWS::Greengrass::SubscriptionDefinitionVersion.Subscription)
diff --git a/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion.go b/pkg/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion.go
similarity index 97%
rename from goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion.go
rename to pkg/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion.go
index e516081022..5926df7cc9 100644
--- a/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion.go
+++ b/pkg/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ComponentVersion AWS CloudFormation Resource (AWS::GreengrassV2::ComponentVersion)
diff --git a/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_componentdependencyrequirement.go b/pkg/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_componentdependencyrequirement.go
similarity index 93%
rename from goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_componentdependencyrequirement.go
rename to pkg/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_componentdependencyrequirement.go
index 79e799890f..f825693530 100644
--- a/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_componentdependencyrequirement.go
+++ b/pkg/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_componentdependencyrequirement.go
@@ -1,9 +1,9 @@
 package greengrassv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ComponentVersion_ComponentDependencyRequirement AWS CloudFormation Resource (AWS::GreengrassV2::ComponentVersion.ComponentDependencyRequirement)
diff --git a/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_componentplatform.go b/pkg/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_componentplatform.go
similarity index 93%
rename from goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_componentplatform.go
rename to pkg/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_componentplatform.go
index 6a9e842456..7dd22b2d8b 100644
--- a/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_componentplatform.go
+++ b/pkg/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_componentplatform.go
@@ -1,9 +1,9 @@
 package greengrassv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ComponentVersion_ComponentPlatform AWS CloudFormation Resource (AWS::GreengrassV2::ComponentVersion.ComponentPlatform)
diff --git a/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdacontainerparams.go b/pkg/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdacontainerparams.go
similarity index 95%
rename from goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdacontainerparams.go
rename to pkg/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdacontainerparams.go
index a14ab197dd..95467d3b07 100644
--- a/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdacontainerparams.go
+++ b/pkg/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdacontainerparams.go
@@ -1,9 +1,9 @@
 package greengrassv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ComponentVersion_LambdaContainerParams AWS CloudFormation Resource (AWS::GreengrassV2::ComponentVersion.LambdaContainerParams)
diff --git a/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdadevicemount.go b/pkg/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdadevicemount.go
similarity index 94%
rename from goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdadevicemount.go
rename to pkg/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdadevicemount.go
index d12c7b1878..618f0810a8 100644
--- a/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdadevicemount.go
+++ b/pkg/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdadevicemount.go
@@ -1,9 +1,9 @@
 package greengrassv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ComponentVersion_LambdaDeviceMount AWS CloudFormation Resource (AWS::GreengrassV2::ComponentVersion.LambdaDeviceMount)
diff --git a/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdaeventsource.go b/pkg/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdaeventsource.go
similarity index 93%
rename from goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdaeventsource.go
rename to pkg/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdaeventsource.go
index 22080f4443..9946cd1549 100644
--- a/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdaeventsource.go
+++ b/pkg/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdaeventsource.go
@@ -1,9 +1,9 @@
 package greengrassv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ComponentVersion_LambdaEventSource AWS CloudFormation Resource (AWS::GreengrassV2::ComponentVersion.LambdaEventSource)
diff --git a/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdaexecutionparameters.go b/pkg/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdaexecutionparameters.go
similarity index 97%
rename from goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdaexecutionparameters.go
rename to pkg/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdaexecutionparameters.go
index e3390611b9..905a0a2c38 100644
--- a/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdaexecutionparameters.go
+++ b/pkg/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdaexecutionparameters.go
@@ -1,9 +1,9 @@
 package greengrassv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ComponentVersion_LambdaExecutionParameters AWS CloudFormation Resource (AWS::GreengrassV2::ComponentVersion.LambdaExecutionParameters)
diff --git a/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdafunctionrecipesource.go b/pkg/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdafunctionrecipesource.go
similarity index 96%
rename from goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdafunctionrecipesource.go
rename to pkg/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdafunctionrecipesource.go
index cd49e42e4b..ca957eb411 100644
--- a/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdafunctionrecipesource.go
+++ b/pkg/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdafunctionrecipesource.go
@@ -1,9 +1,9 @@
 package greengrassv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ComponentVersion_LambdaFunctionRecipeSource AWS CloudFormation Resource (AWS::GreengrassV2::ComponentVersion.LambdaFunctionRecipeSource)
diff --git a/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdalinuxprocessparams.go b/pkg/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdalinuxprocessparams.go
similarity index 93%
rename from goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdalinuxprocessparams.go
rename to pkg/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdalinuxprocessparams.go
index 96561a5c3d..0bba226344 100644
--- a/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdalinuxprocessparams.go
+++ b/pkg/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdalinuxprocessparams.go
@@ -1,9 +1,9 @@
 package greengrassv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ComponentVersion_LambdaLinuxProcessParams AWS CloudFormation Resource (AWS::GreengrassV2::ComponentVersion.LambdaLinuxProcessParams)
diff --git a/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdavolumemount.go b/pkg/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdavolumemount.go
similarity index 94%
rename from goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdavolumemount.go
rename to pkg/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdavolumemount.go
index 18ca5e905b..2d582cd6ab 100644
--- a/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdavolumemount.go
+++ b/pkg/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdavolumemount.go
@@ -1,9 +1,9 @@
 package greengrassv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ComponentVersion_LambdaVolumeMount AWS CloudFormation Resource (AWS::GreengrassV2::ComponentVersion.LambdaVolumeMount)
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-config.go b/pkg/goformation/cloudformation/groundstation/aws-groundstation-config.go
similarity index 95%
rename from goformation/cloudformation/groundstation/aws-groundstation-config.go
rename to pkg/goformation/cloudformation/groundstation/aws-groundstation-config.go
index 64a867425e..d4b6fb3aab 100644
--- a/goformation/cloudformation/groundstation/aws-groundstation-config.go
+++ b/pkg/goformation/cloudformation/groundstation/aws-groundstation-config.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Config AWS CloudFormation Resource (AWS::GroundStation::Config)
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-config_antennadownlinkconfig.go b/pkg/goformation/cloudformation/groundstation/aws-groundstation-config_antennadownlinkconfig.go
similarity index 95%
rename from goformation/cloudformation/groundstation/aws-groundstation-config_antennadownlinkconfig.go
rename to pkg/goformation/cloudformation/groundstation/aws-groundstation-config_antennadownlinkconfig.go
index 3959e665d8..e9d47a1047 100644
--- a/goformation/cloudformation/groundstation/aws-groundstation-config_antennadownlinkconfig.go
+++ b/pkg/goformation/cloudformation/groundstation/aws-groundstation-config_antennadownlinkconfig.go
@@ -1,7 +1,7 @@
 package groundstation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Config_AntennaDownlinkConfig AWS CloudFormation Resource (AWS::GroundStation::Config.AntennaDownlinkConfig)
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-config_antennadownlinkdemoddecodeconfig.go b/pkg/goformation/cloudformation/groundstation/aws-groundstation-config_antennadownlinkdemoddecodeconfig.go
similarity index 97%
rename from goformation/cloudformation/groundstation/aws-groundstation-config_antennadownlinkdemoddecodeconfig.go
rename to pkg/goformation/cloudformation/groundstation/aws-groundstation-config_antennadownlinkdemoddecodeconfig.go
index 1be619caa2..844f97abb7 100644
--- a/goformation/cloudformation/groundstation/aws-groundstation-config_antennadownlinkdemoddecodeconfig.go
+++ b/pkg/goformation/cloudformation/groundstation/aws-groundstation-config_antennadownlinkdemoddecodeconfig.go
@@ -1,7 +1,7 @@
 package groundstation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Config_AntennaDownlinkDemodDecodeConfig AWS CloudFormation Resource (AWS::GroundStation::Config.AntennaDownlinkDemodDecodeConfig)
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-config_antennauplinkconfig.go b/pkg/goformation/cloudformation/groundstation/aws-groundstation-config_antennauplinkconfig.go
similarity index 94%
rename from goformation/cloudformation/groundstation/aws-groundstation-config_antennauplinkconfig.go
rename to pkg/goformation/cloudformation/groundstation/aws-groundstation-config_antennauplinkconfig.go
index 578472ca3a..58cebcb3f0 100644
--- a/goformation/cloudformation/groundstation/aws-groundstation-config_antennauplinkconfig.go
+++ b/pkg/goformation/cloudformation/groundstation/aws-groundstation-config_antennauplinkconfig.go
@@ -1,9 +1,9 @@
 package groundstation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Config_AntennaUplinkConfig AWS CloudFormation Resource (AWS::GroundStation::Config.AntennaUplinkConfig)
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-config_configdata.go b/pkg/goformation/cloudformation/groundstation/aws-groundstation-config_configdata.go
similarity index 98%
rename from goformation/cloudformation/groundstation/aws-groundstation-config_configdata.go
rename to pkg/goformation/cloudformation/groundstation/aws-groundstation-config_configdata.go
index 303a54361e..2487cedb3f 100644
--- a/goformation/cloudformation/groundstation/aws-groundstation-config_configdata.go
+++ b/pkg/goformation/cloudformation/groundstation/aws-groundstation-config_configdata.go
@@ -1,7 +1,7 @@
 package groundstation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Config_ConfigData AWS CloudFormation Resource (AWS::GroundStation::Config.ConfigData)
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-config_dataflowendpointconfig.go b/pkg/goformation/cloudformation/groundstation/aws-groundstation-config_dataflowendpointconfig.go
similarity index 93%
rename from goformation/cloudformation/groundstation/aws-groundstation-config_dataflowendpointconfig.go
rename to pkg/goformation/cloudformation/groundstation/aws-groundstation-config_dataflowendpointconfig.go
index 4f1f87e66b..37d0330c38 100644
--- a/goformation/cloudformation/groundstation/aws-groundstation-config_dataflowendpointconfig.go
+++ b/pkg/goformation/cloudformation/groundstation/aws-groundstation-config_dataflowendpointconfig.go
@@ -1,9 +1,9 @@
 package groundstation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Config_DataflowEndpointConfig AWS CloudFormation Resource (AWS::GroundStation::Config.DataflowEndpointConfig)
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-config_decodeconfig.go b/pkg/goformation/cloudformation/groundstation/aws-groundstation-config_decodeconfig.go
similarity index 91%
rename from goformation/cloudformation/groundstation/aws-groundstation-config_decodeconfig.go
rename to pkg/goformation/cloudformation/groundstation/aws-groundstation-config_decodeconfig.go
index bb650c2d82..c57a2a6981 100644
--- a/goformation/cloudformation/groundstation/aws-groundstation-config_decodeconfig.go
+++ b/pkg/goformation/cloudformation/groundstation/aws-groundstation-config_decodeconfig.go
@@ -1,9 +1,9 @@
 package groundstation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Config_DecodeConfig AWS CloudFormation Resource (AWS::GroundStation::Config.DecodeConfig)
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-config_demodulationconfig.go b/pkg/goformation/cloudformation/groundstation/aws-groundstation-config_demodulationconfig.go
similarity index 92%
rename from goformation/cloudformation/groundstation/aws-groundstation-config_demodulationconfig.go
rename to pkg/goformation/cloudformation/groundstation/aws-groundstation-config_demodulationconfig.go
index fa3fdaca96..9b9b26d1e1 100644
--- a/goformation/cloudformation/groundstation/aws-groundstation-config_demodulationconfig.go
+++ b/pkg/goformation/cloudformation/groundstation/aws-groundstation-config_demodulationconfig.go
@@ -1,9 +1,9 @@
 package groundstation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Config_DemodulationConfig AWS CloudFormation Resource (AWS::GroundStation::Config.DemodulationConfig)
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-config_eirp.go b/pkg/goformation/cloudformation/groundstation/aws-groundstation-config_eirp.go
similarity index 92%
rename from goformation/cloudformation/groundstation/aws-groundstation-config_eirp.go
rename to pkg/goformation/cloudformation/groundstation/aws-groundstation-config_eirp.go
index 738a3f4f48..5daf81d4a9 100644
--- a/goformation/cloudformation/groundstation/aws-groundstation-config_eirp.go
+++ b/pkg/goformation/cloudformation/groundstation/aws-groundstation-config_eirp.go
@@ -1,9 +1,9 @@
 package groundstation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Config_Eirp AWS CloudFormation Resource (AWS::GroundStation::Config.Eirp)
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-config_frequency.go b/pkg/goformation/cloudformation/groundstation/aws-groundstation-config_frequency.go
similarity index 92%
rename from goformation/cloudformation/groundstation/aws-groundstation-config_frequency.go
rename to pkg/goformation/cloudformation/groundstation/aws-groundstation-config_frequency.go
index cf69ede218..1f5e85ceca 100644
--- a/goformation/cloudformation/groundstation/aws-groundstation-config_frequency.go
+++ b/pkg/goformation/cloudformation/groundstation/aws-groundstation-config_frequency.go
@@ -1,9 +1,9 @@
 package groundstation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Config_Frequency AWS CloudFormation Resource (AWS::GroundStation::Config.Frequency)
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-config_frequencybandwidth.go b/pkg/goformation/cloudformation/groundstation/aws-groundstation-config_frequencybandwidth.go
similarity index 92%
rename from goformation/cloudformation/groundstation/aws-groundstation-config_frequencybandwidth.go
rename to pkg/goformation/cloudformation/groundstation/aws-groundstation-config_frequencybandwidth.go
index 4423d1398b..a4fd182da7 100644
--- a/goformation/cloudformation/groundstation/aws-groundstation-config_frequencybandwidth.go
+++ b/pkg/goformation/cloudformation/groundstation/aws-groundstation-config_frequencybandwidth.go
@@ -1,9 +1,9 @@
 package groundstation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Config_FrequencyBandwidth AWS CloudFormation Resource (AWS::GroundStation::Config.FrequencyBandwidth)
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-config_s3recordingconfig.go b/pkg/goformation/cloudformation/groundstation/aws-groundstation-config_s3recordingconfig.go
similarity index 93%
rename from goformation/cloudformation/groundstation/aws-groundstation-config_s3recordingconfig.go
rename to pkg/goformation/cloudformation/groundstation/aws-groundstation-config_s3recordingconfig.go
index 993fe34304..7708fa6607 100644
--- a/goformation/cloudformation/groundstation/aws-groundstation-config_s3recordingconfig.go
+++ b/pkg/goformation/cloudformation/groundstation/aws-groundstation-config_s3recordingconfig.go
@@ -1,9 +1,9 @@
 package groundstation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Config_S3RecordingConfig AWS CloudFormation Resource (AWS::GroundStation::Config.S3RecordingConfig)
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-config_spectrumconfig.go b/pkg/goformation/cloudformation/groundstation/aws-groundstation-config_spectrumconfig.go
similarity index 93%
rename from goformation/cloudformation/groundstation/aws-groundstation-config_spectrumconfig.go
rename to pkg/goformation/cloudformation/groundstation/aws-groundstation-config_spectrumconfig.go
index 48802e6b0a..0853cca08f 100644
--- a/goformation/cloudformation/groundstation/aws-groundstation-config_spectrumconfig.go
+++ b/pkg/goformation/cloudformation/groundstation/aws-groundstation-config_spectrumconfig.go
@@ -1,9 +1,9 @@
 package groundstation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Config_SpectrumConfig AWS CloudFormation Resource (AWS::GroundStation::Config.SpectrumConfig)
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-config_trackingconfig.go b/pkg/goformation/cloudformation/groundstation/aws-groundstation-config_trackingconfig.go
similarity index 91%
rename from goformation/cloudformation/groundstation/aws-groundstation-config_trackingconfig.go
rename to pkg/goformation/cloudformation/groundstation/aws-groundstation-config_trackingconfig.go
index f02cce4c1b..d500ed7775 100644
--- a/goformation/cloudformation/groundstation/aws-groundstation-config_trackingconfig.go
+++ b/pkg/goformation/cloudformation/groundstation/aws-groundstation-config_trackingconfig.go
@@ -1,9 +1,9 @@
 package groundstation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Config_TrackingConfig AWS CloudFormation Resource (AWS::GroundStation::Config.TrackingConfig)
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-config_uplinkechoconfig.go b/pkg/goformation/cloudformation/groundstation/aws-groundstation-config_uplinkechoconfig.go
similarity index 93%
rename from goformation/cloudformation/groundstation/aws-groundstation-config_uplinkechoconfig.go
rename to pkg/goformation/cloudformation/groundstation/aws-groundstation-config_uplinkechoconfig.go
index a12db67e49..f8df7a6f0a 100644
--- a/goformation/cloudformation/groundstation/aws-groundstation-config_uplinkechoconfig.go
+++ b/pkg/goformation/cloudformation/groundstation/aws-groundstation-config_uplinkechoconfig.go
@@ -1,9 +1,9 @@
 package groundstation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Config_UplinkEchoConfig AWS CloudFormation Resource (AWS::GroundStation::Config.UplinkEchoConfig)
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-config_uplinkspectrumconfig.go b/pkg/goformation/cloudformation/groundstation/aws-groundstation-config_uplinkspectrumconfig.go
similarity index 93%
rename from goformation/cloudformation/groundstation/aws-groundstation-config_uplinkspectrumconfig.go
rename to pkg/goformation/cloudformation/groundstation/aws-groundstation-config_uplinkspectrumconfig.go
index b92ddf9ab0..5bafe86c66 100644
--- a/goformation/cloudformation/groundstation/aws-groundstation-config_uplinkspectrumconfig.go
+++ b/pkg/goformation/cloudformation/groundstation/aws-groundstation-config_uplinkspectrumconfig.go
@@ -1,9 +1,9 @@
 package groundstation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Config_UplinkSpectrumConfig AWS CloudFormation Resource (AWS::GroundStation::Config.UplinkSpectrumConfig)
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup.go b/pkg/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup.go
similarity index 96%
rename from goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup.go
rename to pkg/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup.go
index af3fd062d0..866ed6ce55 100644
--- a/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup.go
+++ b/pkg/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup.go
@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataflowEndpointGroup AWS CloudFormation Resource (AWS::GroundStation::DataflowEndpointGroup)
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_dataflowendpoint.go b/pkg/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_dataflowendpoint.go
similarity index 94%
rename from goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_dataflowendpoint.go
rename to pkg/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_dataflowendpoint.go
index 38e87a67a1..2b0d6ba581 100644
--- a/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_dataflowendpoint.go
+++ b/pkg/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_dataflowendpoint.go
@@ -1,9 +1,9 @@
 package groundstation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataflowEndpointGroup_DataflowEndpoint AWS CloudFormation Resource (AWS::GroundStation::DataflowEndpointGroup.DataflowEndpoint)
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_endpointdetails.go b/pkg/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_endpointdetails.go
similarity index 96%
rename from goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_endpointdetails.go
rename to pkg/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_endpointdetails.go
index 201f540a27..19559e722c 100644
--- a/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_endpointdetails.go
+++ b/pkg/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_endpointdetails.go
@@ -1,7 +1,7 @@
 package groundstation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataflowEndpointGroup_EndpointDetails AWS CloudFormation Resource (AWS::GroundStation::DataflowEndpointGroup.EndpointDetails)
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_securitydetails.go b/pkg/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_securitydetails.go
similarity index 94%
rename from goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_securitydetails.go
rename to pkg/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_securitydetails.go
index 3cb7574470..3d80533761 100644
--- a/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_securitydetails.go
+++ b/pkg/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_securitydetails.go
@@ -1,9 +1,9 @@
 package groundstation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataflowEndpointGroup_SecurityDetails AWS CloudFormation Resource (AWS::GroundStation::DataflowEndpointGroup.SecurityDetails)
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_socketaddress.go b/pkg/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_socketaddress.go
similarity index 93%
rename from goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_socketaddress.go
rename to pkg/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_socketaddress.go
index 48bbebb8a9..af03360ec1 100644
--- a/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_socketaddress.go
+++ b/pkg/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_socketaddress.go
@@ -1,9 +1,9 @@
 package groundstation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataflowEndpointGroup_SocketAddress AWS CloudFormation Resource (AWS::GroundStation::DataflowEndpointGroup.SocketAddress)
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-missionprofile.go b/pkg/goformation/cloudformation/groundstation/aws-groundstation-missionprofile.go
similarity index 96%
rename from goformation/cloudformation/groundstation/aws-groundstation-missionprofile.go
rename to pkg/goformation/cloudformation/groundstation/aws-groundstation-missionprofile.go
index e2b41f58f3..cd7689d837 100644
--- a/goformation/cloudformation/groundstation/aws-groundstation-missionprofile.go
+++ b/pkg/goformation/cloudformation/groundstation/aws-groundstation-missionprofile.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MissionProfile AWS CloudFormation Resource (AWS::GroundStation::MissionProfile)
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-missionprofile_dataflowedge.go b/pkg/goformation/cloudformation/groundstation/aws-groundstation-missionprofile_dataflowedge.go
similarity index 93%
rename from goformation/cloudformation/groundstation/aws-groundstation-missionprofile_dataflowedge.go
rename to pkg/goformation/cloudformation/groundstation/aws-groundstation-missionprofile_dataflowedge.go
index a6e8a47a58..3cebcc87b8 100644
--- a/goformation/cloudformation/groundstation/aws-groundstation-missionprofile_dataflowedge.go
+++ b/pkg/goformation/cloudformation/groundstation/aws-groundstation-missionprofile_dataflowedge.go
@@ -1,9 +1,9 @@
 package groundstation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MissionProfile_DataflowEdge AWS CloudFormation Resource (AWS::GroundStation::MissionProfile.DataflowEdge)
diff --git a/goformation/cloudformation/guardduty/aws-guardduty-detector.go b/pkg/goformation/cloudformation/guardduty/aws-guardduty-detector.go
similarity index 96%
rename from goformation/cloudformation/guardduty/aws-guardduty-detector.go
rename to pkg/goformation/cloudformation/guardduty/aws-guardduty-detector.go
index 98821f7ee5..5080e1db76 100644
--- a/goformation/cloudformation/guardduty/aws-guardduty-detector.go
+++ b/pkg/goformation/cloudformation/guardduty/aws-guardduty-detector.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Detector AWS CloudFormation Resource (AWS::GuardDuty::Detector)
diff --git a/goformation/cloudformation/guardduty/aws-guardduty-detector_cfndatasourceconfigurations.go b/pkg/goformation/cloudformation/guardduty/aws-guardduty-detector_cfndatasourceconfigurations.go
similarity index 95%
rename from goformation/cloudformation/guardduty/aws-guardduty-detector_cfndatasourceconfigurations.go
rename to pkg/goformation/cloudformation/guardduty/aws-guardduty-detector_cfndatasourceconfigurations.go
index 1cdf495d17..fe381bc388 100644
--- a/goformation/cloudformation/guardduty/aws-guardduty-detector_cfndatasourceconfigurations.go
+++ b/pkg/goformation/cloudformation/guardduty/aws-guardduty-detector_cfndatasourceconfigurations.go
@@ -1,7 +1,7 @@
 package guardduty
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Detector_CFNDataSourceConfigurations AWS CloudFormation Resource (AWS::GuardDuty::Detector.CFNDataSourceConfigurations)
diff --git a/goformation/cloudformation/guardduty/aws-guardduty-detector_cfns3logsconfiguration.go b/pkg/goformation/cloudformation/guardduty/aws-guardduty-detector_cfns3logsconfiguration.go
similarity index 91%
rename from goformation/cloudformation/guardduty/aws-guardduty-detector_cfns3logsconfiguration.go
rename to pkg/goformation/cloudformation/guardduty/aws-guardduty-detector_cfns3logsconfiguration.go
index 69c9ebf100..be3b6847f9 100644
--- a/goformation/cloudformation/guardduty/aws-guardduty-detector_cfns3logsconfiguration.go
+++ b/pkg/goformation/cloudformation/guardduty/aws-guardduty-detector_cfns3logsconfiguration.go
@@ -1,9 +1,9 @@
 package guardduty
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Detector_CFNS3LogsConfiguration AWS CloudFormation Resource (AWS::GuardDuty::Detector.CFNS3LogsConfiguration)
diff --git a/goformation/cloudformation/guardduty/aws-guardduty-filter.go b/pkg/goformation/cloudformation/guardduty/aws-guardduty-filter.go
similarity index 97%
rename from goformation/cloudformation/guardduty/aws-guardduty-filter.go
rename to pkg/goformation/cloudformation/guardduty/aws-guardduty-filter.go
index 6db3b49d1d..60c61674ff 100644
--- a/goformation/cloudformation/guardduty/aws-guardduty-filter.go
+++ b/pkg/goformation/cloudformation/guardduty/aws-guardduty-filter.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Filter AWS CloudFormation Resource (AWS::GuardDuty::Filter)
diff --git a/goformation/cloudformation/guardduty/aws-guardduty-filter_condition.go b/pkg/goformation/cloudformation/guardduty/aws-guardduty-filter_condition.go
similarity index 94%
rename from goformation/cloudformation/guardduty/aws-guardduty-filter_condition.go
rename to pkg/goformation/cloudformation/guardduty/aws-guardduty-filter_condition.go
index 725e761583..bfdcfd5929 100644
--- a/goformation/cloudformation/guardduty/aws-guardduty-filter_condition.go
+++ b/pkg/goformation/cloudformation/guardduty/aws-guardduty-filter_condition.go
@@ -1,9 +1,9 @@
 package guardduty
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Filter_Condition AWS CloudFormation Resource (AWS::GuardDuty::Filter.Condition)
diff --git a/goformation/cloudformation/guardduty/aws-guardduty-filter_findingcriteria.go b/pkg/goformation/cloudformation/guardduty/aws-guardduty-filter_findingcriteria.go
similarity index 96%
rename from goformation/cloudformation/guardduty/aws-guardduty-filter_findingcriteria.go
rename to pkg/goformation/cloudformation/guardduty/aws-guardduty-filter_findingcriteria.go
index cdaa5154d1..6069688c54 100644
--- a/goformation/cloudformation/guardduty/aws-guardduty-filter_findingcriteria.go
+++ b/pkg/goformation/cloudformation/guardduty/aws-guardduty-filter_findingcriteria.go
@@ -1,7 +1,7 @@
 package guardduty
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Filter_FindingCriteria AWS CloudFormation Resource (AWS::GuardDuty::Filter.FindingCriteria)
diff --git a/goformation/cloudformation/guardduty/aws-guardduty-ipset.go b/pkg/goformation/cloudformation/guardduty/aws-guardduty-ipset.go
similarity index 97%
rename from goformation/cloudformation/guardduty/aws-guardduty-ipset.go
rename to pkg/goformation/cloudformation/guardduty/aws-guardduty-ipset.go
index 83ec0bf55b..c69b38af9d 100644
--- a/goformation/cloudformation/guardduty/aws-guardduty-ipset.go
+++ b/pkg/goformation/cloudformation/guardduty/aws-guardduty-ipset.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // IPSet AWS CloudFormation Resource (AWS::GuardDuty::IPSet)
diff --git a/goformation/cloudformation/guardduty/aws-guardduty-master.go b/pkg/goformation/cloudformation/guardduty/aws-guardduty-master.go
similarity index 96%
rename from goformation/cloudformation/guardduty/aws-guardduty-master.go
rename to pkg/goformation/cloudformation/guardduty/aws-guardduty-master.go
index 5b89508410..9987eaf928 100644
--- a/goformation/cloudformation/guardduty/aws-guardduty-master.go
+++ b/pkg/goformation/cloudformation/guardduty/aws-guardduty-master.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Master AWS CloudFormation Resource (AWS::GuardDuty::Master)
diff --git a/goformation/cloudformation/guardduty/aws-guardduty-member.go b/pkg/goformation/cloudformation/guardduty/aws-guardduty-member.go
similarity index 97%
rename from goformation/cloudformation/guardduty/aws-guardduty-member.go
rename to pkg/goformation/cloudformation/guardduty/aws-guardduty-member.go
index 5bfb398fde..b241dabf5f 100644
--- a/goformation/cloudformation/guardduty/aws-guardduty-member.go
+++ b/pkg/goformation/cloudformation/guardduty/aws-guardduty-member.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Member AWS CloudFormation Resource (AWS::GuardDuty::Member)
diff --git a/goformation/cloudformation/guardduty/aws-guardduty-threatintelset.go b/pkg/goformation/cloudformation/guardduty/aws-guardduty-threatintelset.go
similarity index 97%
rename from goformation/cloudformation/guardduty/aws-guardduty-threatintelset.go
rename to pkg/goformation/cloudformation/guardduty/aws-guardduty-threatintelset.go
index 5be55597f1..9b20d53ebf 100644
--- a/goformation/cloudformation/guardduty/aws-guardduty-threatintelset.go
+++ b/pkg/goformation/cloudformation/guardduty/aws-guardduty-threatintelset.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ThreatIntelSet AWS CloudFormation Resource (AWS::GuardDuty::ThreatIntelSet)
diff --git a/goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore.go b/pkg/goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore.go
similarity index 95%
rename from goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore.go
rename to pkg/goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore.go
index 468731166e..2e10d32b4f 100644
--- a/goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore.go
+++ b/pkg/goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FHIRDatastore AWS CloudFormation Resource (AWS::HealthLake::FHIRDatastore)
diff --git a/goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore_kmsencryptionconfig.go b/pkg/goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore_kmsencryptionconfig.go
similarity index 93%
rename from goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore_kmsencryptionconfig.go
rename to pkg/goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore_kmsencryptionconfig.go
index 8b735c1f97..6384f0bd50 100644
--- a/goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore_kmsencryptionconfig.go
+++ b/pkg/goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore_kmsencryptionconfig.go
@@ -1,9 +1,9 @@
 package healthlake
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FHIRDatastore_KmsEncryptionConfig AWS CloudFormation Resource (AWS::HealthLake::FHIRDatastore.KmsEncryptionConfig)
diff --git a/goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore_preloaddataconfig.go b/pkg/goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore_preloaddataconfig.go
similarity index 92%
rename from goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore_preloaddataconfig.go
rename to pkg/goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore_preloaddataconfig.go
index 88852bcf5d..1ff7052e3f 100644
--- a/goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore_preloaddataconfig.go
+++ b/pkg/goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore_preloaddataconfig.go
@@ -1,9 +1,9 @@
 package healthlake
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FHIRDatastore_PreloadDataConfig AWS CloudFormation Resource (AWS::HealthLake::FHIRDatastore.PreloadDataConfig)
diff --git a/goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore_sseconfiguration.go b/pkg/goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore_sseconfiguration.go
similarity index 95%
rename from goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore_sseconfiguration.go
rename to pkg/goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore_sseconfiguration.go
index 2d4bd24a08..ccc6fd1500 100644
--- a/goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore_sseconfiguration.go
+++ b/pkg/goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore_sseconfiguration.go
@@ -1,7 +1,7 @@
 package healthlake
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FHIRDatastore_SseConfiguration AWS CloudFormation Resource (AWS::HealthLake::FHIRDatastore.SseConfiguration)
diff --git a/goformation/cloudformation/iam/aws-iam-accesskey.go b/pkg/goformation/cloudformation/iam/aws-iam-accesskey.go
similarity index 96%
rename from goformation/cloudformation/iam/aws-iam-accesskey.go
rename to pkg/goformation/cloudformation/iam/aws-iam-accesskey.go
index 9a63946ed5..618fa1bf57 100644
--- a/goformation/cloudformation/iam/aws-iam-accesskey.go
+++ b/pkg/goformation/cloudformation/iam/aws-iam-accesskey.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AccessKey AWS CloudFormation Resource (AWS::IAM::AccessKey)
diff --git a/goformation/cloudformation/iam/aws-iam-group.go b/pkg/goformation/cloudformation/iam/aws-iam-group.go
similarity index 96%
rename from goformation/cloudformation/iam/aws-iam-group.go
rename to pkg/goformation/cloudformation/iam/aws-iam-group.go
index c4c4ce431f..3ce1cbd1aa 100644
--- a/goformation/cloudformation/iam/aws-iam-group.go
+++ b/pkg/goformation/cloudformation/iam/aws-iam-group.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Group AWS CloudFormation Resource (AWS::IAM::Group)
diff --git a/goformation/cloudformation/iam/aws-iam-group_policy.go b/pkg/goformation/cloudformation/iam/aws-iam-group_policy.go
similarity index 92%
rename from goformation/cloudformation/iam/aws-iam-group_policy.go
rename to pkg/goformation/cloudformation/iam/aws-iam-group_policy.go
index 08726b9be0..7bb7c6c251 100644
--- a/goformation/cloudformation/iam/aws-iam-group_policy.go
+++ b/pkg/goformation/cloudformation/iam/aws-iam-group_policy.go
@@ -1,9 +1,9 @@
 package iam
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Group_Policy AWS CloudFormation Resource (AWS::IAM::Group.Policy)
diff --git a/goformation/cloudformation/iam/aws-iam-instanceprofile.go b/pkg/goformation/cloudformation/iam/aws-iam-instanceprofile.go
similarity index 96%
rename from goformation/cloudformation/iam/aws-iam-instanceprofile.go
rename to pkg/goformation/cloudformation/iam/aws-iam-instanceprofile.go
index d7393d52c7..432dc47d58 100644
--- a/goformation/cloudformation/iam/aws-iam-instanceprofile.go
+++ b/pkg/goformation/cloudformation/iam/aws-iam-instanceprofile.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InstanceProfile AWS CloudFormation Resource (AWS::IAM::InstanceProfile)
diff --git a/goformation/cloudformation/iam/aws-iam-managedpolicy.go b/pkg/goformation/cloudformation/iam/aws-iam-managedpolicy.go
similarity index 97%
rename from goformation/cloudformation/iam/aws-iam-managedpolicy.go
rename to pkg/goformation/cloudformation/iam/aws-iam-managedpolicy.go
index 4f95fb7a90..b1786eb790 100644
--- a/goformation/cloudformation/iam/aws-iam-managedpolicy.go
+++ b/pkg/goformation/cloudformation/iam/aws-iam-managedpolicy.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ManagedPolicy AWS CloudFormation Resource (AWS::IAM::ManagedPolicy)
diff --git a/goformation/cloudformation/iam/aws-iam-oidcprovider.go b/pkg/goformation/cloudformation/iam/aws-iam-oidcprovider.go
similarity index 95%
rename from goformation/cloudformation/iam/aws-iam-oidcprovider.go
rename to pkg/goformation/cloudformation/iam/aws-iam-oidcprovider.go
index 0a43e00b22..d08e5239e6 100644
--- a/goformation/cloudformation/iam/aws-iam-oidcprovider.go
+++ b/pkg/goformation/cloudformation/iam/aws-iam-oidcprovider.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // OIDCProvider AWS CloudFormation Resource (AWS::IAM::OIDCProvider)
diff --git a/goformation/cloudformation/iam/aws-iam-policy.go b/pkg/goformation/cloudformation/iam/aws-iam-policy.go
similarity index 97%
rename from goformation/cloudformation/iam/aws-iam-policy.go
rename to pkg/goformation/cloudformation/iam/aws-iam-policy.go
index 9416c6a592..9da3d85633 100644
--- a/goformation/cloudformation/iam/aws-iam-policy.go
+++ b/pkg/goformation/cloudformation/iam/aws-iam-policy.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Policy AWS CloudFormation Resource (AWS::IAM::Policy)
diff --git a/goformation/cloudformation/iam/aws-iam-role.go b/pkg/goformation/cloudformation/iam/aws-iam-role.go
similarity index 96%
rename from goformation/cloudformation/iam/aws-iam-role.go
rename to pkg/goformation/cloudformation/iam/aws-iam-role.go
index af9f3d4a19..7f88805ce4 100644
--- a/goformation/cloudformation/iam/aws-iam-role.go
+++ b/pkg/goformation/cloudformation/iam/aws-iam-role.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Role AWS CloudFormation Resource (AWS::IAM::Role)
diff --git a/goformation/cloudformation/iam/aws-iam-role_policy.go b/pkg/goformation/cloudformation/iam/aws-iam-role_policy.go
similarity index 92%
rename from goformation/cloudformation/iam/aws-iam-role_policy.go
rename to pkg/goformation/cloudformation/iam/aws-iam-role_policy.go
index 61209fd1f7..9873e10799 100644
--- a/goformation/cloudformation/iam/aws-iam-role_policy.go
+++ b/pkg/goformation/cloudformation/iam/aws-iam-role_policy.go
@@ -1,9 +1,9 @@
 package iam
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Role_Policy AWS CloudFormation Resource (AWS::IAM::Role.Policy)
diff --git a/goformation/cloudformation/iam/aws-iam-samlprovider.go b/pkg/goformation/cloudformation/iam/aws-iam-samlprovider.go
similarity index 95%
rename from goformation/cloudformation/iam/aws-iam-samlprovider.go
rename to pkg/goformation/cloudformation/iam/aws-iam-samlprovider.go
index 1fc55fd532..36bed69671 100644
--- a/goformation/cloudformation/iam/aws-iam-samlprovider.go
+++ b/pkg/goformation/cloudformation/iam/aws-iam-samlprovider.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SAMLProvider AWS CloudFormation Resource (AWS::IAM::SAMLProvider)
diff --git a/goformation/cloudformation/iam/aws-iam-servercertificate.go b/pkg/goformation/cloudformation/iam/aws-iam-servercertificate.go
similarity index 96%
rename from goformation/cloudformation/iam/aws-iam-servercertificate.go
rename to pkg/goformation/cloudformation/iam/aws-iam-servercertificate.go
index 8bb2b05a2b..fb3dabd60e 100644
--- a/goformation/cloudformation/iam/aws-iam-servercertificate.go
+++ b/pkg/goformation/cloudformation/iam/aws-iam-servercertificate.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ServerCertificate AWS CloudFormation Resource (AWS::IAM::ServerCertificate)
diff --git a/goformation/cloudformation/iam/aws-iam-servicelinkedrole.go b/pkg/goformation/cloudformation/iam/aws-iam-servicelinkedrole.go
similarity index 96%
rename from goformation/cloudformation/iam/aws-iam-servicelinkedrole.go
rename to pkg/goformation/cloudformation/iam/aws-iam-servicelinkedrole.go
index 0e5ae00df3..67e78dd673 100644
--- a/goformation/cloudformation/iam/aws-iam-servicelinkedrole.go
+++ b/pkg/goformation/cloudformation/iam/aws-iam-servicelinkedrole.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ServiceLinkedRole AWS CloudFormation Resource (AWS::IAM::ServiceLinkedRole)
diff --git a/goformation/cloudformation/iam/aws-iam-user.go b/pkg/goformation/cloudformation/iam/aws-iam-user.go
similarity index 96%
rename from goformation/cloudformation/iam/aws-iam-user.go
rename to pkg/goformation/cloudformation/iam/aws-iam-user.go
index e3fd14ff60..40669f52c1 100644
--- a/goformation/cloudformation/iam/aws-iam-user.go
+++ b/pkg/goformation/cloudformation/iam/aws-iam-user.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // User AWS CloudFormation Resource (AWS::IAM::User)
diff --git a/goformation/cloudformation/iam/aws-iam-user_loginprofile.go b/pkg/goformation/cloudformation/iam/aws-iam-user_loginprofile.go
similarity index 92%
rename from goformation/cloudformation/iam/aws-iam-user_loginprofile.go
rename to pkg/goformation/cloudformation/iam/aws-iam-user_loginprofile.go
index d7c3abd3b0..7b7d891584 100644
--- a/goformation/cloudformation/iam/aws-iam-user_loginprofile.go
+++ b/pkg/goformation/cloudformation/iam/aws-iam-user_loginprofile.go
@@ -1,9 +1,9 @@
 package iam
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // User_LoginProfile AWS CloudFormation Resource (AWS::IAM::User.LoginProfile)
diff --git a/goformation/cloudformation/iam/aws-iam-user_policy.go b/pkg/goformation/cloudformation/iam/aws-iam-user_policy.go
similarity index 92%
rename from goformation/cloudformation/iam/aws-iam-user_policy.go
rename to pkg/goformation/cloudformation/iam/aws-iam-user_policy.go
index f2dec4111c..543008f879 100644
--- a/goformation/cloudformation/iam/aws-iam-user_policy.go
+++ b/pkg/goformation/cloudformation/iam/aws-iam-user_policy.go
@@ -1,9 +1,9 @@
 package iam
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // User_Policy AWS CloudFormation Resource (AWS::IAM::User.Policy)
diff --git a/goformation/cloudformation/iam/aws-iam-usertogroupaddition.go b/pkg/goformation/cloudformation/iam/aws-iam-usertogroupaddition.go
similarity index 96%
rename from goformation/cloudformation/iam/aws-iam-usertogroupaddition.go
rename to pkg/goformation/cloudformation/iam/aws-iam-usertogroupaddition.go
index 463ea0aba7..cacf9413a7 100644
--- a/goformation/cloudformation/iam/aws-iam-usertogroupaddition.go
+++ b/pkg/goformation/cloudformation/iam/aws-iam-usertogroupaddition.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserToGroupAddition AWS CloudFormation Resource (AWS::IAM::UserToGroupAddition)
diff --git a/goformation/cloudformation/iam/aws-iam-virtualmfadevice.go b/pkg/goformation/cloudformation/iam/aws-iam-virtualmfadevice.go
similarity index 95%
rename from goformation/cloudformation/iam/aws-iam-virtualmfadevice.go
rename to pkg/goformation/cloudformation/iam/aws-iam-virtualmfadevice.go
index da9a7215b7..337b35da8e 100644
--- a/goformation/cloudformation/iam/aws-iam-virtualmfadevice.go
+++ b/pkg/goformation/cloudformation/iam/aws-iam-virtualmfadevice.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VirtualMFADevice AWS CloudFormation Resource (AWS::IAM::VirtualMFADevice)
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-component.go b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-component.go
similarity index 97%
rename from goformation/cloudformation/imagebuilder/aws-imagebuilder-component.go
rename to pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-component.go
index ff604330f1..f29ea8e191 100644
--- a/goformation/cloudformation/imagebuilder/aws-imagebuilder-component.go
+++ b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-component.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Component AWS CloudFormation Resource (AWS::ImageBuilder::Component)
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe.go b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe.go
similarity index 98%
rename from goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe.go
rename to pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe.go
index 4af5c23bef..100d434892 100644
--- a/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe.go
+++ b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ContainerRecipe AWS CloudFormation Resource (AWS::ImageBuilder::ContainerRecipe)
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_componentconfiguration.go b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_componentconfiguration.go
similarity index 92%
rename from goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_componentconfiguration.go
rename to pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_componentconfiguration.go
index f58e1d1456..92d6c93b3e 100644
--- a/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_componentconfiguration.go
+++ b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_componentconfiguration.go
@@ -1,9 +1,9 @@
 package imagebuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ContainerRecipe_ComponentConfiguration AWS CloudFormation Resource (AWS::ImageBuilder::ContainerRecipe.ComponentConfiguration)
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_ebsinstanceblockdevicespecification.go b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_ebsinstanceblockdevicespecification.go
similarity index 96%
rename from goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_ebsinstanceblockdevicespecification.go
rename to pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_ebsinstanceblockdevicespecification.go
index 3a363dd8cd..9ed0f35ad9 100644
--- a/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_ebsinstanceblockdevicespecification.go
+++ b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_ebsinstanceblockdevicespecification.go
@@ -1,9 +1,9 @@
 package imagebuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ContainerRecipe_EbsInstanceBlockDeviceSpecification AWS CloudFormation Resource (AWS::ImageBuilder::ContainerRecipe.EbsInstanceBlockDeviceSpecification)
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_instanceblockdevicemapping.go b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_instanceblockdevicemapping.go
similarity index 95%
rename from goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_instanceblockdevicemapping.go
rename to pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_instanceblockdevicemapping.go
index bee09ea090..930a9da483 100644
--- a/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_instanceblockdevicemapping.go
+++ b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_instanceblockdevicemapping.go
@@ -1,9 +1,9 @@
 package imagebuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ContainerRecipe_InstanceBlockDeviceMapping AWS CloudFormation Resource (AWS::ImageBuilder::ContainerRecipe.InstanceBlockDeviceMapping)
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_instanceconfiguration.go b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_instanceconfiguration.go
similarity index 93%
rename from goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_instanceconfiguration.go
rename to pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_instanceconfiguration.go
index ae1a13fc40..b1d62812c4 100644
--- a/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_instanceconfiguration.go
+++ b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_instanceconfiguration.go
@@ -1,9 +1,9 @@
 package imagebuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ContainerRecipe_InstanceConfiguration AWS CloudFormation Resource (AWS::ImageBuilder::ContainerRecipe.InstanceConfiguration)
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_targetcontainerrepository.go b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_targetcontainerrepository.go
similarity index 93%
rename from goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_targetcontainerrepository.go
rename to pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_targetcontainerrepository.go
index 5d57e1cf8e..0437a30687 100644
--- a/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_targetcontainerrepository.go
+++ b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_targetcontainerrepository.go
@@ -1,9 +1,9 @@
 package imagebuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ContainerRecipe_TargetContainerRepository AWS CloudFormation Resource (AWS::ImageBuilder::ContainerRecipe.TargetContainerRepository)
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration.go b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration.go
similarity index 97%
rename from goformation/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration.go
rename to pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration.go
index 49d78ef32a..25b8c7b93f 100644
--- a/goformation/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration.go
+++ b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DistributionConfiguration AWS CloudFormation Resource (AWS::ImageBuilder::DistributionConfiguration)
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration_distribution.go b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration_distribution.go
similarity index 95%
rename from goformation/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration_distribution.go
rename to pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration_distribution.go
index 81cf356708..9323e7e4d8 100644
--- a/goformation/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration_distribution.go
+++ b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration_distribution.go
@@ -1,9 +1,9 @@
 package imagebuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DistributionConfiguration_Distribution AWS CloudFormation Resource (AWS::ImageBuilder::DistributionConfiguration.Distribution)
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration_launchtemplateconfiguration.go b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration_launchtemplateconfiguration.go
similarity index 94%
rename from goformation/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration_launchtemplateconfiguration.go
rename to pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration_launchtemplateconfiguration.go
index 65441ef634..c58beaea7c 100644
--- a/goformation/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration_launchtemplateconfiguration.go
+++ b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration_launchtemplateconfiguration.go
@@ -1,9 +1,9 @@
 package imagebuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DistributionConfiguration_LaunchTemplateConfiguration AWS CloudFormation Resource (AWS::ImageBuilder::DistributionConfiguration.LaunchTemplateConfiguration)
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-image.go b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-image.go
similarity index 97%
rename from goformation/cloudformation/imagebuilder/aws-imagebuilder-image.go
rename to pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-image.go
index 94e017dd33..274af535aa 100644
--- a/goformation/cloudformation/imagebuilder/aws-imagebuilder-image.go
+++ b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-image.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Image AWS CloudFormation Resource (AWS::ImageBuilder::Image)
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-image_imagetestsconfiguration.go b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-image_imagetestsconfiguration.go
similarity index 93%
rename from goformation/cloudformation/imagebuilder/aws-imagebuilder-image_imagetestsconfiguration.go
rename to pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-image_imagetestsconfiguration.go
index a0d07fece6..a99234baa4 100644
--- a/goformation/cloudformation/imagebuilder/aws-imagebuilder-image_imagetestsconfiguration.go
+++ b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-image_imagetestsconfiguration.go
@@ -1,9 +1,9 @@
 package imagebuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Image_ImageTestsConfiguration AWS CloudFormation Resource (AWS::ImageBuilder::Image.ImageTestsConfiguration)
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline.go b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline.go
similarity index 98%
rename from goformation/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline.go
rename to pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline.go
index 51a6edf137..dff384fd1b 100644
--- a/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline.go
+++ b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ImagePipeline AWS CloudFormation Resource (AWS::ImageBuilder::ImagePipeline)
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline_imagetestsconfiguration.go b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline_imagetestsconfiguration.go
similarity index 93%
rename from goformation/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline_imagetestsconfiguration.go
rename to pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline_imagetestsconfiguration.go
index d0c436f973..49173259a3 100644
--- a/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline_imagetestsconfiguration.go
+++ b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline_imagetestsconfiguration.go
@@ -1,9 +1,9 @@
 package imagebuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ImagePipeline_ImageTestsConfiguration AWS CloudFormation Resource (AWS::ImageBuilder::ImagePipeline.ImageTestsConfiguration)
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline_schedule.go b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline_schedule.go
similarity index 93%
rename from goformation/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline_schedule.go
rename to pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline_schedule.go
index 41cbc932cf..3844194479 100644
--- a/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline_schedule.go
+++ b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline_schedule.go
@@ -1,9 +1,9 @@
 package imagebuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ImagePipeline_Schedule AWS CloudFormation Resource (AWS::ImageBuilder::ImagePipeline.Schedule)
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe.go b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe.go
similarity index 97%
rename from goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe.go
rename to pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe.go
index bd366fab63..055ea70183 100644
--- a/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe.go
+++ b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ImageRecipe AWS CloudFormation Resource (AWS::ImageBuilder::ImageRecipe)
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_additionalinstanceconfiguration.go b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_additionalinstanceconfiguration.go
similarity index 93%
rename from goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_additionalinstanceconfiguration.go
rename to pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_additionalinstanceconfiguration.go
index ebfe47cda4..d20fb7525f 100644
--- a/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_additionalinstanceconfiguration.go
+++ b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_additionalinstanceconfiguration.go
@@ -1,9 +1,9 @@
 package imagebuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ImageRecipe_AdditionalInstanceConfiguration AWS CloudFormation Resource (AWS::ImageBuilder::ImageRecipe.AdditionalInstanceConfiguration)
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_componentconfiguration.go b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_componentconfiguration.go
similarity index 93%
rename from goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_componentconfiguration.go
rename to pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_componentconfiguration.go
index 96212e199a..86cf0fd183 100644
--- a/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_componentconfiguration.go
+++ b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_componentconfiguration.go
@@ -1,9 +1,9 @@
 package imagebuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ImageRecipe_ComponentConfiguration AWS CloudFormation Resource (AWS::ImageBuilder::ImageRecipe.ComponentConfiguration)
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_componentparameter.go b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_componentparameter.go
similarity index 93%
rename from goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_componentparameter.go
rename to pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_componentparameter.go
index 1da0c2eea1..f821ff047f 100644
--- a/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_componentparameter.go
+++ b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_componentparameter.go
@@ -1,9 +1,9 @@
 package imagebuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ImageRecipe_ComponentParameter AWS CloudFormation Resource (AWS::ImageBuilder::ImageRecipe.ComponentParameter)
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_ebsinstanceblockdevicespecification.go b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_ebsinstanceblockdevicespecification.go
similarity index 96%
rename from goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_ebsinstanceblockdevicespecification.go
rename to pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_ebsinstanceblockdevicespecification.go
index 74187dbc42..0d68b15e38 100644
--- a/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_ebsinstanceblockdevicespecification.go
+++ b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_ebsinstanceblockdevicespecification.go
@@ -1,9 +1,9 @@
 package imagebuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ImageRecipe_EbsInstanceBlockDeviceSpecification AWS CloudFormation Resource (AWS::ImageBuilder::ImageRecipe.EbsInstanceBlockDeviceSpecification)
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_instanceblockdevicemapping.go b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_instanceblockdevicemapping.go
similarity index 95%
rename from goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_instanceblockdevicemapping.go
rename to pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_instanceblockdevicemapping.go
index 5d14c6b411..8235b20e02 100644
--- a/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_instanceblockdevicemapping.go
+++ b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_instanceblockdevicemapping.go
@@ -1,9 +1,9 @@
 package imagebuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ImageRecipe_InstanceBlockDeviceMapping AWS CloudFormation Resource (AWS::ImageBuilder::ImageRecipe.InstanceBlockDeviceMapping)
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_systemsmanageragent.go b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_systemsmanageragent.go
similarity index 92%
rename from goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_systemsmanageragent.go
rename to pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_systemsmanageragent.go
index b0f4727ecd..3b2e9388a6 100644
--- a/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_systemsmanageragent.go
+++ b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_systemsmanageragent.go
@@ -1,9 +1,9 @@
 package imagebuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ImageRecipe_SystemsManagerAgent AWS CloudFormation Resource (AWS::ImageBuilder::ImageRecipe.SystemsManagerAgent)
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration.go b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration.go
similarity index 98%
rename from goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration.go
rename to pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration.go
index a91f6ecd76..014b7e2e5a 100644
--- a/goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration.go
+++ b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InfrastructureConfiguration AWS CloudFormation Resource (AWS::ImageBuilder::InfrastructureConfiguration)
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_instancemetadataoptions.go b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_instancemetadataoptions.go
similarity index 94%
rename from goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_instancemetadataoptions.go
rename to pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_instancemetadataoptions.go
index 3334bf8453..48990e15e0 100644
--- a/goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_instancemetadataoptions.go
+++ b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_instancemetadataoptions.go
@@ -1,9 +1,9 @@
 package imagebuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InfrastructureConfiguration_InstanceMetadataOptions AWS CloudFormation Resource (AWS::ImageBuilder::InfrastructureConfiguration.InstanceMetadataOptions)
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_logging.go b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_logging.go
similarity index 95%
rename from goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_logging.go
rename to pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_logging.go
index e43a7059cf..9ae267f3f2 100644
--- a/goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_logging.go
+++ b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_logging.go
@@ -1,7 +1,7 @@
 package imagebuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InfrastructureConfiguration_Logging AWS CloudFormation Resource (AWS::ImageBuilder::InfrastructureConfiguration.Logging)
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_s3logs.go b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_s3logs.go
similarity index 93%
rename from goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_s3logs.go
rename to pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_s3logs.go
index 24e520f5b4..a8f62c9205 100644
--- a/goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_s3logs.go
+++ b/pkg/goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_s3logs.go
@@ -1,9 +1,9 @@
 package imagebuilder
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InfrastructureConfiguration_S3Logs AWS CloudFormation Resource (AWS::ImageBuilder::InfrastructureConfiguration.S3Logs)
diff --git a/goformation/cloudformation/inspector/aws-inspector-assessmenttarget.go b/pkg/goformation/cloudformation/inspector/aws-inspector-assessmenttarget.go
similarity index 96%
rename from goformation/cloudformation/inspector/aws-inspector-assessmenttarget.go
rename to pkg/goformation/cloudformation/inspector/aws-inspector-assessmenttarget.go
index 2646380484..3ac5724e62 100644
--- a/goformation/cloudformation/inspector/aws-inspector-assessmenttarget.go
+++ b/pkg/goformation/cloudformation/inspector/aws-inspector-assessmenttarget.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AssessmentTarget AWS CloudFormation Resource (AWS::Inspector::AssessmentTarget)
diff --git a/goformation/cloudformation/inspector/aws-inspector-assessmenttemplate.go b/pkg/goformation/cloudformation/inspector/aws-inspector-assessmenttemplate.go
similarity index 96%
rename from goformation/cloudformation/inspector/aws-inspector-assessmenttemplate.go
rename to pkg/goformation/cloudformation/inspector/aws-inspector-assessmenttemplate.go
index 75a503b14a..ab3b51db82 100644
--- a/goformation/cloudformation/inspector/aws-inspector-assessmenttemplate.go
+++ b/pkg/goformation/cloudformation/inspector/aws-inspector-assessmenttemplate.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AssessmentTemplate AWS CloudFormation Resource (AWS::Inspector::AssessmentTemplate)
diff --git a/goformation/cloudformation/inspector/aws-inspector-resourcegroup.go b/pkg/goformation/cloudformation/inspector/aws-inspector-resourcegroup.go
similarity index 96%
rename from goformation/cloudformation/inspector/aws-inspector-resourcegroup.go
rename to pkg/goformation/cloudformation/inspector/aws-inspector-resourcegroup.go
index ce30a41025..a49f074ab4 100644
--- a/goformation/cloudformation/inspector/aws-inspector-resourcegroup.go
+++ b/pkg/goformation/cloudformation/inspector/aws-inspector-resourcegroup.go
@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceGroup AWS CloudFormation Resource (AWS::Inspector::ResourceGroup)
diff --git a/goformation/cloudformation/intrinsics.go b/pkg/goformation/cloudformation/intrinsics.go
similarity index 99%
rename from goformation/cloudformation/intrinsics.go
rename to pkg/goformation/cloudformation/intrinsics.go
index f95ce3a426..3e1a7a5db5 100644
--- a/goformation/cloudformation/intrinsics.go
+++ b/pkg/goformation/cloudformation/intrinsics.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/awslabs/goformation/v4/intrinsics"
+	"github.com/weaveworks/eksctl/pkg/goformation/intrinsics"
 )
 
 func strWrap(fn func(interface{}) string) intrinsics.IntrinsicHandler {
diff --git a/goformation/cloudformation/intrinsics_test.go b/pkg/goformation/cloudformation/intrinsics_test.go
similarity index 98%
rename from goformation/cloudformation/intrinsics_test.go
rename to pkg/goformation/cloudformation/intrinsics_test.go
index 71b85a4ba7..f5542055f7 100644
--- a/goformation/cloudformation/intrinsics_test.go
+++ b/pkg/goformation/cloudformation/intrinsics_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/awslabs/goformation/v4"
+	"github.com/weaveworks/eksctl/pkg/goformation"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/goformation/cloudformation/iot/aws-iot-accountauditconfiguration.go b/pkg/goformation/cloudformation/iot/aws-iot-accountauditconfiguration.go
similarity index 97%
rename from goformation/cloudformation/iot/aws-iot-accountauditconfiguration.go
rename to pkg/goformation/cloudformation/iot/aws-iot-accountauditconfiguration.go
index 31d4acb748..d87aad35b0 100644
--- a/goformation/cloudformation/iot/aws-iot-accountauditconfiguration.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-accountauditconfiguration.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AccountAuditConfiguration AWS CloudFormation Resource (AWS::IoT::AccountAuditConfiguration)
diff --git a/goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditcheckconfiguration.go b/pkg/goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditcheckconfiguration.go
similarity index 92%
rename from goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditcheckconfiguration.go
rename to pkg/goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditcheckconfiguration.go
index be3bb9c234..ee1bd1f012 100644
--- a/goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditcheckconfiguration.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditcheckconfiguration.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AccountAuditConfiguration_AuditCheckConfiguration AWS CloudFormation Resource (AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration)
diff --git a/goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditcheckconfigurations.go b/pkg/goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditcheckconfigurations.go
similarity index 99%
rename from goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditcheckconfigurations.go
rename to pkg/goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditcheckconfigurations.go
index 06c77a7594..f451f65364 100644
--- a/goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditcheckconfigurations.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditcheckconfigurations.go
@@ -1,7 +1,7 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AccountAuditConfiguration_AuditCheckConfigurations AWS CloudFormation Resource (AWS::IoT::AccountAuditConfiguration.AuditCheckConfigurations)
diff --git a/goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditnotificationtarget.go b/pkg/goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditnotificationtarget.go
similarity index 94%
rename from goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditnotificationtarget.go
rename to pkg/goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditnotificationtarget.go
index 6aea6cfaa0..3443dfabd2 100644
--- a/goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditnotificationtarget.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditnotificationtarget.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AccountAuditConfiguration_AuditNotificationTarget AWS CloudFormation Resource (AWS::IoT::AccountAuditConfiguration.AuditNotificationTarget)
diff --git a/goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditnotificationtargetconfigurations.go b/pkg/goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditnotificationtargetconfigurations.go
similarity index 96%
rename from goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditnotificationtargetconfigurations.go
rename to pkg/goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditnotificationtargetconfigurations.go
index 173cbdc7f2..3aee1a50c0 100644
--- a/goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditnotificationtargetconfigurations.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditnotificationtargetconfigurations.go
@@ -1,7 +1,7 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AccountAuditConfiguration_AuditNotificationTargetConfigurations AWS CloudFormation Resource (AWS::IoT::AccountAuditConfiguration.AuditNotificationTargetConfigurations)
diff --git a/goformation/cloudformation/iot/aws-iot-authorizer.go b/pkg/goformation/cloudformation/iot/aws-iot-authorizer.go
similarity index 96%
rename from goformation/cloudformation/iot/aws-iot-authorizer.go
rename to pkg/goformation/cloudformation/iot/aws-iot-authorizer.go
index acdd8c22aa..9d62455981 100644
--- a/goformation/cloudformation/iot/aws-iot-authorizer.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-authorizer.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Authorizer AWS CloudFormation Resource (AWS::IoT::Authorizer)
diff --git a/goformation/cloudformation/iot/aws-iot-authorizer_tags.go b/pkg/goformation/cloudformation/iot/aws-iot-authorizer_tags.go
similarity index 95%
rename from goformation/cloudformation/iot/aws-iot-authorizer_tags.go
rename to pkg/goformation/cloudformation/iot/aws-iot-authorizer_tags.go
index e62aeb14d9..198e88c62e 100644
--- a/goformation/cloudformation/iot/aws-iot-authorizer_tags.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-authorizer_tags.go
@@ -1,7 +1,7 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Authorizer_Tags AWS CloudFormation Resource (AWS::IoT::Authorizer.Tags)
diff --git a/goformation/cloudformation/iot/aws-iot-authorizer_tokensigningpublickeys.go b/pkg/goformation/cloudformation/iot/aws-iot-authorizer_tokensigningpublickeys.go
similarity index 94%
rename from goformation/cloudformation/iot/aws-iot-authorizer_tokensigningpublickeys.go
rename to pkg/goformation/cloudformation/iot/aws-iot-authorizer_tokensigningpublickeys.go
index ca80097cd8..3c93202609 100644
--- a/goformation/cloudformation/iot/aws-iot-authorizer_tokensigningpublickeys.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-authorizer_tokensigningpublickeys.go
@@ -1,7 +1,7 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Authorizer_TokenSigningPublicKeys AWS CloudFormation Resource (AWS::IoT::Authorizer.TokenSigningPublicKeys)
diff --git a/goformation/cloudformation/iot/aws-iot-certificate.go b/pkg/goformation/cloudformation/iot/aws-iot-certificate.go
similarity index 97%
rename from goformation/cloudformation/iot/aws-iot-certificate.go
rename to pkg/goformation/cloudformation/iot/aws-iot-certificate.go
index 5717b11f08..1f905d1ad3 100644
--- a/goformation/cloudformation/iot/aws-iot-certificate.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-certificate.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Certificate AWS CloudFormation Resource (AWS::IoT::Certificate)
diff --git a/goformation/cloudformation/iot/aws-iot-custommetric.go b/pkg/goformation/cloudformation/iot/aws-iot-custommetric.go
similarity index 95%
rename from goformation/cloudformation/iot/aws-iot-custommetric.go
rename to pkg/goformation/cloudformation/iot/aws-iot-custommetric.go
index f3165028b1..3cfba7d3ba 100644
--- a/goformation/cloudformation/iot/aws-iot-custommetric.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-custommetric.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CustomMetric AWS CloudFormation Resource (AWS::IoT::CustomMetric)
diff --git a/goformation/cloudformation/iot/aws-iot-dimension.go b/pkg/goformation/cloudformation/iot/aws-iot-dimension.go
similarity index 95%
rename from goformation/cloudformation/iot/aws-iot-dimension.go
rename to pkg/goformation/cloudformation/iot/aws-iot-dimension.go
index 1d4454164e..9a6ea023da 100644
--- a/goformation/cloudformation/iot/aws-iot-dimension.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-dimension.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dimension AWS CloudFormation Resource (AWS::IoT::Dimension)
diff --git a/goformation/cloudformation/iot/aws-iot-domainconfiguration.go b/pkg/goformation/cloudformation/iot/aws-iot-domainconfiguration.go
similarity index 96%
rename from goformation/cloudformation/iot/aws-iot-domainconfiguration.go
rename to pkg/goformation/cloudformation/iot/aws-iot-domainconfiguration.go
index 2279559e88..6a09035b59 100644
--- a/goformation/cloudformation/iot/aws-iot-domainconfiguration.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-domainconfiguration.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DomainConfiguration AWS CloudFormation Resource (AWS::IoT::DomainConfiguration)
diff --git a/goformation/cloudformation/iot/aws-iot-domainconfiguration_authorizerconfig.go b/pkg/goformation/cloudformation/iot/aws-iot-domainconfiguration_authorizerconfig.go
similarity index 93%
rename from goformation/cloudformation/iot/aws-iot-domainconfiguration_authorizerconfig.go
rename to pkg/goformation/cloudformation/iot/aws-iot-domainconfiguration_authorizerconfig.go
index fd7d240192..5a4108410c 100644
--- a/goformation/cloudformation/iot/aws-iot-domainconfiguration_authorizerconfig.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-domainconfiguration_authorizerconfig.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DomainConfiguration_AuthorizerConfig AWS CloudFormation Resource (AWS::IoT::DomainConfiguration.AuthorizerConfig)
diff --git a/goformation/cloudformation/iot/aws-iot-domainconfiguration_servercertificatesummary.go b/pkg/goformation/cloudformation/iot/aws-iot-domainconfiguration_servercertificatesummary.go
similarity index 94%
rename from goformation/cloudformation/iot/aws-iot-domainconfiguration_servercertificatesummary.go
rename to pkg/goformation/cloudformation/iot/aws-iot-domainconfiguration_servercertificatesummary.go
index e73c040020..2cf24402a7 100644
--- a/goformation/cloudformation/iot/aws-iot-domainconfiguration_servercertificatesummary.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-domainconfiguration_servercertificatesummary.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DomainConfiguration_ServerCertificateSummary AWS CloudFormation Resource (AWS::IoT::DomainConfiguration.ServerCertificateSummary)
diff --git a/goformation/cloudformation/iot/aws-iot-domainconfiguration_tags.go b/pkg/goformation/cloudformation/iot/aws-iot-domainconfiguration_tags.go
similarity index 95%
rename from goformation/cloudformation/iot/aws-iot-domainconfiguration_tags.go
rename to pkg/goformation/cloudformation/iot/aws-iot-domainconfiguration_tags.go
index d105258f85..6b85fc51fd 100644
--- a/goformation/cloudformation/iot/aws-iot-domainconfiguration_tags.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-domainconfiguration_tags.go
@@ -1,7 +1,7 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DomainConfiguration_Tags AWS CloudFormation Resource (AWS::IoT::DomainConfiguration.Tags)
diff --git a/goformation/cloudformation/iot/aws-iot-fleetmetric.go b/pkg/goformation/cloudformation/iot/aws-iot-fleetmetric.go
similarity index 96%
rename from goformation/cloudformation/iot/aws-iot-fleetmetric.go
rename to pkg/goformation/cloudformation/iot/aws-iot-fleetmetric.go
index 3729db26f0..a68107174a 100644
--- a/goformation/cloudformation/iot/aws-iot-fleetmetric.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-fleetmetric.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FleetMetric AWS CloudFormation Resource (AWS::IoT::FleetMetric)
diff --git a/goformation/cloudformation/iot/aws-iot-fleetmetric_aggregationtype.go b/pkg/goformation/cloudformation/iot/aws-iot-fleetmetric_aggregationtype.go
similarity index 92%
rename from goformation/cloudformation/iot/aws-iot-fleetmetric_aggregationtype.go
rename to pkg/goformation/cloudformation/iot/aws-iot-fleetmetric_aggregationtype.go
index 9f167049ab..57621842b5 100644
--- a/goformation/cloudformation/iot/aws-iot-fleetmetric_aggregationtype.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-fleetmetric_aggregationtype.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FleetMetric_AggregationType AWS CloudFormation Resource (AWS::IoT::FleetMetric.AggregationType)
diff --git a/goformation/cloudformation/iot/aws-iot-jobtemplate.go b/pkg/goformation/cloudformation/iot/aws-iot-jobtemplate.go
similarity index 96%
rename from goformation/cloudformation/iot/aws-iot-jobtemplate.go
rename to pkg/goformation/cloudformation/iot/aws-iot-jobtemplate.go
index e01b01140e..94d431ce22 100644
--- a/goformation/cloudformation/iot/aws-iot-jobtemplate.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-jobtemplate.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // JobTemplate AWS CloudFormation Resource (AWS::IoT::JobTemplate)
diff --git a/goformation/cloudformation/iot/aws-iot-logging.go b/pkg/goformation/cloudformation/iot/aws-iot-logging.go
similarity index 96%
rename from goformation/cloudformation/iot/aws-iot-logging.go
rename to pkg/goformation/cloudformation/iot/aws-iot-logging.go
index 7aa6ed8bb4..ac4ebd38ec 100644
--- a/goformation/cloudformation/iot/aws-iot-logging.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-logging.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Logging AWS CloudFormation Resource (AWS::IoT::Logging)
diff --git a/goformation/cloudformation/iot/aws-iot-mitigationaction.go b/pkg/goformation/cloudformation/iot/aws-iot-mitigationaction.go
similarity index 95%
rename from goformation/cloudformation/iot/aws-iot-mitigationaction.go
rename to pkg/goformation/cloudformation/iot/aws-iot-mitigationaction.go
index 69305f41d2..373f920791 100644
--- a/goformation/cloudformation/iot/aws-iot-mitigationaction.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-mitigationaction.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MitigationAction AWS CloudFormation Resource (AWS::IoT::MitigationAction)
diff --git a/goformation/cloudformation/iot/aws-iot-mitigationaction_actionparams.go b/pkg/goformation/cloudformation/iot/aws-iot-mitigationaction_actionparams.go
similarity index 98%
rename from goformation/cloudformation/iot/aws-iot-mitigationaction_actionparams.go
rename to pkg/goformation/cloudformation/iot/aws-iot-mitigationaction_actionparams.go
index a1c5a7dba4..2851eb7442 100644
--- a/goformation/cloudformation/iot/aws-iot-mitigationaction_actionparams.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-mitigationaction_actionparams.go
@@ -1,7 +1,7 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MitigationAction_ActionParams AWS CloudFormation Resource (AWS::IoT::MitigationAction.ActionParams)
diff --git a/goformation/cloudformation/iot/aws-iot-mitigationaction_addthingstothinggroupparams.go b/pkg/goformation/cloudformation/iot/aws-iot-mitigationaction_addthingstothinggroupparams.go
similarity index 93%
rename from goformation/cloudformation/iot/aws-iot-mitigationaction_addthingstothinggroupparams.go
rename to pkg/goformation/cloudformation/iot/aws-iot-mitigationaction_addthingstothinggroupparams.go
index 8622f512f0..9d9ab27be3 100644
--- a/goformation/cloudformation/iot/aws-iot-mitigationaction_addthingstothinggroupparams.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-mitigationaction_addthingstothinggroupparams.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MitigationAction_AddThingsToThingGroupParams AWS CloudFormation Resource (AWS::IoT::MitigationAction.AddThingsToThingGroupParams)
diff --git a/goformation/cloudformation/iot/aws-iot-mitigationaction_enableiotloggingparams.go b/pkg/goformation/cloudformation/iot/aws-iot-mitigationaction_enableiotloggingparams.go
similarity index 93%
rename from goformation/cloudformation/iot/aws-iot-mitigationaction_enableiotloggingparams.go
rename to pkg/goformation/cloudformation/iot/aws-iot-mitigationaction_enableiotloggingparams.go
index 26ebb345f1..bdd7c87f28 100644
--- a/goformation/cloudformation/iot/aws-iot-mitigationaction_enableiotloggingparams.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-mitigationaction_enableiotloggingparams.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MitigationAction_EnableIoTLoggingParams AWS CloudFormation Resource (AWS::IoT::MitigationAction.EnableIoTLoggingParams)
diff --git a/goformation/cloudformation/iot/aws-iot-mitigationaction_publishfindingtosnsparams.go b/pkg/goformation/cloudformation/iot/aws-iot-mitigationaction_publishfindingtosnsparams.go
similarity index 92%
rename from goformation/cloudformation/iot/aws-iot-mitigationaction_publishfindingtosnsparams.go
rename to pkg/goformation/cloudformation/iot/aws-iot-mitigationaction_publishfindingtosnsparams.go
index b1efb13835..3b63df9993 100644
--- a/goformation/cloudformation/iot/aws-iot-mitigationaction_publishfindingtosnsparams.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-mitigationaction_publishfindingtosnsparams.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MitigationAction_PublishFindingToSnsParams AWS CloudFormation Resource (AWS::IoT::MitigationAction.PublishFindingToSnsParams)
diff --git a/goformation/cloudformation/iot/aws-iot-mitigationaction_replacedefaultpolicyversionparams.go b/pkg/goformation/cloudformation/iot/aws-iot-mitigationaction_replacedefaultpolicyversionparams.go
similarity index 92%
rename from goformation/cloudformation/iot/aws-iot-mitigationaction_replacedefaultpolicyversionparams.go
rename to pkg/goformation/cloudformation/iot/aws-iot-mitigationaction_replacedefaultpolicyversionparams.go
index 23b5d24886..46652dba5d 100644
--- a/goformation/cloudformation/iot/aws-iot-mitigationaction_replacedefaultpolicyversionparams.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-mitigationaction_replacedefaultpolicyversionparams.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MitigationAction_ReplaceDefaultPolicyVersionParams AWS CloudFormation Resource (AWS::IoT::MitigationAction.ReplaceDefaultPolicyVersionParams)
diff --git a/goformation/cloudformation/iot/aws-iot-mitigationaction_updatecacertificateparams.go b/pkg/goformation/cloudformation/iot/aws-iot-mitigationaction_updatecacertificateparams.go
similarity index 92%
rename from goformation/cloudformation/iot/aws-iot-mitigationaction_updatecacertificateparams.go
rename to pkg/goformation/cloudformation/iot/aws-iot-mitigationaction_updatecacertificateparams.go
index 23421cd858..975360be15 100644
--- a/goformation/cloudformation/iot/aws-iot-mitigationaction_updatecacertificateparams.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-mitigationaction_updatecacertificateparams.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MitigationAction_UpdateCACertificateParams AWS CloudFormation Resource (AWS::IoT::MitigationAction.UpdateCACertificateParams)
diff --git a/goformation/cloudformation/iot/aws-iot-mitigationaction_updatedevicecertificateparams.go b/pkg/goformation/cloudformation/iot/aws-iot-mitigationaction_updatedevicecertificateparams.go
similarity index 92%
rename from goformation/cloudformation/iot/aws-iot-mitigationaction_updatedevicecertificateparams.go
rename to pkg/goformation/cloudformation/iot/aws-iot-mitigationaction_updatedevicecertificateparams.go
index a99eebb695..7e66a95f54 100644
--- a/goformation/cloudformation/iot/aws-iot-mitigationaction_updatedevicecertificateparams.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-mitigationaction_updatedevicecertificateparams.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MitigationAction_UpdateDeviceCertificateParams AWS CloudFormation Resource (AWS::IoT::MitigationAction.UpdateDeviceCertificateParams)
diff --git a/goformation/cloudformation/iot/aws-iot-policy.go b/pkg/goformation/cloudformation/iot/aws-iot-policy.go
similarity index 96%
rename from goformation/cloudformation/iot/aws-iot-policy.go
rename to pkg/goformation/cloudformation/iot/aws-iot-policy.go
index f5a4d256dd..de4123ede7 100644
--- a/goformation/cloudformation/iot/aws-iot-policy.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-policy.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Policy AWS CloudFormation Resource (AWS::IoT::Policy)
diff --git a/goformation/cloudformation/iot/aws-iot-policyprincipalattachment.go b/pkg/goformation/cloudformation/iot/aws-iot-policyprincipalattachment.go
similarity index 96%
rename from goformation/cloudformation/iot/aws-iot-policyprincipalattachment.go
rename to pkg/goformation/cloudformation/iot/aws-iot-policyprincipalattachment.go
index 222b99702f..de775283bc 100644
--- a/goformation/cloudformation/iot/aws-iot-policyprincipalattachment.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-policyprincipalattachment.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PolicyPrincipalAttachment AWS CloudFormation Resource (AWS::IoT::PolicyPrincipalAttachment)
diff --git a/goformation/cloudformation/iot/aws-iot-provisioningtemplate.go b/pkg/goformation/cloudformation/iot/aws-iot-provisioningtemplate.go
similarity index 96%
rename from goformation/cloudformation/iot/aws-iot-provisioningtemplate.go
rename to pkg/goformation/cloudformation/iot/aws-iot-provisioningtemplate.go
index 32af032320..479112d3cd 100644
--- a/goformation/cloudformation/iot/aws-iot-provisioningtemplate.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-provisioningtemplate.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ProvisioningTemplate AWS CloudFormation Resource (AWS::IoT::ProvisioningTemplate)
diff --git a/goformation/cloudformation/iot/aws-iot-provisioningtemplate_provisioninghook.go b/pkg/goformation/cloudformation/iot/aws-iot-provisioningtemplate_provisioninghook.go
similarity index 93%
rename from goformation/cloudformation/iot/aws-iot-provisioningtemplate_provisioninghook.go
rename to pkg/goformation/cloudformation/iot/aws-iot-provisioningtemplate_provisioninghook.go
index ee2ef82444..ee99748e64 100644
--- a/goformation/cloudformation/iot/aws-iot-provisioningtemplate_provisioninghook.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-provisioningtemplate_provisioninghook.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ProvisioningTemplate_ProvisioningHook AWS CloudFormation Resource (AWS::IoT::ProvisioningTemplate.ProvisioningHook)
diff --git a/goformation/cloudformation/iot/aws-iot-provisioningtemplate_tags.go b/pkg/goformation/cloudformation/iot/aws-iot-provisioningtemplate_tags.go
similarity index 95%
rename from goformation/cloudformation/iot/aws-iot-provisioningtemplate_tags.go
rename to pkg/goformation/cloudformation/iot/aws-iot-provisioningtemplate_tags.go
index 48e554e2dc..e648d73870 100644
--- a/goformation/cloudformation/iot/aws-iot-provisioningtemplate_tags.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-provisioningtemplate_tags.go
@@ -1,7 +1,7 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ProvisioningTemplate_Tags AWS CloudFormation Resource (AWS::IoT::ProvisioningTemplate.Tags)
diff --git a/goformation/cloudformation/iot/aws-iot-resourcespecificlogging.go b/pkg/goformation/cloudformation/iot/aws-iot-resourcespecificlogging.go
similarity index 97%
rename from goformation/cloudformation/iot/aws-iot-resourcespecificlogging.go
rename to pkg/goformation/cloudformation/iot/aws-iot-resourcespecificlogging.go
index eae034f4a7..a81ba0bf28 100644
--- a/goformation/cloudformation/iot/aws-iot-resourcespecificlogging.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-resourcespecificlogging.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceSpecificLogging AWS CloudFormation Resource (AWS::IoT::ResourceSpecificLogging)
diff --git a/goformation/cloudformation/iot/aws-iot-scheduledaudit.go b/pkg/goformation/cloudformation/iot/aws-iot-scheduledaudit.go
similarity index 96%
rename from goformation/cloudformation/iot/aws-iot-scheduledaudit.go
rename to pkg/goformation/cloudformation/iot/aws-iot-scheduledaudit.go
index fdbe5a3dc9..2c84988320 100644
--- a/goformation/cloudformation/iot/aws-iot-scheduledaudit.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-scheduledaudit.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScheduledAudit AWS CloudFormation Resource (AWS::IoT::ScheduledAudit)
diff --git a/goformation/cloudformation/iot/aws-iot-securityprofile.go b/pkg/goformation/cloudformation/iot/aws-iot-securityprofile.go
similarity index 96%
rename from goformation/cloudformation/iot/aws-iot-securityprofile.go
rename to pkg/goformation/cloudformation/iot/aws-iot-securityprofile.go
index be89586ba5..7ac7c4f53a 100644
--- a/goformation/cloudformation/iot/aws-iot-securityprofile.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-securityprofile.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SecurityProfile AWS CloudFormation Resource (AWS::IoT::SecurityProfile)
diff --git a/goformation/cloudformation/iot/aws-iot-securityprofile_alerttarget.go b/pkg/goformation/cloudformation/iot/aws-iot-securityprofile_alerttarget.go
similarity index 92%
rename from goformation/cloudformation/iot/aws-iot-securityprofile_alerttarget.go
rename to pkg/goformation/cloudformation/iot/aws-iot-securityprofile_alerttarget.go
index 43f20c8b50..638a215eb0 100644
--- a/goformation/cloudformation/iot/aws-iot-securityprofile_alerttarget.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-securityprofile_alerttarget.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SecurityProfile_AlertTarget AWS CloudFormation Resource (AWS::IoT::SecurityProfile.AlertTarget)
diff --git a/goformation/cloudformation/iot/aws-iot-securityprofile_behavior.go b/pkg/goformation/cloudformation/iot/aws-iot-securityprofile_behavior.go
similarity index 95%
rename from goformation/cloudformation/iot/aws-iot-securityprofile_behavior.go
rename to pkg/goformation/cloudformation/iot/aws-iot-securityprofile_behavior.go
index 5d49bdc44e..02ae60abd8 100644
--- a/goformation/cloudformation/iot/aws-iot-securityprofile_behavior.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-securityprofile_behavior.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SecurityProfile_Behavior AWS CloudFormation Resource (AWS::IoT::SecurityProfile.Behavior)
diff --git a/goformation/cloudformation/iot/aws-iot-securityprofile_behaviorcriteria.go b/pkg/goformation/cloudformation/iot/aws-iot-securityprofile_behaviorcriteria.go
similarity index 96%
rename from goformation/cloudformation/iot/aws-iot-securityprofile_behaviorcriteria.go
rename to pkg/goformation/cloudformation/iot/aws-iot-securityprofile_behaviorcriteria.go
index e4bbef48a1..daac5b5136 100644
--- a/goformation/cloudformation/iot/aws-iot-securityprofile_behaviorcriteria.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-securityprofile_behaviorcriteria.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SecurityProfile_BehaviorCriteria AWS CloudFormation Resource (AWS::IoT::SecurityProfile.BehaviorCriteria)
diff --git a/goformation/cloudformation/iot/aws-iot-securityprofile_machinelearningdetectionconfig.go b/pkg/goformation/cloudformation/iot/aws-iot-securityprofile_machinelearningdetectionconfig.go
similarity index 92%
rename from goformation/cloudformation/iot/aws-iot-securityprofile_machinelearningdetectionconfig.go
rename to pkg/goformation/cloudformation/iot/aws-iot-securityprofile_machinelearningdetectionconfig.go
index 99647f763c..0924cc85e8 100644
--- a/goformation/cloudformation/iot/aws-iot-securityprofile_machinelearningdetectionconfig.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-securityprofile_machinelearningdetectionconfig.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SecurityProfile_MachineLearningDetectionConfig AWS CloudFormation Resource (AWS::IoT::SecurityProfile.MachineLearningDetectionConfig)
diff --git a/goformation/cloudformation/iot/aws-iot-securityprofile_metricdimension.go b/pkg/goformation/cloudformation/iot/aws-iot-securityprofile_metricdimension.go
similarity index 93%
rename from goformation/cloudformation/iot/aws-iot-securityprofile_metricdimension.go
rename to pkg/goformation/cloudformation/iot/aws-iot-securityprofile_metricdimension.go
index 2800b8b98c..9df16cd343 100644
--- a/goformation/cloudformation/iot/aws-iot-securityprofile_metricdimension.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-securityprofile_metricdimension.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SecurityProfile_MetricDimension AWS CloudFormation Resource (AWS::IoT::SecurityProfile.MetricDimension)
diff --git a/goformation/cloudformation/iot/aws-iot-securityprofile_metrictoretain.go b/pkg/goformation/cloudformation/iot/aws-iot-securityprofile_metrictoretain.go
similarity index 93%
rename from goformation/cloudformation/iot/aws-iot-securityprofile_metrictoretain.go
rename to pkg/goformation/cloudformation/iot/aws-iot-securityprofile_metrictoretain.go
index d5b73c4bfc..65b5be36b3 100644
--- a/goformation/cloudformation/iot/aws-iot-securityprofile_metrictoretain.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-securityprofile_metrictoretain.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SecurityProfile_MetricToRetain AWS CloudFormation Resource (AWS::IoT::SecurityProfile.MetricToRetain)
diff --git a/goformation/cloudformation/iot/aws-iot-securityprofile_metricvalue.go b/pkg/goformation/cloudformation/iot/aws-iot-securityprofile_metricvalue.go
similarity index 95%
rename from goformation/cloudformation/iot/aws-iot-securityprofile_metricvalue.go
rename to pkg/goformation/cloudformation/iot/aws-iot-securityprofile_metricvalue.go
index b9f9770a7f..1872d1762f 100644
--- a/goformation/cloudformation/iot/aws-iot-securityprofile_metricvalue.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-securityprofile_metricvalue.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SecurityProfile_MetricValue AWS CloudFormation Resource (AWS::IoT::SecurityProfile.MetricValue)
diff --git a/goformation/cloudformation/iot/aws-iot-securityprofile_statisticalthreshold.go b/pkg/goformation/cloudformation/iot/aws-iot-securityprofile_statisticalthreshold.go
similarity index 92%
rename from goformation/cloudformation/iot/aws-iot-securityprofile_statisticalthreshold.go
rename to pkg/goformation/cloudformation/iot/aws-iot-securityprofile_statisticalthreshold.go
index bea866ef28..b852f3ac6b 100644
--- a/goformation/cloudformation/iot/aws-iot-securityprofile_statisticalthreshold.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-securityprofile_statisticalthreshold.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SecurityProfile_StatisticalThreshold AWS CloudFormation Resource (AWS::IoT::SecurityProfile.StatisticalThreshold)
diff --git a/goformation/cloudformation/iot/aws-iot-thing.go b/pkg/goformation/cloudformation/iot/aws-iot-thing.go
similarity index 96%
rename from goformation/cloudformation/iot/aws-iot-thing.go
rename to pkg/goformation/cloudformation/iot/aws-iot-thing.go
index 4b67f48308..7c750d777d 100644
--- a/goformation/cloudformation/iot/aws-iot-thing.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-thing.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Thing AWS CloudFormation Resource (AWS::IoT::Thing)
diff --git a/goformation/cloudformation/iot/aws-iot-thing_attributepayload.go b/pkg/goformation/cloudformation/iot/aws-iot-thing_attributepayload.go
similarity index 91%
rename from goformation/cloudformation/iot/aws-iot-thing_attributepayload.go
rename to pkg/goformation/cloudformation/iot/aws-iot-thing_attributepayload.go
index 740c028d7a..a85771542a 100644
--- a/goformation/cloudformation/iot/aws-iot-thing_attributepayload.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-thing_attributepayload.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Thing_AttributePayload AWS CloudFormation Resource (AWS::IoT::Thing.AttributePayload)
diff --git a/goformation/cloudformation/iot/aws-iot-thingprincipalattachment.go b/pkg/goformation/cloudformation/iot/aws-iot-thingprincipalattachment.go
similarity index 96%
rename from goformation/cloudformation/iot/aws-iot-thingprincipalattachment.go
rename to pkg/goformation/cloudformation/iot/aws-iot-thingprincipalattachment.go
index b18f7166a8..0590cbe9e2 100644
--- a/goformation/cloudformation/iot/aws-iot-thingprincipalattachment.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-thingprincipalattachment.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ThingPrincipalAttachment AWS CloudFormation Resource (AWS::IoT::ThingPrincipalAttachment)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule.go
similarity index 95%
rename from goformation/cloudformation/iot/aws-iot-topicrule.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule.go
index 6247f7c599..0449033d02 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule AWS CloudFormation Resource (AWS::IoT::TopicRule)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_action.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_action.go
similarity index 98%
rename from goformation/cloudformation/iot/aws-iot-topicrule_action.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_action.go
index c791eb4386..798ad24883 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_action.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_action.go
@@ -1,7 +1,7 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_Action AWS CloudFormation Resource (AWS::IoT::TopicRule.Action)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_assetpropertytimestamp.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_assetpropertytimestamp.go
similarity index 93%
rename from goformation/cloudformation/iot/aws-iot-topicrule_assetpropertytimestamp.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_assetpropertytimestamp.go
index 3fe093bf97..4fc7cfd13a 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_assetpropertytimestamp.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_assetpropertytimestamp.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_AssetPropertyTimestamp AWS CloudFormation Resource (AWS::IoT::TopicRule.AssetPropertyTimestamp)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_assetpropertyvalue.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_assetpropertyvalue.go
similarity index 93%
rename from goformation/cloudformation/iot/aws-iot-topicrule_assetpropertyvalue.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_assetpropertyvalue.go
index 7224345a52..6cb3775ba6 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_assetpropertyvalue.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_assetpropertyvalue.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_AssetPropertyValue AWS CloudFormation Resource (AWS::IoT::TopicRule.AssetPropertyValue)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_assetpropertyvariant.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_assetpropertyvariant.go
similarity index 94%
rename from goformation/cloudformation/iot/aws-iot-topicrule_assetpropertyvariant.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_assetpropertyvariant.go
index 977ba4c4d6..d43298d1de 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_assetpropertyvariant.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_assetpropertyvariant.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_AssetPropertyVariant AWS CloudFormation Resource (AWS::IoT::TopicRule.AssetPropertyVariant)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_cloudwatchalarmaction.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_cloudwatchalarmaction.go
similarity index 94%
rename from goformation/cloudformation/iot/aws-iot-topicrule_cloudwatchalarmaction.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_cloudwatchalarmaction.go
index b0e7e47ec5..7a8db7f85d 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_cloudwatchalarmaction.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_cloudwatchalarmaction.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_CloudwatchAlarmAction AWS CloudFormation Resource (AWS::IoT::TopicRule.CloudwatchAlarmAction)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_cloudwatchlogsaction.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_cloudwatchlogsaction.go
similarity index 92%
rename from goformation/cloudformation/iot/aws-iot-topicrule_cloudwatchlogsaction.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_cloudwatchlogsaction.go
index ad3812e0ad..fec8efd59e 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_cloudwatchlogsaction.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_cloudwatchlogsaction.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_CloudwatchLogsAction AWS CloudFormation Resource (AWS::IoT::TopicRule.CloudwatchLogsAction)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_cloudwatchmetricaction.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_cloudwatchmetricaction.go
similarity index 95%
rename from goformation/cloudformation/iot/aws-iot-topicrule_cloudwatchmetricaction.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_cloudwatchmetricaction.go
index 8f7091f98e..73565ae30d 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_cloudwatchmetricaction.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_cloudwatchmetricaction.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_CloudwatchMetricAction AWS CloudFormation Resource (AWS::IoT::TopicRule.CloudwatchMetricAction)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_dynamodbaction.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_dynamodbaction.go
similarity index 96%
rename from goformation/cloudformation/iot/aws-iot-topicrule_dynamodbaction.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_dynamodbaction.go
index 3d5778eeee..be88a86446 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_dynamodbaction.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_dynamodbaction.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_DynamoDBAction AWS CloudFormation Resource (AWS::IoT::TopicRule.DynamoDBAction)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_dynamodbv2action.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_dynamodbv2action.go
similarity index 92%
rename from goformation/cloudformation/iot/aws-iot-topicrule_dynamodbv2action.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_dynamodbv2action.go
index 59a5467ae8..8c9b52be39 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_dynamodbv2action.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_dynamodbv2action.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_DynamoDBv2Action AWS CloudFormation Resource (AWS::IoT::TopicRule.DynamoDBv2Action)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_elasticsearchaction.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_elasticsearchaction.go
similarity index 94%
rename from goformation/cloudformation/iot/aws-iot-topicrule_elasticsearchaction.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_elasticsearchaction.go
index fb38b7bb09..0a5ff2a62f 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_elasticsearchaction.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_elasticsearchaction.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_ElasticsearchAction AWS CloudFormation Resource (AWS::IoT::TopicRule.ElasticsearchAction)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_firehoseaction.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_firehoseaction.go
similarity index 94%
rename from goformation/cloudformation/iot/aws-iot-topicrule_firehoseaction.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_firehoseaction.go
index 50ec006f3f..a50e437942 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_firehoseaction.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_firehoseaction.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_FirehoseAction AWS CloudFormation Resource (AWS::IoT::TopicRule.FirehoseAction)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_httpaction.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_httpaction.go
similarity index 94%
rename from goformation/cloudformation/iot/aws-iot-topicrule_httpaction.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_httpaction.go
index 9007f26800..01a2c8099d 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_httpaction.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_httpaction.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_HttpAction AWS CloudFormation Resource (AWS::IoT::TopicRule.HttpAction)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_httpactionheader.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_httpactionheader.go
similarity index 92%
rename from goformation/cloudformation/iot/aws-iot-topicrule_httpactionheader.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_httpactionheader.go
index 2c1db1a09f..b1db08bf71 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_httpactionheader.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_httpactionheader.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_HttpActionHeader AWS CloudFormation Resource (AWS::IoT::TopicRule.HttpActionHeader)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_httpauthorization.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_httpauthorization.go
similarity index 95%
rename from goformation/cloudformation/iot/aws-iot-topicrule_httpauthorization.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_httpauthorization.go
index 11c1149f33..2b5ab81666 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_httpauthorization.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_httpauthorization.go
@@ -1,7 +1,7 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_HttpAuthorization AWS CloudFormation Resource (AWS::IoT::TopicRule.HttpAuthorization)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_iotanalyticsaction.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_iotanalyticsaction.go
similarity index 93%
rename from goformation/cloudformation/iot/aws-iot-topicrule_iotanalyticsaction.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_iotanalyticsaction.go
index 8548c59d8a..7bca978234 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_iotanalyticsaction.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_iotanalyticsaction.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_IotAnalyticsAction AWS CloudFormation Resource (AWS::IoT::TopicRule.IotAnalyticsAction)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_ioteventsaction.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_ioteventsaction.go
similarity index 94%
rename from goformation/cloudformation/iot/aws-iot-topicrule_ioteventsaction.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_ioteventsaction.go
index 3a83c8c65d..3658b58f06 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_ioteventsaction.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_ioteventsaction.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_IotEventsAction AWS CloudFormation Resource (AWS::IoT::TopicRule.IotEventsAction)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_iotsitewiseaction.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_iotsitewiseaction.go
similarity index 93%
rename from goformation/cloudformation/iot/aws-iot-topicrule_iotsitewiseaction.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_iotsitewiseaction.go
index 41462943ed..d263c0d20a 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_iotsitewiseaction.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_iotsitewiseaction.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_IotSiteWiseAction AWS CloudFormation Resource (AWS::IoT::TopicRule.IotSiteWiseAction)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_kafkaaction.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_kafkaaction.go
similarity index 94%
rename from goformation/cloudformation/iot/aws-iot-topicrule_kafkaaction.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_kafkaaction.go
index 81ea721768..6f141e9ce6 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_kafkaaction.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_kafkaaction.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_KafkaAction AWS CloudFormation Resource (AWS::IoT::TopicRule.KafkaAction)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_kinesisaction.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_kinesisaction.go
similarity index 93%
rename from goformation/cloudformation/iot/aws-iot-topicrule_kinesisaction.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_kinesisaction.go
index 777f94faf0..2c68d5fac1 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_kinesisaction.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_kinesisaction.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_KinesisAction AWS CloudFormation Resource (AWS::IoT::TopicRule.KinesisAction)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_lambdaaction.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_lambdaaction.go
similarity index 91%
rename from goformation/cloudformation/iot/aws-iot-topicrule_lambdaaction.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_lambdaaction.go
index ac6fd35043..c184451fea 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_lambdaaction.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_lambdaaction.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_LambdaAction AWS CloudFormation Resource (AWS::IoT::TopicRule.LambdaAction)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_opensearchaction.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_opensearchaction.go
similarity index 94%
rename from goformation/cloudformation/iot/aws-iot-topicrule_opensearchaction.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_opensearchaction.go
index b0ff9faf4b..e536e806a8 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_opensearchaction.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_opensearchaction.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_OpenSearchAction AWS CloudFormation Resource (AWS::IoT::TopicRule.OpenSearchAction)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_putassetpropertyvalueentry.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_putassetpropertyvalueentry.go
similarity index 95%
rename from goformation/cloudformation/iot/aws-iot-topicrule_putassetpropertyvalueentry.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_putassetpropertyvalueentry.go
index 2a20ea2626..e3ad7e2bd0 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_putassetpropertyvalueentry.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_putassetpropertyvalueentry.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_PutAssetPropertyValueEntry AWS CloudFormation Resource (AWS::IoT::TopicRule.PutAssetPropertyValueEntry)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_putiteminput.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_putiteminput.go
similarity index 91%
rename from goformation/cloudformation/iot/aws-iot-topicrule_putiteminput.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_putiteminput.go
index ad2bcf035f..428ead304e 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_putiteminput.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_putiteminput.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_PutItemInput AWS CloudFormation Resource (AWS::IoT::TopicRule.PutItemInput)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_republishaction.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_republishaction.go
similarity index 93%
rename from goformation/cloudformation/iot/aws-iot-topicrule_republishaction.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_republishaction.go
index e715f67119..c4a4bf350d 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_republishaction.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_republishaction.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_RepublishAction AWS CloudFormation Resource (AWS::IoT::TopicRule.RepublishAction)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_s3action.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_s3action.go
similarity index 94%
rename from goformation/cloudformation/iot/aws-iot-topicrule_s3action.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_s3action.go
index d5e867729a..7d851822b0 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_s3action.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_s3action.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_S3Action AWS CloudFormation Resource (AWS::IoT::TopicRule.S3Action)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_sigv4authorization.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_sigv4authorization.go
similarity index 93%
rename from goformation/cloudformation/iot/aws-iot-topicrule_sigv4authorization.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_sigv4authorization.go
index e94467e06b..73d2329c42 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_sigv4authorization.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_sigv4authorization.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_SigV4Authorization AWS CloudFormation Resource (AWS::IoT::TopicRule.SigV4Authorization)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_snsaction.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_snsaction.go
similarity index 93%
rename from goformation/cloudformation/iot/aws-iot-topicrule_snsaction.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_snsaction.go
index 14157cfb37..a569c1d3d2 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_snsaction.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_snsaction.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_SnsAction AWS CloudFormation Resource (AWS::IoT::TopicRule.SnsAction)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_sqsaction.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_sqsaction.go
similarity index 93%
rename from goformation/cloudformation/iot/aws-iot-topicrule_sqsaction.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_sqsaction.go
index e672f4ee37..3b0ad5b191 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_sqsaction.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_sqsaction.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_SqsAction AWS CloudFormation Resource (AWS::IoT::TopicRule.SqsAction)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_stepfunctionsaction.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_stepfunctionsaction.go
similarity index 93%
rename from goformation/cloudformation/iot/aws-iot-topicrule_stepfunctionsaction.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_stepfunctionsaction.go
index c9d2958f26..07d9e80290 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_stepfunctionsaction.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_stepfunctionsaction.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_StepFunctionsAction AWS CloudFormation Resource (AWS::IoT::TopicRule.StepFunctionsAction)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_timestreamaction.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_timestreamaction.go
similarity index 95%
rename from goformation/cloudformation/iot/aws-iot-topicrule_timestreamaction.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_timestreamaction.go
index 2ca0b37f2c..caa24aaef6 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_timestreamaction.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_timestreamaction.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_TimestreamAction AWS CloudFormation Resource (AWS::IoT::TopicRule.TimestreamAction)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_timestreamdimension.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_timestreamdimension.go
similarity index 92%
rename from goformation/cloudformation/iot/aws-iot-topicrule_timestreamdimension.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_timestreamdimension.go
index 2a91e9d29d..bdb64772b8 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_timestreamdimension.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_timestreamdimension.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_TimestreamDimension AWS CloudFormation Resource (AWS::IoT::TopicRule.TimestreamDimension)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_timestreamtimestamp.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_timestreamtimestamp.go
similarity index 92%
rename from goformation/cloudformation/iot/aws-iot-topicrule_timestreamtimestamp.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_timestreamtimestamp.go
index 62aa178d20..efbd1db602 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_timestreamtimestamp.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_timestreamtimestamp.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_TimestreamTimestamp AWS CloudFormation Resource (AWS::IoT::TopicRule.TimestreamTimestamp)
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_topicrulepayload.go b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_topicrulepayload.go
similarity index 95%
rename from goformation/cloudformation/iot/aws-iot-topicrule_topicrulepayload.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicrule_topicrulepayload.go
index b942bccde2..aca37cef2d 100644
--- a/goformation/cloudformation/iot/aws-iot-topicrule_topicrulepayload.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicrule_topicrulepayload.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRule_TopicRulePayload AWS CloudFormation Resource (AWS::IoT::TopicRule.TopicRulePayload)
diff --git a/goformation/cloudformation/iot/aws-iot-topicruledestination.go b/pkg/goformation/cloudformation/iot/aws-iot-topicruledestination.go
similarity index 97%
rename from goformation/cloudformation/iot/aws-iot-topicruledestination.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicruledestination.go
index 69e240cb12..44d8812cc8 100644
--- a/goformation/cloudformation/iot/aws-iot-topicruledestination.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicruledestination.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRuleDestination AWS CloudFormation Resource (AWS::IoT::TopicRuleDestination)
diff --git a/goformation/cloudformation/iot/aws-iot-topicruledestination_httpurldestinationsummary.go b/pkg/goformation/cloudformation/iot/aws-iot-topicruledestination_httpurldestinationsummary.go
similarity index 92%
rename from goformation/cloudformation/iot/aws-iot-topicruledestination_httpurldestinationsummary.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicruledestination_httpurldestinationsummary.go
index bb820e3217..c54279b5cf 100644
--- a/goformation/cloudformation/iot/aws-iot-topicruledestination_httpurldestinationsummary.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicruledestination_httpurldestinationsummary.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRuleDestination_HttpUrlDestinationSummary AWS CloudFormation Resource (AWS::IoT::TopicRuleDestination.HttpUrlDestinationSummary)
diff --git a/goformation/cloudformation/iot/aws-iot-topicruledestination_vpcdestinationproperties.go b/pkg/goformation/cloudformation/iot/aws-iot-topicruledestination_vpcdestinationproperties.go
similarity index 94%
rename from goformation/cloudformation/iot/aws-iot-topicruledestination_vpcdestinationproperties.go
rename to pkg/goformation/cloudformation/iot/aws-iot-topicruledestination_vpcdestinationproperties.go
index 2c9256512c..1362967383 100644
--- a/goformation/cloudformation/iot/aws-iot-topicruledestination_vpcdestinationproperties.go
+++ b/pkg/goformation/cloudformation/iot/aws-iot-topicruledestination_vpcdestinationproperties.go
@@ -1,9 +1,9 @@
 package iot
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicRuleDestination_VpcDestinationProperties AWS CloudFormation Resource (AWS::IoT::TopicRuleDestination.VpcDestinationProperties)
diff --git a/goformation/cloudformation/iot1click/aws-iot1click-device.go b/pkg/goformation/cloudformation/iot1click/aws-iot1click-device.go
similarity index 96%
rename from goformation/cloudformation/iot1click/aws-iot1click-device.go
rename to pkg/goformation/cloudformation/iot1click/aws-iot1click-device.go
index 03589612f8..f8d50dee7a 100644
--- a/goformation/cloudformation/iot1click/aws-iot1click-device.go
+++ b/pkg/goformation/cloudformation/iot1click/aws-iot1click-device.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Device AWS CloudFormation Resource (AWS::IoT1Click::Device)
diff --git a/goformation/cloudformation/iot1click/aws-iot1click-placement.go b/pkg/goformation/cloudformation/iot1click/aws-iot1click-placement.go
similarity index 97%
rename from goformation/cloudformation/iot1click/aws-iot1click-placement.go
rename to pkg/goformation/cloudformation/iot1click/aws-iot1click-placement.go
index 170b22760d..3ffa088ca5 100644
--- a/goformation/cloudformation/iot1click/aws-iot1click-placement.go
+++ b/pkg/goformation/cloudformation/iot1click/aws-iot1click-placement.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Placement AWS CloudFormation Resource (AWS::IoT1Click::Placement)
diff --git a/goformation/cloudformation/iot1click/aws-iot1click-project.go b/pkg/goformation/cloudformation/iot1click/aws-iot1click-project.go
similarity index 96%
rename from goformation/cloudformation/iot1click/aws-iot1click-project.go
rename to pkg/goformation/cloudformation/iot1click/aws-iot1click-project.go
index bacaa01a38..1889694ab6 100644
--- a/goformation/cloudformation/iot1click/aws-iot1click-project.go
+++ b/pkg/goformation/cloudformation/iot1click/aws-iot1click-project.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project AWS CloudFormation Resource (AWS::IoT1Click::Project)
diff --git a/goformation/cloudformation/iot1click/aws-iot1click-project_devicetemplate.go b/pkg/goformation/cloudformation/iot1click/aws-iot1click-project_devicetemplate.go
similarity index 92%
rename from goformation/cloudformation/iot1click/aws-iot1click-project_devicetemplate.go
rename to pkg/goformation/cloudformation/iot1click/aws-iot1click-project_devicetemplate.go
index 78e3a78bd7..c8dffd4228 100644
--- a/goformation/cloudformation/iot1click/aws-iot1click-project_devicetemplate.go
+++ b/pkg/goformation/cloudformation/iot1click/aws-iot1click-project_devicetemplate.go
@@ -1,9 +1,9 @@
 package iot1click
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project_DeviceTemplate AWS CloudFormation Resource (AWS::IoT1Click::Project.DeviceTemplate)
diff --git a/goformation/cloudformation/iot1click/aws-iot1click-project_placementtemplate.go b/pkg/goformation/cloudformation/iot1click/aws-iot1click-project_placementtemplate.go
similarity index 96%
rename from goformation/cloudformation/iot1click/aws-iot1click-project_placementtemplate.go
rename to pkg/goformation/cloudformation/iot1click/aws-iot1click-project_placementtemplate.go
index 225ea8fff0..a4455fff09 100644
--- a/goformation/cloudformation/iot1click/aws-iot1click-project_placementtemplate.go
+++ b/pkg/goformation/cloudformation/iot1click/aws-iot1click-project_placementtemplate.go
@@ -1,7 +1,7 @@
 package iot1click
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project_PlacementTemplate AWS CloudFormation Resource (AWS::IoT1Click::Project.PlacementTemplate)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel.go
similarity index 95%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-channel.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel.go
index 21e90cf5e0..85920da499 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel AWS CloudFormation Resource (AWS::IoTAnalytics::Channel)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_channelstorage.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_channelstorage.go
similarity index 96%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_channelstorage.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_channelstorage.go
index 585356140f..12cce377a8 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_channelstorage.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_channelstorage.go
@@ -1,7 +1,7 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_ChannelStorage AWS CloudFormation Resource (AWS::IoTAnalytics::Channel.ChannelStorage)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_customermanageds3.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_customermanageds3.go
similarity index 93%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_customermanageds3.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_customermanageds3.go
index b6d210bb39..082cb28430 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_customermanageds3.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_customermanageds3.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_CustomerManagedS3 AWS CloudFormation Resource (AWS::IoTAnalytics::Channel.CustomerManagedS3)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_retentionperiod.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_retentionperiod.go
similarity index 93%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_retentionperiod.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_retentionperiod.go
index 50e08a4647..b0eabe161b 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_retentionperiod.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_retentionperiod.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_RetentionPeriod AWS CloudFormation Resource (AWS::IoTAnalytics::Channel.RetentionPeriod)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_servicemanageds3.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_servicemanageds3.go
similarity index 94%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_servicemanageds3.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_servicemanageds3.go
index efd8a2a7c1..97b304ea55 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_servicemanageds3.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_servicemanageds3.go
@@ -1,7 +1,7 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_ServiceManagedS3 AWS CloudFormation Resource (AWS::IoTAnalytics::Channel.ServiceManagedS3)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset.go
similarity index 96%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset.go
index 9f776fa8a3..3e761985c8 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_action.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_action.go
similarity index 93%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_action.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_action.go
index 606004ad54..bd9d6aac26 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_action.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_action.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_Action AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.Action)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_containeraction.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_containeraction.go
similarity index 94%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_containeraction.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_containeraction.go
index 776d9abc11..cf4dc0c2dd 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_containeraction.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_containeraction.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_ContainerAction AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.ContainerAction)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentdeliveryrule.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentdeliveryrule.go
similarity index 93%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentdeliveryrule.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentdeliveryrule.go
index 6895db1101..6ca6b752f0 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentdeliveryrule.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentdeliveryrule.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_DatasetContentDeliveryRule AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.DatasetContentDeliveryRule)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentdeliveryruledestination.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentdeliveryruledestination.go
similarity index 96%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentdeliveryruledestination.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentdeliveryruledestination.go
index 77f0831f8f..ff2ceb765b 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentdeliveryruledestination.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentdeliveryruledestination.go
@@ -1,7 +1,7 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_DatasetContentDeliveryRuleDestination AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.DatasetContentDeliveryRuleDestination)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentversionvalue.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentversionvalue.go
similarity index 92%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentversionvalue.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentversionvalue.go
index 9e7d9db2b5..41ca557d95 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentversionvalue.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentversionvalue.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_DatasetContentVersionValue AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.DatasetContentVersionValue)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_deltatime.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_deltatime.go
similarity index 92%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_deltatime.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_deltatime.go
index 51709d89a0..e1bed4d0c6 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_deltatime.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_deltatime.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_DeltaTime AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.DeltaTime)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_deltatimesessionwindowconfiguration.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_deltatimesessionwindowconfiguration.go
similarity index 92%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_deltatimesessionwindowconfiguration.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_deltatimesessionwindowconfiguration.go
index 5e1107992e..43f3b2804c 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_deltatimesessionwindowconfiguration.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_deltatimesessionwindowconfiguration.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_DeltaTimeSessionWindowConfiguration AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.DeltaTimeSessionWindowConfiguration)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_filter.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_filter.go
similarity index 95%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_filter.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_filter.go
index 7327c9e65a..8237c9b783 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_filter.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_filter.go
@@ -1,7 +1,7 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_Filter AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.Filter)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_glueconfiguration.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_glueconfiguration.go
similarity index 93%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_glueconfiguration.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_glueconfiguration.go
index c0a43d5c5d..2b35421629 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_glueconfiguration.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_glueconfiguration.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_GlueConfiguration AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.GlueConfiguration)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_ioteventsdestinationconfiguration.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_ioteventsdestinationconfiguration.go
similarity index 93%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_ioteventsdestinationconfiguration.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_ioteventsdestinationconfiguration.go
index 9ba3847a62..f3ed699d57 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_ioteventsdestinationconfiguration.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_ioteventsdestinationconfiguration.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_IotEventsDestinationConfiguration AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.IotEventsDestinationConfiguration)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_latedatarule.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_latedatarule.go
similarity index 93%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_latedatarule.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_latedatarule.go
index ab258fdb79..22481a2db4 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_latedatarule.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_latedatarule.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_LateDataRule AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.LateDataRule)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_latedataruleconfiguration.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_latedataruleconfiguration.go
similarity index 96%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_latedataruleconfiguration.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_latedataruleconfiguration.go
index 6354670308..7b03577be1 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_latedataruleconfiguration.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_latedataruleconfiguration.go
@@ -1,7 +1,7 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_LateDataRuleConfiguration AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.LateDataRuleConfiguration)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_outputfileurivalue.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_outputfileurivalue.go
similarity index 92%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_outputfileurivalue.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_outputfileurivalue.go
index 1d49aaf83b..22868648bb 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_outputfileurivalue.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_outputfileurivalue.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_OutputFileUriValue AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.OutputFileUriValue)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_queryaction.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_queryaction.go
similarity index 92%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_queryaction.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_queryaction.go
index a8ea6a2ce2..128b422fe1 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_queryaction.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_queryaction.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_QueryAction AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.QueryAction)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_resourceconfiguration.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_resourceconfiguration.go
similarity index 93%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_resourceconfiguration.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_resourceconfiguration.go
index 8a4d3dbb9a..b8f7d40fe2 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_resourceconfiguration.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_resourceconfiguration.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_ResourceConfiguration AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.ResourceConfiguration)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_retentionperiod.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_retentionperiod.go
similarity index 92%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_retentionperiod.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_retentionperiod.go
index a8f71a32dc..a8f90aa265 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_retentionperiod.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_retentionperiod.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_RetentionPeriod AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.RetentionPeriod)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_s3destinationconfiguration.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_s3destinationconfiguration.go
similarity index 94%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_s3destinationconfiguration.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_s3destinationconfiguration.go
index 0fa154b4ca..cf5dd5d684 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_s3destinationconfiguration.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_s3destinationconfiguration.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_S3DestinationConfiguration AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.S3DestinationConfiguration)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_schedule.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_schedule.go
similarity index 91%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_schedule.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_schedule.go
index c5dafcac3a..42af9bb531 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_schedule.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_schedule.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_Schedule AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.Schedule)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_trigger.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_trigger.go
similarity index 96%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_trigger.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_trigger.go
index e0e6719e99..e7d8ed0348 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_trigger.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_trigger.go
@@ -1,7 +1,7 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_Trigger AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.Trigger)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_triggeringdataset.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_triggeringdataset.go
similarity index 91%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_triggeringdataset.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_triggeringdataset.go
index 47d63dedf6..973ed357c8 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_triggeringdataset.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_triggeringdataset.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_TriggeringDataset AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.TriggeringDataset)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_variable.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_variable.go
similarity index 95%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_variable.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_variable.go
index 021c205dad..31c9e83b15 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_variable.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_variable.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_Variable AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.Variable)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_versioningconfiguration.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_versioningconfiguration.go
similarity index 93%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_versioningconfiguration.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_versioningconfiguration.go
index 3681985091..fcb88e9fb6 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_versioningconfiguration.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_versioningconfiguration.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dataset_VersioningConfiguration AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.VersioningConfiguration)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore.go
similarity index 96%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore.go
index 45b750dd32..0ab8dbf346 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Datastore AWS CloudFormation Resource (AWS::IoTAnalytics::Datastore)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_column.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_column.go
similarity index 92%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_column.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_column.go
index 453876c2a8..633dfe9551 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_column.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_column.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Datastore_Column AWS CloudFormation Resource (AWS::IoTAnalytics::Datastore.Column)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_customermanageds3.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_customermanageds3.go
similarity index 93%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_customermanageds3.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_customermanageds3.go
index 8e43c00790..2f9231c7c4 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_customermanageds3.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_customermanageds3.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Datastore_CustomerManagedS3 AWS CloudFormation Resource (AWS::IoTAnalytics::Datastore.CustomerManagedS3)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_customermanageds3storage.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_customermanageds3storage.go
similarity index 93%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_customermanageds3storage.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_customermanageds3storage.go
index ac761bd6c5..42b6aab5ea 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_customermanageds3storage.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_customermanageds3storage.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Datastore_CustomerManagedS3Storage AWS CloudFormation Resource (AWS::IoTAnalytics::Datastore.CustomerManagedS3Storage)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorepartition.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorepartition.go
similarity index 96%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorepartition.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorepartition.go
index 38afd5cfa2..b0a8aa5d84 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorepartition.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorepartition.go
@@ -1,7 +1,7 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Datastore_DatastorePartition AWS CloudFormation Resource (AWS::IoTAnalytics::Datastore.DatastorePartition)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorepartitions.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorepartitions.go
similarity index 95%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorepartitions.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorepartitions.go
index 51f1526e6c..7f7abd81f5 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorepartitions.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorepartitions.go
@@ -1,7 +1,7 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Datastore_DatastorePartitions AWS CloudFormation Resource (AWS::IoTAnalytics::Datastore.DatastorePartitions)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorestorage.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorestorage.go
similarity index 97%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorestorage.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorestorage.go
index c7975e28d0..9fba5b9f77 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorestorage.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorestorage.go
@@ -1,7 +1,7 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Datastore_DatastoreStorage AWS CloudFormation Resource (AWS::IoTAnalytics::Datastore.DatastoreStorage)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_fileformatconfiguration.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_fileformatconfiguration.go
similarity index 96%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_fileformatconfiguration.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_fileformatconfiguration.go
index 50b62036de..0dcfd41783 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_fileformatconfiguration.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_fileformatconfiguration.go
@@ -1,7 +1,7 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Datastore_FileFormatConfiguration AWS CloudFormation Resource (AWS::IoTAnalytics::Datastore.FileFormatConfiguration)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_iotsitewisemultilayerstorage.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_iotsitewisemultilayerstorage.go
similarity index 96%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_iotsitewisemultilayerstorage.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_iotsitewisemultilayerstorage.go
index 7d342e8572..1191ce7f19 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_iotsitewisemultilayerstorage.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_iotsitewisemultilayerstorage.go
@@ -1,7 +1,7 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Datastore_IotSiteWiseMultiLayerStorage AWS CloudFormation Resource (AWS::IoTAnalytics::Datastore.IotSiteWiseMultiLayerStorage)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_jsonconfiguration.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_jsonconfiguration.go
similarity index 94%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_jsonconfiguration.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_jsonconfiguration.go
index c76d356bcb..3f01d423a3 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_jsonconfiguration.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_jsonconfiguration.go
@@ -1,7 +1,7 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Datastore_JsonConfiguration AWS CloudFormation Resource (AWS::IoTAnalytics::Datastore.JsonConfiguration)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_parquetconfiguration.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_parquetconfiguration.go
similarity index 95%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_parquetconfiguration.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_parquetconfiguration.go
index bebfdaa65b..0d5516a671 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_parquetconfiguration.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_parquetconfiguration.go
@@ -1,7 +1,7 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Datastore_ParquetConfiguration AWS CloudFormation Resource (AWS::IoTAnalytics::Datastore.ParquetConfiguration)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_partition.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_partition.go
similarity index 91%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_partition.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_partition.go
index a6d837601f..471b9ddd2e 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_partition.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_partition.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Datastore_Partition AWS CloudFormation Resource (AWS::IoTAnalytics::Datastore.Partition)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_retentionperiod.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_retentionperiod.go
similarity index 93%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_retentionperiod.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_retentionperiod.go
index 7fb0c86a01..bfe637c619 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_retentionperiod.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_retentionperiod.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Datastore_RetentionPeriod AWS CloudFormation Resource (AWS::IoTAnalytics::Datastore.RetentionPeriod)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_schemadefinition.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_schemadefinition.go
similarity index 95%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_schemadefinition.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_schemadefinition.go
index 742d1e059a..d481a79aae 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_schemadefinition.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_schemadefinition.go
@@ -1,7 +1,7 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Datastore_SchemaDefinition AWS CloudFormation Resource (AWS::IoTAnalytics::Datastore.SchemaDefinition)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_servicemanageds3.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_servicemanageds3.go
similarity index 94%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_servicemanageds3.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_servicemanageds3.go
index f40487c4ad..356c13666d 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_servicemanageds3.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_servicemanageds3.go
@@ -1,7 +1,7 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Datastore_ServiceManagedS3 AWS CloudFormation Resource (AWS::IoTAnalytics::Datastore.ServiceManagedS3)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_timestamppartition.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_timestamppartition.go
similarity index 93%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_timestamppartition.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_timestamppartition.go
index 311b5991d7..26a88b14f6 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_timestamppartition.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_timestamppartition.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Datastore_TimestampPartition AWS CloudFormation Resource (AWS::IoTAnalytics::Datastore.TimestampPartition)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline.go
similarity index 95%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline.go
index 93937565c4..1b318ebe4e 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Pipeline AWS CloudFormation Resource (AWS::IoTAnalytics::Pipeline)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_activity.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_activity.go
similarity index 98%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_activity.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_activity.go
index 0431480717..69ff0a520b 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_activity.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_activity.go
@@ -1,7 +1,7 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Pipeline_Activity AWS CloudFormation Resource (AWS::IoTAnalytics::Pipeline.Activity)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_addattributes.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_addattributes.go
similarity index 93%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_addattributes.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_addattributes.go
index c3da4110e0..c27f457fb6 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_addattributes.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_addattributes.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Pipeline_AddAttributes AWS CloudFormation Resource (AWS::IoTAnalytics::Pipeline.AddAttributes)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_channel.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_channel.go
similarity index 93%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_channel.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_channel.go
index 2cf0a146cf..54086044ed 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_channel.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_channel.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Pipeline_Channel AWS CloudFormation Resource (AWS::IoTAnalytics::Pipeline.Channel)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_datastore.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_datastore.go
similarity index 92%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_datastore.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_datastore.go
index aa8b0df368..2b95953cad 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_datastore.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_datastore.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Pipeline_Datastore AWS CloudFormation Resource (AWS::IoTAnalytics::Pipeline.Datastore)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_deviceregistryenrich.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_deviceregistryenrich.go
similarity index 95%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_deviceregistryenrich.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_deviceregistryenrich.go
index 9c4aa23cc8..1fdb6545b4 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_deviceregistryenrich.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_deviceregistryenrich.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Pipeline_DeviceRegistryEnrich AWS CloudFormation Resource (AWS::IoTAnalytics::Pipeline.DeviceRegistryEnrich)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_deviceshadowenrich.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_deviceshadowenrich.go
similarity index 95%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_deviceshadowenrich.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_deviceshadowenrich.go
index eb57491c86..95d627e0fa 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_deviceshadowenrich.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_deviceshadowenrich.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Pipeline_DeviceShadowEnrich AWS CloudFormation Resource (AWS::IoTAnalytics::Pipeline.DeviceShadowEnrich)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_filter.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_filter.go
similarity index 93%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_filter.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_filter.go
index d8fc5bd685..e176a68284 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_filter.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_filter.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Pipeline_Filter AWS CloudFormation Resource (AWS::IoTAnalytics::Pipeline.Filter)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_lambda.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_lambda.go
similarity index 94%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_lambda.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_lambda.go
index e711bbf3cd..43dc5af80d 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_lambda.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_lambda.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Pipeline_Lambda AWS CloudFormation Resource (AWS::IoTAnalytics::Pipeline.Lambda)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_math.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_math.go
similarity index 94%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_math.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_math.go
index f5cd3b9ebc..337b0666b3 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_math.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_math.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Pipeline_Math AWS CloudFormation Resource (AWS::IoTAnalytics::Pipeline.Math)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_removeattributes.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_removeattributes.go
similarity index 93%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_removeattributes.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_removeattributes.go
index d9f0e674fc..d86c49b511 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_removeattributes.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_removeattributes.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Pipeline_RemoveAttributes AWS CloudFormation Resource (AWS::IoTAnalytics::Pipeline.RemoveAttributes)
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_selectattributes.go b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_selectattributes.go
similarity index 93%
rename from goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_selectattributes.go
rename to pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_selectattributes.go
index 39d6ad1187..9576998e7d 100644
--- a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_selectattributes.go
+++ b/pkg/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_selectattributes.go
@@ -1,9 +1,9 @@
 package iotanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Pipeline_SelectAttributes AWS CloudFormation Resource (AWS::IoTAnalytics::Pipeline.SelectAttributes)
diff --git a/goformation/cloudformation/iotcoredeviceadvisor/aws-iotcoredeviceadvisor-suitedefinition.go b/pkg/goformation/cloudformation/iotcoredeviceadvisor/aws-iotcoredeviceadvisor-suitedefinition.go
similarity index 96%
rename from goformation/cloudformation/iotcoredeviceadvisor/aws-iotcoredeviceadvisor-suitedefinition.go
rename to pkg/goformation/cloudformation/iotcoredeviceadvisor/aws-iotcoredeviceadvisor-suitedefinition.go
index cc94b97150..455059e236 100644
--- a/goformation/cloudformation/iotcoredeviceadvisor/aws-iotcoredeviceadvisor-suitedefinition.go
+++ b/pkg/goformation/cloudformation/iotcoredeviceadvisor/aws-iotcoredeviceadvisor-suitedefinition.go
@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SuiteDefinition AWS CloudFormation Resource (AWS::IoTCoreDeviceAdvisor::SuiteDefinition)
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel.go b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel.go
similarity index 96%
rename from goformation/cloudformation/iotevents/aws-iotevents-detectormodel.go
rename to pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel.go
index 6b33229a4d..1a2d3d93f5 100644
--- a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel.go
+++ b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DetectorModel AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel)
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_action.go b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_action.go
similarity index 98%
rename from goformation/cloudformation/iotevents/aws-iotevents-detectormodel_action.go
rename to pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_action.go
index 8173d40aeb..3e3fa8b154 100644
--- a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_action.go
+++ b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_action.go
@@ -1,7 +1,7 @@
 package iotevents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DetectorModel_Action AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.Action)
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertytimestamp.go b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertytimestamp.go
similarity index 93%
rename from goformation/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertytimestamp.go
rename to pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertytimestamp.go
index 19086a4255..50a2125064 100644
--- a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertytimestamp.go
+++ b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertytimestamp.go
@@ -1,9 +1,9 @@
 package iotevents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DetectorModel_AssetPropertyTimestamp AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.AssetPropertyTimestamp)
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertyvalue.go b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertyvalue.go
similarity index 94%
rename from goformation/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertyvalue.go
rename to pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertyvalue.go
index 9e9bb22e46..36fc80fa0a 100644
--- a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertyvalue.go
+++ b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertyvalue.go
@@ -1,9 +1,9 @@
 package iotevents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DetectorModel_AssetPropertyValue AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.AssetPropertyValue)
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertyvariant.go b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertyvariant.go
similarity index 94%
rename from goformation/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertyvariant.go
rename to pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertyvariant.go
index baa6271e5c..92ecad7df8 100644
--- a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertyvariant.go
+++ b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertyvariant.go
@@ -1,9 +1,9 @@
 package iotevents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DetectorModel_AssetPropertyVariant AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.AssetPropertyVariant)
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_cleartimer.go b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_cleartimer.go
similarity index 91%
rename from goformation/cloudformation/iotevents/aws-iotevents-detectormodel_cleartimer.go
rename to pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_cleartimer.go
index 183abdac38..078f26d4e4 100644
--- a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_cleartimer.go
+++ b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_cleartimer.go
@@ -1,9 +1,9 @@
 package iotevents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DetectorModel_ClearTimer AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.ClearTimer)
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_detectormodeldefinition.go b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_detectormodeldefinition.go
similarity index 93%
rename from goformation/cloudformation/iotevents/aws-iotevents-detectormodel_detectormodeldefinition.go
rename to pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_detectormodeldefinition.go
index e1a9af1e57..7b14774fd0 100644
--- a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_detectormodeldefinition.go
+++ b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_detectormodeldefinition.go
@@ -1,9 +1,9 @@
 package iotevents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DetectorModel_DetectorModelDefinition AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.DetectorModelDefinition)
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_dynamodb.go b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_dynamodb.go
similarity index 96%
rename from goformation/cloudformation/iotevents/aws-iotevents-detectormodel_dynamodb.go
rename to pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_dynamodb.go
index 8c85d80157..124d9b60d0 100644
--- a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_dynamodb.go
+++ b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_dynamodb.go
@@ -1,9 +1,9 @@
 package iotevents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DetectorModel_DynamoDB AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.DynamoDB)
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_dynamodbv2.go b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_dynamodbv2.go
similarity index 92%
rename from goformation/cloudformation/iotevents/aws-iotevents-detectormodel_dynamodbv2.go
rename to pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_dynamodbv2.go
index 956b1ea2b7..e32438a926 100644
--- a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_dynamodbv2.go
+++ b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_dynamodbv2.go
@@ -1,9 +1,9 @@
 package iotevents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DetectorModel_DynamoDBv2 AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.DynamoDBv2)
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_event.go b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_event.go
similarity index 93%
rename from goformation/cloudformation/iotevents/aws-iotevents-detectormodel_event.go
rename to pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_event.go
index 21fc756338..d39bf7ff49 100644
--- a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_event.go
+++ b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_event.go
@@ -1,9 +1,9 @@
 package iotevents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DetectorModel_Event AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.Event)
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_firehose.go b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_firehose.go
similarity index 93%
rename from goformation/cloudformation/iotevents/aws-iotevents-detectormodel_firehose.go
rename to pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_firehose.go
index c79cba3dc1..3f8bacef78 100644
--- a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_firehose.go
+++ b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_firehose.go
@@ -1,9 +1,9 @@
 package iotevents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DetectorModel_Firehose AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.Firehose)
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_iotevents.go b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_iotevents.go
similarity index 92%
rename from goformation/cloudformation/iotevents/aws-iotevents-detectormodel_iotevents.go
rename to pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_iotevents.go
index fbf9770bda..d5f67e5b8e 100644
--- a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_iotevents.go
+++ b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_iotevents.go
@@ -1,9 +1,9 @@
 package iotevents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DetectorModel_IotEvents AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.IotEvents)
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_iotsitewise.go b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_iotsitewise.go
similarity index 95%
rename from goformation/cloudformation/iotevents/aws-iotevents-detectormodel_iotsitewise.go
rename to pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_iotsitewise.go
index 4ecba56c6f..c21d3bc409 100644
--- a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_iotsitewise.go
+++ b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_iotsitewise.go
@@ -1,9 +1,9 @@
 package iotevents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DetectorModel_IotSiteWise AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.IotSiteWise)
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_iottopicpublish.go b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_iottopicpublish.go
similarity index 93%
rename from goformation/cloudformation/iotevents/aws-iotevents-detectormodel_iottopicpublish.go
rename to pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_iottopicpublish.go
index ea49a785ab..ebeacfe030 100644
--- a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_iottopicpublish.go
+++ b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_iottopicpublish.go
@@ -1,9 +1,9 @@
 package iotevents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DetectorModel_IotTopicPublish AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.IotTopicPublish)
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_lambda.go b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_lambda.go
similarity index 92%
rename from goformation/cloudformation/iotevents/aws-iotevents-detectormodel_lambda.go
rename to pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_lambda.go
index 31d499e1ac..8c7ac8f98f 100644
--- a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_lambda.go
+++ b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_lambda.go
@@ -1,9 +1,9 @@
 package iotevents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DetectorModel_Lambda AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.Lambda)
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_onenter.go b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_onenter.go
similarity index 95%
rename from goformation/cloudformation/iotevents/aws-iotevents-detectormodel_onenter.go
rename to pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_onenter.go
index 4ef8f68025..6be6b16634 100644
--- a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_onenter.go
+++ b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_onenter.go
@@ -1,7 +1,7 @@
 package iotevents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DetectorModel_OnEnter AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.OnEnter)
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_onexit.go b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_onexit.go
similarity index 95%
rename from goformation/cloudformation/iotevents/aws-iotevents-detectormodel_onexit.go
rename to pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_onexit.go
index 3b9ca8f7f1..7d699ae26c 100644
--- a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_onexit.go
+++ b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_onexit.go
@@ -1,7 +1,7 @@
 package iotevents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DetectorModel_OnExit AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.OnExit)
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_oninput.go b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_oninput.go
similarity index 96%
rename from goformation/cloudformation/iotevents/aws-iotevents-detectormodel_oninput.go
rename to pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_oninput.go
index 6e759d2449..55b90e208c 100644
--- a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_oninput.go
+++ b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_oninput.go
@@ -1,7 +1,7 @@
 package iotevents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DetectorModel_OnInput AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.OnInput)
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_payload.go b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_payload.go
similarity index 92%
rename from goformation/cloudformation/iotevents/aws-iotevents-detectormodel_payload.go
rename to pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_payload.go
index a4e66f97ab..12eaaacbef 100644
--- a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_payload.go
+++ b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_payload.go
@@ -1,9 +1,9 @@
 package iotevents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DetectorModel_Payload AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.Payload)
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_resettimer.go b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_resettimer.go
similarity index 91%
rename from goformation/cloudformation/iotevents/aws-iotevents-detectormodel_resettimer.go
rename to pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_resettimer.go
index 7e641686f4..13aaadd163 100644
--- a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_resettimer.go
+++ b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_resettimer.go
@@ -1,9 +1,9 @@
 package iotevents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DetectorModel_ResetTimer AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.ResetTimer)
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_settimer.go b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_settimer.go
similarity index 93%
rename from goformation/cloudformation/iotevents/aws-iotevents-detectormodel_settimer.go
rename to pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_settimer.go
index 35a065fd0c..0a738fef47 100644
--- a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_settimer.go
+++ b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_settimer.go
@@ -1,9 +1,9 @@
 package iotevents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DetectorModel_SetTimer AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.SetTimer)
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_setvariable.go b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_setvariable.go
similarity index 92%
rename from goformation/cloudformation/iotevents/aws-iotevents-detectormodel_setvariable.go
rename to pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_setvariable.go
index 31efaefd45..9092a97c23 100644
--- a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_setvariable.go
+++ b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_setvariable.go
@@ -1,9 +1,9 @@
 package iotevents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DetectorModel_SetVariable AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.SetVariable)
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_sns.go b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_sns.go
similarity index 92%
rename from goformation/cloudformation/iotevents/aws-iotevents-detectormodel_sns.go
rename to pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_sns.go
index 6df4d4d320..66a2ba3b2b 100644
--- a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_sns.go
+++ b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_sns.go
@@ -1,9 +1,9 @@
 package iotevents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DetectorModel_Sns AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.Sns)
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_sqs.go b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_sqs.go
similarity index 93%
rename from goformation/cloudformation/iotevents/aws-iotevents-detectormodel_sqs.go
rename to pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_sqs.go
index 2abf576f66..74449a0a8a 100644
--- a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_sqs.go
+++ b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_sqs.go
@@ -1,9 +1,9 @@
 package iotevents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DetectorModel_Sqs AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.Sqs)
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_state.go b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_state.go
similarity index 94%
rename from goformation/cloudformation/iotevents/aws-iotevents-detectormodel_state.go
rename to pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_state.go
index d280056537..6547d482d2 100644
--- a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_state.go
+++ b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_state.go
@@ -1,9 +1,9 @@
 package iotevents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DetectorModel_State AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.State)
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_transitionevent.go b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_transitionevent.go
similarity index 94%
rename from goformation/cloudformation/iotevents/aws-iotevents-detectormodel_transitionevent.go
rename to pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_transitionevent.go
index db263da1b7..891d05f2db 100644
--- a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_transitionevent.go
+++ b/pkg/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_transitionevent.go
@@ -1,9 +1,9 @@
 package iotevents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DetectorModel_TransitionEvent AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.TransitionEvent)
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-input.go b/pkg/goformation/cloudformation/iotevents/aws-iotevents-input.go
similarity index 95%
rename from goformation/cloudformation/iotevents/aws-iotevents-input.go
rename to pkg/goformation/cloudformation/iotevents/aws-iotevents-input.go
index 0545f5fa98..84fe1c2167 100644
--- a/goformation/cloudformation/iotevents/aws-iotevents-input.go
+++ b/pkg/goformation/cloudformation/iotevents/aws-iotevents-input.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Input AWS CloudFormation Resource (AWS::IoTEvents::Input)
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-input_attribute.go b/pkg/goformation/cloudformation/iotevents/aws-iotevents-input_attribute.go
similarity index 91%
rename from goformation/cloudformation/iotevents/aws-iotevents-input_attribute.go
rename to pkg/goformation/cloudformation/iotevents/aws-iotevents-input_attribute.go
index 7de68dd740..5b451cc893 100644
--- a/goformation/cloudformation/iotevents/aws-iotevents-input_attribute.go
+++ b/pkg/goformation/cloudformation/iotevents/aws-iotevents-input_attribute.go
@@ -1,9 +1,9 @@
 package iotevents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Input_Attribute AWS CloudFormation Resource (AWS::IoTEvents::Input.Attribute)
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-input_inputdefinition.go b/pkg/goformation/cloudformation/iotevents/aws-iotevents-input_inputdefinition.go
similarity index 95%
rename from goformation/cloudformation/iotevents/aws-iotevents-input_inputdefinition.go
rename to pkg/goformation/cloudformation/iotevents/aws-iotevents-input_inputdefinition.go
index 855b4e9ea3..563b11e4ae 100644
--- a/goformation/cloudformation/iotevents/aws-iotevents-input_inputdefinition.go
+++ b/pkg/goformation/cloudformation/iotevents/aws-iotevents-input_inputdefinition.go
@@ -1,7 +1,7 @@
 package iotevents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Input_InputDefinition AWS CloudFormation Resource (AWS::IoTEvents::Input.InputDefinition)
diff --git a/goformation/cloudformation/iotfleethub/aws-iotfleethub-application.go b/pkg/goformation/cloudformation/iotfleethub/aws-iotfleethub-application.go
similarity index 95%
rename from goformation/cloudformation/iotfleethub/aws-iotfleethub-application.go
rename to pkg/goformation/cloudformation/iotfleethub/aws-iotfleethub-application.go
index 07d7275676..59951ede08 100644
--- a/goformation/cloudformation/iotfleethub/aws-iotfleethub-application.go
+++ b/pkg/goformation/cloudformation/iotfleethub/aws-iotfleethub-application.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application AWS CloudFormation Resource (AWS::IoTFleetHub::Application)
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy.go b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy.go
similarity index 97%
rename from goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy.go
rename to pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy.go
index a6119b352b..53d827360b 100644
--- a/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy.go
+++ b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AccessPolicy AWS CloudFormation Resource (AWS::IoTSiteWise::AccessPolicy)
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_accesspolicyidentity.go b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_accesspolicyidentity.go
similarity index 96%
rename from goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_accesspolicyidentity.go
rename to pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_accesspolicyidentity.go
index 2021b0fd51..a607fe12c1 100644
--- a/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_accesspolicyidentity.go
+++ b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_accesspolicyidentity.go
@@ -1,7 +1,7 @@
 package iotsitewise
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AccessPolicy_AccessPolicyIdentity AWS CloudFormation Resource (AWS::IoTSiteWise::AccessPolicy.AccessPolicyIdentity)
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_accesspolicyresource.go b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_accesspolicyresource.go
similarity index 96%
rename from goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_accesspolicyresource.go
rename to pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_accesspolicyresource.go
index aa5b65f3b9..4e3e204860 100644
--- a/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_accesspolicyresource.go
+++ b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_accesspolicyresource.go
@@ -1,7 +1,7 @@
 package iotsitewise
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AccessPolicy_AccessPolicyResource AWS CloudFormation Resource (AWS::IoTSiteWise::AccessPolicy.AccessPolicyResource)
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_iamrole.go b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_iamrole.go
similarity index 91%
rename from goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_iamrole.go
rename to pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_iamrole.go
index 913005da3b..f5da6fc7b0 100644
--- a/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_iamrole.go
+++ b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_iamrole.go
@@ -1,9 +1,9 @@
 package iotsitewise
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AccessPolicy_IamRole AWS CloudFormation Resource (AWS::IoTSiteWise::AccessPolicy.IamRole)
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_iamuser.go b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_iamuser.go
similarity index 91%
rename from goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_iamuser.go
rename to pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_iamuser.go
index a518945c96..c61812a876 100644
--- a/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_iamuser.go
+++ b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_iamuser.go
@@ -1,9 +1,9 @@
 package iotsitewise
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AccessPolicy_IamUser AWS CloudFormation Resource (AWS::IoTSiteWise::AccessPolicy.IamUser)
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_portal.go b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_portal.go
similarity index 91%
rename from goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_portal.go
rename to pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_portal.go
index fdc1055341..88f1dc8f18 100644
--- a/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_portal.go
+++ b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_portal.go
@@ -1,9 +1,9 @@
 package iotsitewise
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AccessPolicy_Portal AWS CloudFormation Resource (AWS::IoTSiteWise::AccessPolicy.Portal)
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_project.go b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_project.go
similarity index 91%
rename from goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_project.go
rename to pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_project.go
index 1dbe691ccb..2a9bc329a2 100644
--- a/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_project.go
+++ b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_project.go
@@ -1,9 +1,9 @@
 package iotsitewise
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AccessPolicy_Project AWS CloudFormation Resource (AWS::IoTSiteWise::AccessPolicy.Project)
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_user.go b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_user.go
similarity index 91%
rename from goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_user.go
rename to pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_user.go
index 27267ae855..c82a5d298f 100644
--- a/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_user.go
+++ b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_user.go
@@ -1,9 +1,9 @@
 package iotsitewise
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AccessPolicy_User AWS CloudFormation Resource (AWS::IoTSiteWise::AccessPolicy.User)
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-asset.go b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-asset.go
similarity index 95%
rename from goformation/cloudformation/iotsitewise/aws-iotsitewise-asset.go
rename to pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-asset.go
index 0f32ea7ec9..685c9f6c56 100644
--- a/goformation/cloudformation/iotsitewise/aws-iotsitewise-asset.go
+++ b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-asset.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Asset AWS CloudFormation Resource (AWS::IoTSiteWise::Asset)
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-asset_assethierarchy.go b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-asset_assethierarchy.go
similarity index 92%
rename from goformation/cloudformation/iotsitewise/aws-iotsitewise-asset_assethierarchy.go
rename to pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-asset_assethierarchy.go
index aecc282cba..e95115a739 100644
--- a/goformation/cloudformation/iotsitewise/aws-iotsitewise-asset_assethierarchy.go
+++ b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-asset_assethierarchy.go
@@ -1,9 +1,9 @@
 package iotsitewise
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Asset_AssetHierarchy AWS CloudFormation Resource (AWS::IoTSiteWise::Asset.AssetHierarchy)
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-asset_assetproperty.go b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-asset_assetproperty.go
similarity index 93%
rename from goformation/cloudformation/iotsitewise/aws-iotsitewise-asset_assetproperty.go
rename to pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-asset_assetproperty.go
index 27af67dce9..a3b32fe7f7 100644
--- a/goformation/cloudformation/iotsitewise/aws-iotsitewise-asset_assetproperty.go
+++ b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-asset_assetproperty.go
@@ -1,9 +1,9 @@
 package iotsitewise
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Asset_AssetProperty AWS CloudFormation Resource (AWS::IoTSiteWise::Asset.AssetProperty)
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel.go b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel.go
similarity index 96%
rename from goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel.go
rename to pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel.go
index c6c5320834..e23d4688ca 100644
--- a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel.go
+++ b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AssetModel AWS CloudFormation Resource (AWS::IoTSiteWise::AssetModel)
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelcompositemodel.go b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelcompositemodel.go
similarity index 94%
rename from goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelcompositemodel.go
rename to pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelcompositemodel.go
index 674e3b407d..a5cf92a2b3 100644
--- a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelcompositemodel.go
+++ b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelcompositemodel.go
@@ -1,9 +1,9 @@
 package iotsitewise
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AssetModel_AssetModelCompositeModel AWS CloudFormation Resource (AWS::IoTSiteWise::AssetModel.AssetModelCompositeModel)
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelhierarchy.go b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelhierarchy.go
similarity index 94%
rename from goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelhierarchy.go
rename to pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelhierarchy.go
index 51d50ec179..21b304529d 100644
--- a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelhierarchy.go
+++ b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelhierarchy.go
@@ -1,9 +1,9 @@
 package iotsitewise
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AssetModel_AssetModelHierarchy AWS CloudFormation Resource (AWS::IoTSiteWise::AssetModel.AssetModelHierarchy)
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelproperty.go b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelproperty.go
similarity index 95%
rename from goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelproperty.go
rename to pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelproperty.go
index d4eec1e8b4..9beee2b13b 100644
--- a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelproperty.go
+++ b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelproperty.go
@@ -1,9 +1,9 @@
 package iotsitewise
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AssetModel_AssetModelProperty AWS CloudFormation Resource (AWS::IoTSiteWise::AssetModel.AssetModelProperty)
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_attribute.go b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_attribute.go
similarity index 91%
rename from goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_attribute.go
rename to pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_attribute.go
index 7a737a1232..ef86e7bad4 100644
--- a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_attribute.go
+++ b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_attribute.go
@@ -1,9 +1,9 @@
 package iotsitewise
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AssetModel_Attribute AWS CloudFormation Resource (AWS::IoTSiteWise::AssetModel.Attribute)
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_expressionvariable.go b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_expressionvariable.go
similarity index 93%
rename from goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_expressionvariable.go
rename to pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_expressionvariable.go
index ccab03127e..ebf42bd66e 100644
--- a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_expressionvariable.go
+++ b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_expressionvariable.go
@@ -1,9 +1,9 @@
 package iotsitewise
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AssetModel_ExpressionVariable AWS CloudFormation Resource (AWS::IoTSiteWise::AssetModel.ExpressionVariable)
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_metric.go b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_metric.go
similarity index 93%
rename from goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_metric.go
rename to pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_metric.go
index 89cd8f6ccf..10d3c91b39 100644
--- a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_metric.go
+++ b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_metric.go
@@ -1,9 +1,9 @@
 package iotsitewise
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AssetModel_Metric AWS CloudFormation Resource (AWS::IoTSiteWise::AssetModel.Metric)
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_metricwindow.go b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_metricwindow.go
similarity index 95%
rename from goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_metricwindow.go
rename to pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_metricwindow.go
index 3b4aa77f92..636f44d7cf 100644
--- a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_metricwindow.go
+++ b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_metricwindow.go
@@ -1,7 +1,7 @@
 package iotsitewise
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AssetModel_MetricWindow AWS CloudFormation Resource (AWS::IoTSiteWise::AssetModel.MetricWindow)
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_propertytype.go b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_propertytype.go
similarity index 94%
rename from goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_propertytype.go
rename to pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_propertytype.go
index 5df9db9ac9..9996f2d3e4 100644
--- a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_propertytype.go
+++ b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_propertytype.go
@@ -1,9 +1,9 @@
 package iotsitewise
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AssetModel_PropertyType AWS CloudFormation Resource (AWS::IoTSiteWise::AssetModel.PropertyType)
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_transform.go b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_transform.go
similarity index 92%
rename from goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_transform.go
rename to pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_transform.go
index 0a6ad4e48a..eddc974de3 100644
--- a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_transform.go
+++ b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_transform.go
@@ -1,9 +1,9 @@
 package iotsitewise
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AssetModel_Transform AWS CloudFormation Resource (AWS::IoTSiteWise::AssetModel.Transform)
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_tumblingwindow.go b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_tumblingwindow.go
similarity index 92%
rename from goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_tumblingwindow.go
rename to pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_tumblingwindow.go
index 801c11c422..96c9fb16ee 100644
--- a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_tumblingwindow.go
+++ b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_tumblingwindow.go
@@ -1,9 +1,9 @@
 package iotsitewise
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AssetModel_TumblingWindow AWS CloudFormation Resource (AWS::IoTSiteWise::AssetModel.TumblingWindow)
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_variablevalue.go b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_variablevalue.go
similarity index 93%
rename from goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_variablevalue.go
rename to pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_variablevalue.go
index ebf78c0905..32df955032 100644
--- a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_variablevalue.go
+++ b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_variablevalue.go
@@ -1,9 +1,9 @@
 package iotsitewise
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AssetModel_VariableValue AWS CloudFormation Resource (AWS::IoTSiteWise::AssetModel.VariableValue)
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-dashboard.go b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-dashboard.go
similarity index 95%
rename from goformation/cloudformation/iotsitewise/aws-iotsitewise-dashboard.go
rename to pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-dashboard.go
index 056680a26b..74577ebc07 100644
--- a/goformation/cloudformation/iotsitewise/aws-iotsitewise-dashboard.go
+++ b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-dashboard.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dashboard AWS CloudFormation Resource (AWS::IoTSiteWise::Dashboard)
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway.go b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway.go
similarity index 95%
rename from goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway.go
rename to pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway.go
index 6b7804013f..b9abec78bf 100644
--- a/goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway.go
+++ b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Gateway AWS CloudFormation Resource (AWS::IoTSiteWise::Gateway)
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway_gatewaycapabilitysummary.go b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway_gatewaycapabilitysummary.go
similarity index 93%
rename from goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway_gatewaycapabilitysummary.go
rename to pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway_gatewaycapabilitysummary.go
index a494d2522d..49b1edd193 100644
--- a/goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway_gatewaycapabilitysummary.go
+++ b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway_gatewaycapabilitysummary.go
@@ -1,9 +1,9 @@
 package iotsitewise
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Gateway_GatewayCapabilitySummary AWS CloudFormation Resource (AWS::IoTSiteWise::Gateway.GatewayCapabilitySummary)
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway_gatewayplatform.go b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway_gatewayplatform.go
similarity index 95%
rename from goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway_gatewayplatform.go
rename to pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway_gatewayplatform.go
index 551e266146..b0569e5d79 100644
--- a/goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway_gatewayplatform.go
+++ b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway_gatewayplatform.go
@@ -1,7 +1,7 @@
 package iotsitewise
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Gateway_GatewayPlatform AWS CloudFormation Resource (AWS::IoTSiteWise::Gateway.GatewayPlatform)
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway_greengrass.go b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway_greengrass.go
similarity index 91%
rename from goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway_greengrass.go
rename to pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway_greengrass.go
index 6eca25fce2..58a1920add 100644
--- a/goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway_greengrass.go
+++ b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway_greengrass.go
@@ -1,9 +1,9 @@
 package iotsitewise
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Gateway_Greengrass AWS CloudFormation Resource (AWS::IoTSiteWise::Gateway.Greengrass)
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-portal.go b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-portal.go
similarity index 96%
rename from goformation/cloudformation/iotsitewise/aws-iotsitewise-portal.go
rename to pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-portal.go
index dbcaa99cc5..06e21adcf2 100644
--- a/goformation/cloudformation/iotsitewise/aws-iotsitewise-portal.go
+++ b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-portal.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Portal AWS CloudFormation Resource (AWS::IoTSiteWise::Portal)
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-project.go b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-project.go
similarity index 95%
rename from goformation/cloudformation/iotsitewise/aws-iotsitewise-project.go
rename to pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-project.go
index b34ee9de66..dc27efe4b6 100644
--- a/goformation/cloudformation/iotsitewise/aws-iotsitewise-project.go
+++ b/pkg/goformation/cloudformation/iotsitewise/aws-iotsitewise-project.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project AWS CloudFormation Resource (AWS::IoTSiteWise::Project)
diff --git a/goformation/cloudformation/iotthingsgraph/aws-iotthingsgraph-flowtemplate.go b/pkg/goformation/cloudformation/iotthingsgraph/aws-iotthingsgraph-flowtemplate.go
similarity index 96%
rename from goformation/cloudformation/iotthingsgraph/aws-iotthingsgraph-flowtemplate.go
rename to pkg/goformation/cloudformation/iotthingsgraph/aws-iotthingsgraph-flowtemplate.go
index f57ab39639..48e5128090 100644
--- a/goformation/cloudformation/iotthingsgraph/aws-iotthingsgraph-flowtemplate.go
+++ b/pkg/goformation/cloudformation/iotthingsgraph/aws-iotthingsgraph-flowtemplate.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FlowTemplate AWS CloudFormation Resource (AWS::IoTThingsGraph::FlowTemplate)
diff --git a/goformation/cloudformation/iotthingsgraph/aws-iotthingsgraph-flowtemplate_definitiondocument.go b/pkg/goformation/cloudformation/iotthingsgraph/aws-iotthingsgraph-flowtemplate_definitiondocument.go
similarity index 93%
rename from goformation/cloudformation/iotthingsgraph/aws-iotthingsgraph-flowtemplate_definitiondocument.go
rename to pkg/goformation/cloudformation/iotthingsgraph/aws-iotthingsgraph-flowtemplate_definitiondocument.go
index 5c5cb833c9..2f0bcf71b0 100644
--- a/goformation/cloudformation/iotthingsgraph/aws-iotthingsgraph-flowtemplate_definitiondocument.go
+++ b/pkg/goformation/cloudformation/iotthingsgraph/aws-iotthingsgraph-flowtemplate_definitiondocument.go
@@ -1,9 +1,9 @@
 package iotthingsgraph
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FlowTemplate_DefinitionDocument AWS CloudFormation Resource (AWS::IoTThingsGraph::FlowTemplate.DefinitionDocument)
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-destination.go b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-destination.go
similarity index 96%
rename from goformation/cloudformation/iotwireless/aws-iotwireless-destination.go
rename to pkg/goformation/cloudformation/iotwireless/aws-iotwireless-destination.go
index 0692890c8c..4c5a12df33 100644
--- a/goformation/cloudformation/iotwireless/aws-iotwireless-destination.go
+++ b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-destination.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Destination AWS CloudFormation Resource (AWS::IoTWireless::Destination)
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-deviceprofile.go b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-deviceprofile.go
similarity index 95%
rename from goformation/cloudformation/iotwireless/aws-iotwireless-deviceprofile.go
rename to pkg/goformation/cloudformation/iotwireless/aws-iotwireless-deviceprofile.go
index baed7a7ee9..605db7ad41 100644
--- a/goformation/cloudformation/iotwireless/aws-iotwireless-deviceprofile.go
+++ b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-deviceprofile.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeviceProfile AWS CloudFormation Resource (AWS::IoTWireless::DeviceProfile)
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-deviceprofile_lorawandeviceprofile.go b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-deviceprofile_lorawandeviceprofile.go
similarity index 97%
rename from goformation/cloudformation/iotwireless/aws-iotwireless-deviceprofile_lorawandeviceprofile.go
rename to pkg/goformation/cloudformation/iotwireless/aws-iotwireless-deviceprofile_lorawandeviceprofile.go
index e417476820..314bd44a8f 100644
--- a/goformation/cloudformation/iotwireless/aws-iotwireless-deviceprofile_lorawandeviceprofile.go
+++ b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-deviceprofile_lorawandeviceprofile.go
@@ -1,9 +1,9 @@
 package iotwireless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeviceProfile_LoRaWANDeviceProfile AWS CloudFormation Resource (AWS::IoTWireless::DeviceProfile.LoRaWANDeviceProfile)
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-fuotatask.go b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-fuotatask.go
similarity index 96%
rename from goformation/cloudformation/iotwireless/aws-iotwireless-fuotatask.go
rename to pkg/goformation/cloudformation/iotwireless/aws-iotwireless-fuotatask.go
index a031bf8bf1..2e90b10fb2 100644
--- a/goformation/cloudformation/iotwireless/aws-iotwireless-fuotatask.go
+++ b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-fuotatask.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FuotaTask AWS CloudFormation Resource (AWS::IoTWireless::FuotaTask)
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-fuotatask_lorawan.go b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-fuotatask_lorawan.go
similarity index 92%
rename from goformation/cloudformation/iotwireless/aws-iotwireless-fuotatask_lorawan.go
rename to pkg/goformation/cloudformation/iotwireless/aws-iotwireless-fuotatask_lorawan.go
index 95d098ae45..e700b6d27c 100644
--- a/goformation/cloudformation/iotwireless/aws-iotwireless-fuotatask_lorawan.go
+++ b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-fuotatask_lorawan.go
@@ -1,9 +1,9 @@
 package iotwireless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FuotaTask_LoRaWAN AWS CloudFormation Resource (AWS::IoTWireless::FuotaTask.LoRaWAN)
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-multicastgroup.go b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-multicastgroup.go
similarity index 96%
rename from goformation/cloudformation/iotwireless/aws-iotwireless-multicastgroup.go
rename to pkg/goformation/cloudformation/iotwireless/aws-iotwireless-multicastgroup.go
index 2b1f120770..650bdd1677 100644
--- a/goformation/cloudformation/iotwireless/aws-iotwireless-multicastgroup.go
+++ b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-multicastgroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MulticastGroup AWS CloudFormation Resource (AWS::IoTWireless::MulticastGroup)
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-multicastgroup_lorawan.go b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-multicastgroup_lorawan.go
similarity index 94%
rename from goformation/cloudformation/iotwireless/aws-iotwireless-multicastgroup_lorawan.go
rename to pkg/goformation/cloudformation/iotwireless/aws-iotwireless-multicastgroup_lorawan.go
index dd4d2f84d7..34f32856bd 100644
--- a/goformation/cloudformation/iotwireless/aws-iotwireless-multicastgroup_lorawan.go
+++ b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-multicastgroup_lorawan.go
@@ -1,9 +1,9 @@
 package iotwireless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MulticastGroup_LoRaWAN AWS CloudFormation Resource (AWS::IoTWireless::MulticastGroup.LoRaWAN)
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-partneraccount.go b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-partneraccount.go
similarity index 96%
rename from goformation/cloudformation/iotwireless/aws-iotwireless-partneraccount.go
rename to pkg/goformation/cloudformation/iotwireless/aws-iotwireless-partneraccount.go
index 02140c381b..1d8b971bbc 100644
--- a/goformation/cloudformation/iotwireless/aws-iotwireless-partneraccount.go
+++ b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-partneraccount.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PartnerAccount AWS CloudFormation Resource (AWS::IoTWireless::PartnerAccount)
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-partneraccount_sidewalkaccountinfo.go b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-partneraccount_sidewalkaccountinfo.go
similarity index 92%
rename from goformation/cloudformation/iotwireless/aws-iotwireless-partneraccount_sidewalkaccountinfo.go
rename to pkg/goformation/cloudformation/iotwireless/aws-iotwireless-partneraccount_sidewalkaccountinfo.go
index 6b2955a6b3..61b576c099 100644
--- a/goformation/cloudformation/iotwireless/aws-iotwireless-partneraccount_sidewalkaccountinfo.go
+++ b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-partneraccount_sidewalkaccountinfo.go
@@ -1,9 +1,9 @@
 package iotwireless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PartnerAccount_SidewalkAccountInfo AWS CloudFormation Resource (AWS::IoTWireless::PartnerAccount.SidewalkAccountInfo)
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-partneraccount_sidewalkupdateaccount.go b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-partneraccount_sidewalkupdateaccount.go
similarity index 92%
rename from goformation/cloudformation/iotwireless/aws-iotwireless-partneraccount_sidewalkupdateaccount.go
rename to pkg/goformation/cloudformation/iotwireless/aws-iotwireless-partneraccount_sidewalkupdateaccount.go
index 1b1af1ab01..7b02ac1d6e 100644
--- a/goformation/cloudformation/iotwireless/aws-iotwireless-partneraccount_sidewalkupdateaccount.go
+++ b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-partneraccount_sidewalkupdateaccount.go
@@ -1,9 +1,9 @@
 package iotwireless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PartnerAccount_SidewalkUpdateAccount AWS CloudFormation Resource (AWS::IoTWireless::PartnerAccount.SidewalkUpdateAccount)
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-serviceprofile.go b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-serviceprofile.go
similarity index 95%
rename from goformation/cloudformation/iotwireless/aws-iotwireless-serviceprofile.go
rename to pkg/goformation/cloudformation/iotwireless/aws-iotwireless-serviceprofile.go
index 46426776e3..46da6e6fb2 100644
--- a/goformation/cloudformation/iotwireless/aws-iotwireless-serviceprofile.go
+++ b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-serviceprofile.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ServiceProfile AWS CloudFormation Resource (AWS::IoTWireless::ServiceProfile)
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-serviceprofile_lorawanserviceprofile.go b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-serviceprofile_lorawanserviceprofile.go
similarity index 98%
rename from goformation/cloudformation/iotwireless/aws-iotwireless-serviceprofile_lorawanserviceprofile.go
rename to pkg/goformation/cloudformation/iotwireless/aws-iotwireless-serviceprofile_lorawanserviceprofile.go
index 91ce2de3b9..1b82b3b9de 100644
--- a/goformation/cloudformation/iotwireless/aws-iotwireless-serviceprofile_lorawanserviceprofile.go
+++ b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-serviceprofile_lorawanserviceprofile.go
@@ -1,9 +1,9 @@
 package iotwireless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ServiceProfile_LoRaWANServiceProfile AWS CloudFormation Resource (AWS::IoTWireless::ServiceProfile.LoRaWANServiceProfile)
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition.go b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition.go
similarity index 96%
rename from goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition.go
rename to pkg/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition.go
index a4001c83ca..b3a042feb2 100644
--- a/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition.go
+++ b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition AWS CloudFormation Resource (AWS::IoTWireless::TaskDefinition)
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawangatewayversion.go b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawangatewayversion.go
similarity index 94%
rename from goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawangatewayversion.go
rename to pkg/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawangatewayversion.go
index a74e0f5c50..71aab6f66e 100644
--- a/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawangatewayversion.go
+++ b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawangatewayversion.go
@@ -1,9 +1,9 @@
 package iotwireless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_LoRaWANGatewayVersion AWS CloudFormation Resource (AWS::IoTWireless::TaskDefinition.LoRaWANGatewayVersion)
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawanupdategatewaytaskcreate.go b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawanupdategatewaytaskcreate.go
similarity index 95%
rename from goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawanupdategatewaytaskcreate.go
rename to pkg/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawanupdategatewaytaskcreate.go
index 1be47d0763..f0dd98395a 100644
--- a/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawanupdategatewaytaskcreate.go
+++ b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawanupdategatewaytaskcreate.go
@@ -1,9 +1,9 @@
 package iotwireless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_LoRaWANUpdateGatewayTaskCreate AWS CloudFormation Resource (AWS::IoTWireless::TaskDefinition.LoRaWANUpdateGatewayTaskCreate)
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawanupdategatewaytaskentry.go b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawanupdategatewaytaskentry.go
similarity index 96%
rename from goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawanupdategatewaytaskentry.go
rename to pkg/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawanupdategatewaytaskentry.go
index 12889d8ab1..e7cf3ca527 100644
--- a/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawanupdategatewaytaskentry.go
+++ b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawanupdategatewaytaskentry.go
@@ -1,7 +1,7 @@
 package iotwireless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_LoRaWANUpdateGatewayTaskEntry AWS CloudFormation Resource (AWS::IoTWireless::TaskDefinition.LoRaWANUpdateGatewayTaskEntry)
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_updatewirelessgatewaytaskcreate.go b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_updatewirelessgatewaytaskcreate.go
similarity index 94%
rename from goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_updatewirelessgatewaytaskcreate.go
rename to pkg/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_updatewirelessgatewaytaskcreate.go
index f44b28c53a..227c197a3a 100644
--- a/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_updatewirelessgatewaytaskcreate.go
+++ b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_updatewirelessgatewaytaskcreate.go
@@ -1,9 +1,9 @@
 package iotwireless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TaskDefinition_UpdateWirelessGatewayTaskCreate AWS CloudFormation Resource (AWS::IoTWireless::TaskDefinition.UpdateWirelessGatewayTaskCreate)
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice.go b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice.go
similarity index 96%
rename from goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice.go
rename to pkg/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice.go
index fa3532e52d..d2369fc1d8 100644
--- a/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice.go
+++ b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WirelessDevice AWS CloudFormation Resource (AWS::IoTWireless::WirelessDevice)
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_abpv10x.go b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_abpv10x.go
similarity index 93%
rename from goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_abpv10x.go
rename to pkg/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_abpv10x.go
index bd8a741933..c81b5ed25b 100644
--- a/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_abpv10x.go
+++ b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_abpv10x.go
@@ -1,9 +1,9 @@
 package iotwireless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WirelessDevice_AbpV10x AWS CloudFormation Resource (AWS::IoTWireless::WirelessDevice.AbpV10x)
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_abpv11.go b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_abpv11.go
similarity index 92%
rename from goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_abpv11.go
rename to pkg/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_abpv11.go
index d54fbabd09..7ba1f49499 100644
--- a/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_abpv11.go
+++ b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_abpv11.go
@@ -1,9 +1,9 @@
 package iotwireless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WirelessDevice_AbpV11 AWS CloudFormation Resource (AWS::IoTWireless::WirelessDevice.AbpV11)
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_lorawandevice.go b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_lorawandevice.go
similarity index 96%
rename from goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_lorawandevice.go
rename to pkg/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_lorawandevice.go
index 017a4e22f9..8e36b2face 100644
--- a/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_lorawandevice.go
+++ b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_lorawandevice.go
@@ -1,9 +1,9 @@
 package iotwireless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WirelessDevice_LoRaWANDevice AWS CloudFormation Resource (AWS::IoTWireless::WirelessDevice.LoRaWANDevice)
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_otaav10x.go b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_otaav10x.go
similarity index 92%
rename from goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_otaav10x.go
rename to pkg/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_otaav10x.go
index 302cc92f18..12bdb21e43 100644
--- a/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_otaav10x.go
+++ b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_otaav10x.go
@@ -1,9 +1,9 @@
 package iotwireless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WirelessDevice_OtaaV10x AWS CloudFormation Resource (AWS::IoTWireless::WirelessDevice.OtaaV10x)
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_otaav11.go b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_otaav11.go
similarity index 93%
rename from goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_otaav11.go
rename to pkg/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_otaav11.go
index 181f763ef6..92284917a9 100644
--- a/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_otaav11.go
+++ b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_otaav11.go
@@ -1,9 +1,9 @@
 package iotwireless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WirelessDevice_OtaaV11 AWS CloudFormation Resource (AWS::IoTWireless::WirelessDevice.OtaaV11)
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_sessionkeysabpv10x.go b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_sessionkeysabpv10x.go
similarity index 93%
rename from goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_sessionkeysabpv10x.go
rename to pkg/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_sessionkeysabpv10x.go
index ac98e33bad..3f63729f6f 100644
--- a/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_sessionkeysabpv10x.go
+++ b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_sessionkeysabpv10x.go
@@ -1,9 +1,9 @@
 package iotwireless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WirelessDevice_SessionKeysAbpV10x AWS CloudFormation Resource (AWS::IoTWireless::WirelessDevice.SessionKeysAbpV10x)
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_sessionkeysabpv11.go b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_sessionkeysabpv11.go
similarity index 94%
rename from goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_sessionkeysabpv11.go
rename to pkg/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_sessionkeysabpv11.go
index 32fcf33fb2..8a4a19ba9d 100644
--- a/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_sessionkeysabpv11.go
+++ b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_sessionkeysabpv11.go
@@ -1,9 +1,9 @@
 package iotwireless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WirelessDevice_SessionKeysAbpV11 AWS CloudFormation Resource (AWS::IoTWireless::WirelessDevice.SessionKeysAbpV11)
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessgateway.go b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessgateway.go
similarity index 96%
rename from goformation/cloudformation/iotwireless/aws-iotwireless-wirelessgateway.go
rename to pkg/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessgateway.go
index b2c2aeaa17..b1972b5c1a 100644
--- a/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessgateway.go
+++ b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessgateway.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WirelessGateway AWS CloudFormation Resource (AWS::IoTWireless::WirelessGateway)
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessgateway_lorawangateway.go b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessgateway_lorawangateway.go
similarity index 93%
rename from goformation/cloudformation/iotwireless/aws-iotwireless-wirelessgateway_lorawangateway.go
rename to pkg/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessgateway_lorawangateway.go
index f6b2cb1d23..697abcc948 100644
--- a/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessgateway_lorawangateway.go
+++ b/pkg/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessgateway_lorawangateway.go
@@ -1,9 +1,9 @@
 package iotwireless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WirelessGateway_LoRaWANGateway AWS CloudFormation Resource (AWS::IoTWireless::WirelessGateway.LoRaWANGateway)
diff --git a/goformation/cloudformation/ivs/aws-ivs-channel.go b/pkg/goformation/cloudformation/ivs/aws-ivs-channel.go
similarity index 95%
rename from goformation/cloudformation/ivs/aws-ivs-channel.go
rename to pkg/goformation/cloudformation/ivs/aws-ivs-channel.go
index ee9a92f00d..3689a3d79a 100644
--- a/goformation/cloudformation/ivs/aws-ivs-channel.go
+++ b/pkg/goformation/cloudformation/ivs/aws-ivs-channel.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel AWS CloudFormation Resource (AWS::IVS::Channel)
diff --git a/goformation/cloudformation/ivs/aws-ivs-playbackkeypair.go b/pkg/goformation/cloudformation/ivs/aws-ivs-playbackkeypair.go
similarity index 95%
rename from goformation/cloudformation/ivs/aws-ivs-playbackkeypair.go
rename to pkg/goformation/cloudformation/ivs/aws-ivs-playbackkeypair.go
index f1eaa07b6e..c2c86616dc 100644
--- a/goformation/cloudformation/ivs/aws-ivs-playbackkeypair.go
+++ b/pkg/goformation/cloudformation/ivs/aws-ivs-playbackkeypair.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PlaybackKeyPair AWS CloudFormation Resource (AWS::IVS::PlaybackKeyPair)
diff --git a/goformation/cloudformation/ivs/aws-ivs-recordingconfiguration.go b/pkg/goformation/cloudformation/ivs/aws-ivs-recordingconfiguration.go
similarity index 95%
rename from goformation/cloudformation/ivs/aws-ivs-recordingconfiguration.go
rename to pkg/goformation/cloudformation/ivs/aws-ivs-recordingconfiguration.go
index db79dece9c..bf30336a4c 100644
--- a/goformation/cloudformation/ivs/aws-ivs-recordingconfiguration.go
+++ b/pkg/goformation/cloudformation/ivs/aws-ivs-recordingconfiguration.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RecordingConfiguration AWS CloudFormation Resource (AWS::IVS::RecordingConfiguration)
diff --git a/goformation/cloudformation/ivs/aws-ivs-recordingconfiguration_destinationconfiguration.go b/pkg/goformation/cloudformation/ivs/aws-ivs-recordingconfiguration_destinationconfiguration.go
similarity index 95%
rename from goformation/cloudformation/ivs/aws-ivs-recordingconfiguration_destinationconfiguration.go
rename to pkg/goformation/cloudformation/ivs/aws-ivs-recordingconfiguration_destinationconfiguration.go
index d12b5dedbd..f6c121e711 100644
--- a/goformation/cloudformation/ivs/aws-ivs-recordingconfiguration_destinationconfiguration.go
+++ b/pkg/goformation/cloudformation/ivs/aws-ivs-recordingconfiguration_destinationconfiguration.go
@@ -1,7 +1,7 @@
 package ivs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RecordingConfiguration_DestinationConfiguration AWS CloudFormation Resource (AWS::IVS::RecordingConfiguration.DestinationConfiguration)
diff --git a/goformation/cloudformation/ivs/aws-ivs-recordingconfiguration_s3destinationconfiguration.go b/pkg/goformation/cloudformation/ivs/aws-ivs-recordingconfiguration_s3destinationconfiguration.go
similarity index 92%
rename from goformation/cloudformation/ivs/aws-ivs-recordingconfiguration_s3destinationconfiguration.go
rename to pkg/goformation/cloudformation/ivs/aws-ivs-recordingconfiguration_s3destinationconfiguration.go
index 21bb02969e..3b00e96f43 100644
--- a/goformation/cloudformation/ivs/aws-ivs-recordingconfiguration_s3destinationconfiguration.go
+++ b/pkg/goformation/cloudformation/ivs/aws-ivs-recordingconfiguration_s3destinationconfiguration.go
@@ -1,9 +1,9 @@
 package ivs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RecordingConfiguration_S3DestinationConfiguration AWS CloudFormation Resource (AWS::IVS::RecordingConfiguration.S3DestinationConfiguration)
diff --git a/goformation/cloudformation/ivs/aws-ivs-streamkey.go b/pkg/goformation/cloudformation/ivs/aws-ivs-streamkey.go
similarity index 94%
rename from goformation/cloudformation/ivs/aws-ivs-streamkey.go
rename to pkg/goformation/cloudformation/ivs/aws-ivs-streamkey.go
index aac08d6d1b..961aedfbd1 100644
--- a/goformation/cloudformation/ivs/aws-ivs-streamkey.go
+++ b/pkg/goformation/cloudformation/ivs/aws-ivs-streamkey.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StreamKey AWS CloudFormation Resource (AWS::IVS::StreamKey)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource.go
similarity index 96%
rename from goformation/cloudformation/kendra/aws-kendra-datasource.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource.go
index 48e970096b..de5cb2f05c 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource AWS CloudFormation Resource (AWS::Kendra::DataSource)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_accesscontrollistconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_accesscontrollistconfiguration.go
similarity index 92%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_accesscontrollistconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_accesscontrollistconfiguration.go
index ef5429c9fa..3b7592cd4c 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_accesscontrollistconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_accesscontrollistconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_AccessControlListConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.AccessControlListConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_aclconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_aclconfiguration.go
similarity index 92%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_aclconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_aclconfiguration.go
index fc18fcc2aa..1237eda6df 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_aclconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_aclconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_AclConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.AclConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_changedetectingcolumns.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_changedetectingcolumns.go
similarity index 92%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_changedetectingcolumns.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_changedetectingcolumns.go
index 59c067ca08..1ea8f6b913 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_changedetectingcolumns.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_changedetectingcolumns.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_ChangeDetectingColumns AWS CloudFormation Resource (AWS::Kendra::DataSource.ChangeDetectingColumns)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_columnconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_columnconfiguration.go
similarity index 95%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_columnconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_columnconfiguration.go
index 8294b83104..59938d4c43 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_columnconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_columnconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_ColumnConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.ColumnConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceattachmentconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceattachmentconfiguration.go
similarity index 93%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_confluenceattachmentconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceattachmentconfiguration.go
index 177d526360..fffc4d1ce3 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceattachmentconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceattachmentconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_ConfluenceAttachmentConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.ConfluenceAttachmentConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceattachmenttoindexfieldmapping.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceattachmenttoindexfieldmapping.go
similarity index 94%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_confluenceattachmenttoindexfieldmapping.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceattachmenttoindexfieldmapping.go
index 29a91cfb0c..c23b034685 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceattachmenttoindexfieldmapping.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceattachmenttoindexfieldmapping.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_ConfluenceAttachmentToIndexFieldMapping AWS CloudFormation Resource (AWS::Kendra::DataSource.ConfluenceAttachmentToIndexFieldMapping)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceblogconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceblogconfiguration.go
similarity index 95%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_confluenceblogconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceblogconfiguration.go
index 67c13f2f69..31209db1b1 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceblogconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceblogconfiguration.go
@@ -1,7 +1,7 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_ConfluenceBlogConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.ConfluenceBlogConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceblogtoindexfieldmapping.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceblogtoindexfieldmapping.go
similarity index 94%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_confluenceblogtoindexfieldmapping.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceblogtoindexfieldmapping.go
index 90fc0c141b..5f41653be0 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceblogtoindexfieldmapping.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceblogtoindexfieldmapping.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_ConfluenceBlogToIndexFieldMapping AWS CloudFormation Resource (AWS::Kendra::DataSource.ConfluenceBlogToIndexFieldMapping)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceconfiguration.go
similarity index 97%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_confluenceconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceconfiguration.go
index 98e33225f6..7a7f198cb9 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_ConfluenceConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.ConfluenceConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_confluencepageconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_confluencepageconfiguration.go
similarity index 95%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_confluencepageconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_confluencepageconfiguration.go
index b7566f46e7..3a0d0c85bf 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_confluencepageconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_confluencepageconfiguration.go
@@ -1,7 +1,7 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_ConfluencePageConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.ConfluencePageConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_confluencepagetoindexfieldmapping.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_confluencepagetoindexfieldmapping.go
similarity index 94%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_confluencepagetoindexfieldmapping.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_confluencepagetoindexfieldmapping.go
index 364a0eca74..bdb6483cfc 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_confluencepagetoindexfieldmapping.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_confluencepagetoindexfieldmapping.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_ConfluencePageToIndexFieldMapping AWS CloudFormation Resource (AWS::Kendra::DataSource.ConfluencePageToIndexFieldMapping)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_confluencespaceconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_confluencespaceconfiguration.go
similarity index 95%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_confluencespaceconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_confluencespaceconfiguration.go
index c0f029891d..490891c39f 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_confluencespaceconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_confluencespaceconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_ConfluenceSpaceConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.ConfluenceSpaceConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_confluencespacetoindexfieldmapping.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_confluencespacetoindexfieldmapping.go
similarity index 94%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_confluencespacetoindexfieldmapping.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_confluencespacetoindexfieldmapping.go
index 818683c578..51beee4b08 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_confluencespacetoindexfieldmapping.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_confluencespacetoindexfieldmapping.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_ConfluenceSpaceToIndexFieldMapping AWS CloudFormation Resource (AWS::Kendra::DataSource.ConfluenceSpaceToIndexFieldMapping)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_connectionconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_connectionconfiguration.go
similarity index 95%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_connectionconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_connectionconfiguration.go
index 03a159bec3..e71b1ddf02 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_connectionconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_connectionconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_ConnectionConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.ConnectionConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_databaseconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_databaseconfiguration.go
similarity index 96%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_databaseconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_databaseconfiguration.go
index df5a4a0ffb..1f0306632c 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_databaseconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_databaseconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_DatabaseConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.DatabaseConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_datasourceconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_datasourceconfiguration.go
similarity index 98%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_datasourceconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_datasourceconfiguration.go
index 1d6f9bf209..704258773b 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_datasourceconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_datasourceconfiguration.go
@@ -1,7 +1,7 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_DataSourceConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.DataSourceConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_datasourceinclusionsexclusionsstrings.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_datasourceinclusionsexclusionsstrings.go
similarity index 92%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_datasourceinclusionsexclusionsstrings.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_datasourceinclusionsexclusionsstrings.go
index 98808f5e59..4dcba9eb7b 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_datasourceinclusionsexclusionsstrings.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_datasourceinclusionsexclusionsstrings.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_DataSourceInclusionsExclusionsStrings AWS CloudFormation Resource (AWS::Kendra::DataSource.DataSourceInclusionsExclusionsStrings)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_datasourcetoindexfieldmapping.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_datasourcetoindexfieldmapping.go
similarity index 94%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_datasourcetoindexfieldmapping.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_datasourcetoindexfieldmapping.go
index a859b06b59..013d433f63 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_datasourcetoindexfieldmapping.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_datasourcetoindexfieldmapping.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_DataSourceToIndexFieldMapping AWS CloudFormation Resource (AWS::Kendra::DataSource.DataSourceToIndexFieldMapping)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_datasourcetoindexfieldmappinglist.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_datasourcetoindexfieldmappinglist.go
similarity index 96%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_datasourcetoindexfieldmappinglist.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_datasourcetoindexfieldmappinglist.go
index 408cb3e7b7..dc79ec63f0 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_datasourcetoindexfieldmappinglist.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_datasourcetoindexfieldmappinglist.go
@@ -1,7 +1,7 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_DataSourceToIndexFieldMappingList AWS CloudFormation Resource (AWS::Kendra::DataSource.DataSourceToIndexFieldMappingList)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_datasourcevpcconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_datasourcevpcconfiguration.go
similarity index 93%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_datasourcevpcconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_datasourcevpcconfiguration.go
index 718509ca4d..a6aaace843 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_datasourcevpcconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_datasourcevpcconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_DataSourceVpcConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.DataSourceVpcConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_documentsmetadataconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_documentsmetadataconfiguration.go
similarity index 92%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_documentsmetadataconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_documentsmetadataconfiguration.go
index bd80671e07..5bcee4eac2 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_documentsmetadataconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_documentsmetadataconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_DocumentsMetadataConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.DocumentsMetadataConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_googledriveconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_googledriveconfiguration.go
similarity index 96%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_googledriveconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_googledriveconfiguration.go
index bc15bf24a5..e8f7892446 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_googledriveconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_googledriveconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_GoogleDriveConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.GoogleDriveConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_onedriveconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_onedriveconfiguration.go
similarity index 96%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_onedriveconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_onedriveconfiguration.go
index b2d39a5aa0..2d773be0cd 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_onedriveconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_onedriveconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_OneDriveConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.OneDriveConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_onedriveuserlist.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_onedriveuserlist.go
similarity index 91%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_onedriveuserlist.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_onedriveuserlist.go
index e2215bfbdd..17e7f98449 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_onedriveuserlist.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_onedriveuserlist.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_OneDriveUserList AWS CloudFormation Resource (AWS::Kendra::DataSource.OneDriveUserList)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_onedriveusers.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_onedriveusers.go
similarity index 93%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_onedriveusers.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_onedriveusers.go
index cdf11abc65..4de0a2695a 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_onedriveusers.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_onedriveusers.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_OneDriveUsers AWS CloudFormation Resource (AWS::Kendra::DataSource.OneDriveUsers)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_proxyconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_proxyconfiguration.go
similarity index 93%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_proxyconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_proxyconfiguration.go
index ef9327dbe7..32c662899c 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_proxyconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_proxyconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_ProxyConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.ProxyConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_s3datasourceconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_s3datasourceconfiguration.go
similarity index 96%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_s3datasourceconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_s3datasourceconfiguration.go
index 3c07238aa0..71fc808075 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_s3datasourceconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_s3datasourceconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_S3DataSourceConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.S3DataSourceConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_s3path.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_s3path.go
similarity index 92%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_s3path.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_s3path.go
index ac403ef840..ee37be2ed4 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_s3path.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_s3path.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_S3Path AWS CloudFormation Resource (AWS::Kendra::DataSource.S3Path)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcechatterfeedconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcechatterfeedconfiguration.go
similarity index 95%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_salesforcechatterfeedconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcechatterfeedconfiguration.go
index 8daf295a6f..5e246df5d8 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcechatterfeedconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcechatterfeedconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_SalesforceChatterFeedConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.SalesforceChatterFeedConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcechatterfeedincludefiltertypes.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcechatterfeedincludefiltertypes.go
similarity index 93%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_salesforcechatterfeedincludefiltertypes.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcechatterfeedincludefiltertypes.go
index 8116648cd2..34aea1f0ff 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcechatterfeedincludefiltertypes.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcechatterfeedincludefiltertypes.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_SalesforceChatterFeedIncludeFilterTypes AWS CloudFormation Resource (AWS::Kendra::DataSource.SalesforceChatterFeedIncludeFilterTypes)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforceconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforceconfiguration.go
similarity index 97%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_salesforceconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforceconfiguration.go
index fcb6a3c52c..3ba02d3316 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforceconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforceconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_SalesforceConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.SalesforceConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcecustomknowledgearticletypeconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcecustomknowledgearticletypeconfiguration.go
similarity index 95%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_salesforcecustomknowledgearticletypeconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcecustomknowledgearticletypeconfiguration.go
index 60f2a87f4b..c3eb1d1f3e 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcecustomknowledgearticletypeconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcecustomknowledgearticletypeconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_SalesforceCustomKnowledgeArticleTypeConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.SalesforceCustomKnowledgeArticleTypeConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcecustomknowledgearticletypeconfigurationlist.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcecustomknowledgearticletypeconfigurationlist.go
similarity index 96%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_salesforcecustomknowledgearticletypeconfigurationlist.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcecustomknowledgearticletypeconfigurationlist.go
index 0235255caf..253e30fe21 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcecustomknowledgearticletypeconfigurationlist.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcecustomknowledgearticletypeconfigurationlist.go
@@ -1,7 +1,7 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_SalesforceCustomKnowledgeArticleTypeConfigurationList AWS CloudFormation Resource (AWS::Kendra::DataSource.SalesforceCustomKnowledgeArticleTypeConfigurationList)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforceknowledgearticleconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforceknowledgearticleconfiguration.go
similarity index 95%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_salesforceknowledgearticleconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforceknowledgearticleconfiguration.go
index 9eadabde52..3a6f66e50b 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforceknowledgearticleconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforceknowledgearticleconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_SalesforceKnowledgeArticleConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.SalesforceKnowledgeArticleConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforceknowledgearticlestatelist.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforceknowledgearticlestatelist.go
similarity index 92%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_salesforceknowledgearticlestatelist.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforceknowledgearticlestatelist.go
index dba8cd6251..8183cd47bd 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforceknowledgearticlestatelist.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforceknowledgearticlestatelist.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_SalesforceKnowledgeArticleStateList AWS CloudFormation Resource (AWS::Kendra::DataSource.SalesforceKnowledgeArticleStateList)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardknowledgearticletypeconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardknowledgearticletypeconfiguration.go
similarity index 95%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardknowledgearticletypeconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardknowledgearticletypeconfiguration.go
index 5912787f4b..fa7e33a8f1 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardknowledgearticletypeconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardknowledgearticletypeconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_SalesforceStandardKnowledgeArticleTypeConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.SalesforceStandardKnowledgeArticleTypeConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectattachmentconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectattachmentconfiguration.go
similarity index 94%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectattachmentconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectattachmentconfiguration.go
index 06c4f32127..d65bd26ca3 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectattachmentconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectattachmentconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_SalesforceStandardObjectAttachmentConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.SalesforceStandardObjectAttachmentConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectconfiguration.go
similarity index 95%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectconfiguration.go
index fe4b352951..3a4924cf7f 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_SalesforceStandardObjectConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.SalesforceStandardObjectConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectconfigurationlist.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectconfigurationlist.go
similarity index 96%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectconfigurationlist.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectconfigurationlist.go
index 66ad139ecf..80ae318a13 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectconfigurationlist.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectconfigurationlist.go
@@ -1,7 +1,7 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_SalesforceStandardObjectConfigurationList AWS CloudFormation Resource (AWS::Kendra::DataSource.SalesforceStandardObjectConfigurationList)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_servicenowconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_servicenowconfiguration.go
similarity index 96%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_servicenowconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_servicenowconfiguration.go
index e52d7714e8..845a462599 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_servicenowconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_servicenowconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_ServiceNowConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.ServiceNowConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_servicenowknowledgearticleconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_servicenowknowledgearticleconfiguration.go
similarity index 96%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_servicenowknowledgearticleconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_servicenowknowledgearticleconfiguration.go
index f3bd876775..6aa823bcb9 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_servicenowknowledgearticleconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_servicenowknowledgearticleconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_ServiceNowKnowledgeArticleConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.ServiceNowKnowledgeArticleConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_servicenowservicecatalogconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_servicenowservicecatalogconfiguration.go
similarity index 96%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_servicenowservicecatalogconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_servicenowservicecatalogconfiguration.go
index 1a9f3985af..cadac9bfc8 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_servicenowservicecatalogconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_servicenowservicecatalogconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_ServiceNowServiceCatalogConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.ServiceNowServiceCatalogConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_sharepointconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_sharepointconfiguration.go
similarity index 97%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_sharepointconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_sharepointconfiguration.go
index 8f8b097558..c46c0e3d50 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_sharepointconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_sharepointconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_SharePointConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.SharePointConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_sqlconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_sqlconfiguration.go
similarity index 92%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_sqlconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_sqlconfiguration.go
index 997b5fcefe..9fee997022 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_sqlconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_sqlconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_SqlConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.SqlConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_taglist.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_taglist.go
similarity index 90%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_taglist.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_taglist.go
index 3c91f71f97..663f9cdb2b 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_taglist.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_taglist.go
@@ -1,8 +1,8 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_TagList AWS CloudFormation Resource (AWS::Kendra::DataSource.TagList)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerauthenticationconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerauthenticationconfiguration.go
similarity index 96%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerauthenticationconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerauthenticationconfiguration.go
index eb1f335497..116e71fe8d 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerauthenticationconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerauthenticationconfiguration.go
@@ -1,7 +1,7 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_WebCrawlerAuthenticationConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.WebCrawlerAuthenticationConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerbasicauthentication.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerbasicauthentication.go
similarity index 94%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerbasicauthentication.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerbasicauthentication.go
index be9bca0c64..84e07e245f 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerbasicauthentication.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerbasicauthentication.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_WebCrawlerBasicAuthentication AWS CloudFormation Resource (AWS::Kendra::DataSource.WebCrawlerBasicAuthentication)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerconfiguration.go
similarity index 96%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerconfiguration.go
index 825b6589dc..4c167cbd36 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_WebCrawlerConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.WebCrawlerConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerseedurlconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerseedurlconfiguration.go
similarity index 93%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerseedurlconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerseedurlconfiguration.go
index 13402b4aae..ab3259ed97 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerseedurlconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerseedurlconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_WebCrawlerSeedUrlConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.WebCrawlerSeedUrlConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlersitemapsconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlersitemapsconfiguration.go
similarity index 92%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlersitemapsconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlersitemapsconfiguration.go
index a92ae66161..5411db1d00 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlersitemapsconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlersitemapsconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_WebCrawlerSiteMapsConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.WebCrawlerSiteMapsConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerurls.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerurls.go
similarity index 96%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerurls.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerurls.go
index 2a5dd2f3b2..b4a0673080 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerurls.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerurls.go
@@ -1,7 +1,7 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_WebCrawlerUrls AWS CloudFormation Resource (AWS::Kendra::DataSource.WebCrawlerUrls)
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_workdocsconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_workdocsconfiguration.go
similarity index 95%
rename from goformation/cloudformation/kendra/aws-kendra-datasource_workdocsconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-datasource_workdocsconfiguration.go
index b117571f72..cc869ee215 100644
--- a/goformation/cloudformation/kendra/aws-kendra-datasource_workdocsconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-datasource_workdocsconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_WorkDocsConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.WorkDocsConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-faq.go b/pkg/goformation/cloudformation/kendra/aws-kendra-faq.go
similarity index 95%
rename from goformation/cloudformation/kendra/aws-kendra-faq.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-faq.go
index 56783fff93..1ca2e221e2 100644
--- a/goformation/cloudformation/kendra/aws-kendra-faq.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-faq.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Faq AWS CloudFormation Resource (AWS::Kendra::Faq)
diff --git a/goformation/cloudformation/kendra/aws-kendra-faq_s3path.go b/pkg/goformation/cloudformation/kendra/aws-kendra-faq_s3path.go
similarity index 92%
rename from goformation/cloudformation/kendra/aws-kendra-faq_s3path.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-faq_s3path.go
index 6922ae6c39..dda79fcfad 100644
--- a/goformation/cloudformation/kendra/aws-kendra-faq_s3path.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-faq_s3path.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Faq_S3Path AWS CloudFormation Resource (AWS::Kendra::Faq.S3Path)
diff --git a/goformation/cloudformation/kendra/aws-kendra-faq_taglist.go b/pkg/goformation/cloudformation/kendra/aws-kendra-faq_taglist.go
similarity index 90%
rename from goformation/cloudformation/kendra/aws-kendra-faq_taglist.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-faq_taglist.go
index b0fca898cb..8b0dbeb6f4 100644
--- a/goformation/cloudformation/kendra/aws-kendra-faq_taglist.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-faq_taglist.go
@@ -1,8 +1,8 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Faq_TagList AWS CloudFormation Resource (AWS::Kendra::Faq.TagList)
diff --git a/goformation/cloudformation/kendra/aws-kendra-index.go b/pkg/goformation/cloudformation/kendra/aws-kendra-index.go
similarity index 96%
rename from goformation/cloudformation/kendra/aws-kendra-index.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-index.go
index 42cfa2c4dd..2a17a40018 100644
--- a/goformation/cloudformation/kendra/aws-kendra-index.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-index.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Index AWS CloudFormation Resource (AWS::Kendra::Index)
diff --git a/goformation/cloudformation/kendra/aws-kendra-index_capacityunitsconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-index_capacityunitsconfiguration.go
similarity index 93%
rename from goformation/cloudformation/kendra/aws-kendra-index_capacityunitsconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-index_capacityunitsconfiguration.go
index 7c8a97227b..ab5745e6e6 100644
--- a/goformation/cloudformation/kendra/aws-kendra-index_capacityunitsconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-index_capacityunitsconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Index_CapacityUnitsConfiguration AWS CloudFormation Resource (AWS::Kendra::Index.CapacityUnitsConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-index_documentmetadataconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-index_documentmetadataconfiguration.go
similarity index 94%
rename from goformation/cloudformation/kendra/aws-kendra-index_documentmetadataconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-index_documentmetadataconfiguration.go
index 8dc032a830..cbbfc89995 100644
--- a/goformation/cloudformation/kendra/aws-kendra-index_documentmetadataconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-index_documentmetadataconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Index_DocumentMetadataConfiguration AWS CloudFormation Resource (AWS::Kendra::Index.DocumentMetadataConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-index_documentmetadataconfigurationlist.go b/pkg/goformation/cloudformation/kendra/aws-kendra-index_documentmetadataconfigurationlist.go
similarity index 96%
rename from goformation/cloudformation/kendra/aws-kendra-index_documentmetadataconfigurationlist.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-index_documentmetadataconfigurationlist.go
index 9224266c89..4b8e56ae65 100644
--- a/goformation/cloudformation/kendra/aws-kendra-index_documentmetadataconfigurationlist.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-index_documentmetadataconfigurationlist.go
@@ -1,7 +1,7 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Index_DocumentMetadataConfigurationList AWS CloudFormation Resource (AWS::Kendra::Index.DocumentMetadataConfigurationList)
diff --git a/goformation/cloudformation/kendra/aws-kendra-index_jsontokentypeconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-index_jsontokentypeconfiguration.go
similarity index 93%
rename from goformation/cloudformation/kendra/aws-kendra-index_jsontokentypeconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-index_jsontokentypeconfiguration.go
index 21935d644b..eb2d4abf1a 100644
--- a/goformation/cloudformation/kendra/aws-kendra-index_jsontokentypeconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-index_jsontokentypeconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Index_JsonTokenTypeConfiguration AWS CloudFormation Resource (AWS::Kendra::Index.JsonTokenTypeConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-index_jwttokentypeconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-index_jwttokentypeconfiguration.go
similarity index 96%
rename from goformation/cloudformation/kendra/aws-kendra-index_jwttokentypeconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-index_jwttokentypeconfiguration.go
index caf25641a1..fbe5b6d8b9 100644
--- a/goformation/cloudformation/kendra/aws-kendra-index_jwttokentypeconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-index_jwttokentypeconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Index_JwtTokenTypeConfiguration AWS CloudFormation Resource (AWS::Kendra::Index.JwtTokenTypeConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-index_relevance.go b/pkg/goformation/cloudformation/kendra/aws-kendra-index_relevance.go
similarity index 94%
rename from goformation/cloudformation/kendra/aws-kendra-index_relevance.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-index_relevance.go
index 9fc0542f99..fce92eecc3 100644
--- a/goformation/cloudformation/kendra/aws-kendra-index_relevance.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-index_relevance.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Index_Relevance AWS CloudFormation Resource (AWS::Kendra::Index.Relevance)
diff --git a/goformation/cloudformation/kendra/aws-kendra-index_search.go b/pkg/goformation/cloudformation/kendra/aws-kendra-index_search.go
similarity index 94%
rename from goformation/cloudformation/kendra/aws-kendra-index_search.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-index_search.go
index 9c8d027c07..25c90eaf1e 100644
--- a/goformation/cloudformation/kendra/aws-kendra-index_search.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-index_search.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Index_Search AWS CloudFormation Resource (AWS::Kendra::Index.Search)
diff --git a/goformation/cloudformation/kendra/aws-kendra-index_serversideencryptionconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-index_serversideencryptionconfiguration.go
similarity index 92%
rename from goformation/cloudformation/kendra/aws-kendra-index_serversideencryptionconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-index_serversideencryptionconfiguration.go
index 92c90b07f6..968a189020 100644
--- a/goformation/cloudformation/kendra/aws-kendra-index_serversideencryptionconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-index_serversideencryptionconfiguration.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Index_ServerSideEncryptionConfiguration AWS CloudFormation Resource (AWS::Kendra::Index.ServerSideEncryptionConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-index_taglist.go b/pkg/goformation/cloudformation/kendra/aws-kendra-index_taglist.go
similarity index 90%
rename from goformation/cloudformation/kendra/aws-kendra-index_taglist.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-index_taglist.go
index 6fe8c923f3..02b830ceae 100644
--- a/goformation/cloudformation/kendra/aws-kendra-index_taglist.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-index_taglist.go
@@ -1,8 +1,8 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Index_TagList AWS CloudFormation Resource (AWS::Kendra::Index.TagList)
diff --git a/goformation/cloudformation/kendra/aws-kendra-index_usertokenconfiguration.go b/pkg/goformation/cloudformation/kendra/aws-kendra-index_usertokenconfiguration.go
similarity index 96%
rename from goformation/cloudformation/kendra/aws-kendra-index_usertokenconfiguration.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-index_usertokenconfiguration.go
index 7461d75c34..b895de8523 100644
--- a/goformation/cloudformation/kendra/aws-kendra-index_usertokenconfiguration.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-index_usertokenconfiguration.go
@@ -1,7 +1,7 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Index_UserTokenConfiguration AWS CloudFormation Resource (AWS::Kendra::Index.UserTokenConfiguration)
diff --git a/goformation/cloudformation/kendra/aws-kendra-index_valueimportanceitem.go b/pkg/goformation/cloudformation/kendra/aws-kendra-index_valueimportanceitem.go
similarity index 92%
rename from goformation/cloudformation/kendra/aws-kendra-index_valueimportanceitem.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-index_valueimportanceitem.go
index a754e77903..4851d76e4f 100644
--- a/goformation/cloudformation/kendra/aws-kendra-index_valueimportanceitem.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-index_valueimportanceitem.go
@@ -1,9 +1,9 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Index_ValueImportanceItem AWS CloudFormation Resource (AWS::Kendra::Index.ValueImportanceItem)
diff --git a/goformation/cloudformation/kendra/aws-kendra-index_valueimportanceitems.go b/pkg/goformation/cloudformation/kendra/aws-kendra-index_valueimportanceitems.go
similarity index 95%
rename from goformation/cloudformation/kendra/aws-kendra-index_valueimportanceitems.go
rename to pkg/goformation/cloudformation/kendra/aws-kendra-index_valueimportanceitems.go
index bdb0192b5c..ce9c9b0e79 100644
--- a/goformation/cloudformation/kendra/aws-kendra-index_valueimportanceitems.go
+++ b/pkg/goformation/cloudformation/kendra/aws-kendra-index_valueimportanceitems.go
@@ -1,7 +1,7 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Index_ValueImportanceItems AWS CloudFormation Resource (AWS::Kendra::Index.ValueImportanceItems)
diff --git a/goformation/cloudformation/kinesis/aws-kinesis-stream.go b/pkg/goformation/cloudformation/kinesis/aws-kinesis-stream.go
similarity index 95%
rename from goformation/cloudformation/kinesis/aws-kinesis-stream.go
rename to pkg/goformation/cloudformation/kinesis/aws-kinesis-stream.go
index b1026c47e9..cd3383adfa 100644
--- a/goformation/cloudformation/kinesis/aws-kinesis-stream.go
+++ b/pkg/goformation/cloudformation/kinesis/aws-kinesis-stream.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Stream AWS CloudFormation Resource (AWS::Kinesis::Stream)
diff --git a/goformation/cloudformation/kinesis/aws-kinesis-stream_streamencryption.go b/pkg/goformation/cloudformation/kinesis/aws-kinesis-stream_streamencryption.go
similarity index 92%
rename from goformation/cloudformation/kinesis/aws-kinesis-stream_streamencryption.go
rename to pkg/goformation/cloudformation/kinesis/aws-kinesis-stream_streamencryption.go
index f3af96ec22..73b987e1ae 100644
--- a/goformation/cloudformation/kinesis/aws-kinesis-stream_streamencryption.go
+++ b/pkg/goformation/cloudformation/kinesis/aws-kinesis-stream_streamencryption.go
@@ -1,9 +1,9 @@
 package kinesis
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Stream_StreamEncryption AWS CloudFormation Resource (AWS::Kinesis::Stream.StreamEncryption)
diff --git a/goformation/cloudformation/kinesis/aws-kinesis-streamconsumer.go b/pkg/goformation/cloudformation/kinesis/aws-kinesis-streamconsumer.go
similarity index 96%
rename from goformation/cloudformation/kinesis/aws-kinesis-streamconsumer.go
rename to pkg/goformation/cloudformation/kinesis/aws-kinesis-streamconsumer.go
index 0cd496b6b8..68b7ae1698 100644
--- a/goformation/cloudformation/kinesis/aws-kinesis-streamconsumer.go
+++ b/pkg/goformation/cloudformation/kinesis/aws-kinesis-streamconsumer.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StreamConsumer AWS CloudFormation Resource (AWS::Kinesis::StreamConsumer)
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application.go b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application.go
similarity index 97%
rename from goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application.go
rename to pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application.go
index ed82bae4ae..ccf78a61f1 100644
--- a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application.go
+++ b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application AWS CloudFormation Resource (AWS::KinesisAnalytics::Application)
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_csvmappingparameters.go b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_csvmappingparameters.go
similarity index 93%
rename from goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_csvmappingparameters.go
rename to pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_csvmappingparameters.go
index 880712668e..d7d45162f0 100644
--- a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_csvmappingparameters.go
+++ b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_csvmappingparameters.go
@@ -1,9 +1,9 @@
 package kinesisanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_CSVMappingParameters AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.CSVMappingParameters)
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_input.go b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_input.go
similarity index 95%
rename from goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_input.go
rename to pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_input.go
index 497911aecd..24a7dfcd6f 100644
--- a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_input.go
+++ b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_input.go
@@ -1,9 +1,9 @@
 package kinesisanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_Input AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.Input)
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputlambdaprocessor.go b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputlambdaprocessor.go
similarity index 93%
rename from goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputlambdaprocessor.go
rename to pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputlambdaprocessor.go
index 8df481fe02..b1c943567b 100644
--- a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputlambdaprocessor.go
+++ b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputlambdaprocessor.go
@@ -1,9 +1,9 @@
 package kinesisanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_InputLambdaProcessor AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.InputLambdaProcessor)
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputparallelism.go b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputparallelism.go
similarity index 92%
rename from goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputparallelism.go
rename to pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputparallelism.go
index b80c59ab1a..ee4e22dfa9 100644
--- a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputparallelism.go
+++ b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputparallelism.go
@@ -1,9 +1,9 @@
 package kinesisanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_InputParallelism AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.InputParallelism)
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputprocessingconfiguration.go b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputprocessingconfiguration.go
similarity index 96%
rename from goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputprocessingconfiguration.go
rename to pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputprocessingconfiguration.go
index b322d072fd..3da20aa327 100644
--- a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputprocessingconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputprocessingconfiguration.go
@@ -1,7 +1,7 @@
 package kinesisanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_InputProcessingConfiguration AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.InputProcessingConfiguration)
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputschema.go b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputschema.go
similarity index 94%
rename from goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputschema.go
rename to pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputschema.go
index ef8b67d252..d9d7329052 100644
--- a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputschema.go
+++ b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputschema.go
@@ -1,9 +1,9 @@
 package kinesisanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_InputSchema AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.InputSchema)
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_jsonmappingparameters.go b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_jsonmappingparameters.go
similarity index 92%
rename from goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_jsonmappingparameters.go
rename to pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_jsonmappingparameters.go
index 9def390a3d..ed9877bf7e 100644
--- a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_jsonmappingparameters.go
+++ b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_jsonmappingparameters.go
@@ -1,9 +1,9 @@
 package kinesisanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_JSONMappingParameters AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.JSONMappingParameters)
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_kinesisfirehoseinput.go b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_kinesisfirehoseinput.go
similarity index 93%
rename from goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_kinesisfirehoseinput.go
rename to pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_kinesisfirehoseinput.go
index edd9c63c5b..a6f7e11527 100644
--- a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_kinesisfirehoseinput.go
+++ b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_kinesisfirehoseinput.go
@@ -1,9 +1,9 @@
 package kinesisanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_KinesisFirehoseInput AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.KinesisFirehoseInput)
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_kinesisstreamsinput.go b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_kinesisstreamsinput.go
similarity index 93%
rename from goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_kinesisstreamsinput.go
rename to pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_kinesisstreamsinput.go
index 951625827c..c245f2e9ac 100644
--- a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_kinesisstreamsinput.go
+++ b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_kinesisstreamsinput.go
@@ -1,9 +1,9 @@
 package kinesisanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_KinesisStreamsInput AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.KinesisStreamsInput)
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_mappingparameters.go b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_mappingparameters.go
similarity index 96%
rename from goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_mappingparameters.go
rename to pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_mappingparameters.go
index dfd1fcada3..552f97172d 100644
--- a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_mappingparameters.go
+++ b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_mappingparameters.go
@@ -1,7 +1,7 @@
 package kinesisanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_MappingParameters AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.MappingParameters)
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_recordcolumn.go b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_recordcolumn.go
similarity index 93%
rename from goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_recordcolumn.go
rename to pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_recordcolumn.go
index 9f8125e9d9..5a9d764fb3 100644
--- a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_recordcolumn.go
+++ b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_recordcolumn.go
@@ -1,9 +1,9 @@
 package kinesisanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_RecordColumn AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.RecordColumn)
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_recordformat.go b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_recordformat.go
similarity index 93%
rename from goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_recordformat.go
rename to pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_recordformat.go
index 8453c24a46..b68e919ed3 100644
--- a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_recordformat.go
+++ b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_recordformat.go
@@ -1,9 +1,9 @@
 package kinesisanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_RecordFormat AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.RecordFormat)
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput.go b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput.go
similarity index 96%
rename from goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput.go
rename to pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput.go
index e3775441e4..73d62d5c44 100644
--- a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput.go
+++ b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationOutput AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationOutput)
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_destinationschema.go b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_destinationschema.go
similarity index 92%
rename from goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_destinationschema.go
rename to pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_destinationschema.go
index a9553bf286..b708a2d5d3 100644
--- a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_destinationschema.go
+++ b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_destinationschema.go
@@ -1,9 +1,9 @@
 package kinesisanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationOutput_DestinationSchema AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationOutput.DestinationSchema)
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_kinesisfirehoseoutput.go b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_kinesisfirehoseoutput.go
similarity index 93%
rename from goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_kinesisfirehoseoutput.go
rename to pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_kinesisfirehoseoutput.go
index a96422fabe..19d9da1677 100644
--- a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_kinesisfirehoseoutput.go
+++ b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_kinesisfirehoseoutput.go
@@ -1,9 +1,9 @@
 package kinesisanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationOutput_KinesisFirehoseOutput AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationOutput.KinesisFirehoseOutput)
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_kinesisstreamsoutput.go b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_kinesisstreamsoutput.go
similarity index 93%
rename from goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_kinesisstreamsoutput.go
rename to pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_kinesisstreamsoutput.go
index 19944fecca..88579679c5 100644
--- a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_kinesisstreamsoutput.go
+++ b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_kinesisstreamsoutput.go
@@ -1,9 +1,9 @@
 package kinesisanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationOutput_KinesisStreamsOutput AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationOutput.KinesisStreamsOutput)
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_lambdaoutput.go b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_lambdaoutput.go
similarity index 93%
rename from goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_lambdaoutput.go
rename to pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_lambdaoutput.go
index d7d174c1f5..9560193460 100644
--- a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_lambdaoutput.go
+++ b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_lambdaoutput.go
@@ -1,9 +1,9 @@
 package kinesisanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationOutput_LambdaOutput AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationOutput.LambdaOutput)
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_output.go b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_output.go
similarity index 95%
rename from goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_output.go
rename to pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_output.go
index dd1164c9fc..920bb7e842 100644
--- a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_output.go
+++ b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_output.go
@@ -1,9 +1,9 @@
 package kinesisanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationOutput_Output AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationOutput.Output)
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource.go b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource.go
similarity index 97%
rename from goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource.go
rename to pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource.go
index 2234a99502..62e8a76b9b 100644
--- a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource.go
+++ b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationReferenceDataSource AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationReferenceDataSource)
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_csvmappingparameters.go b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_csvmappingparameters.go
similarity index 94%
rename from goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_csvmappingparameters.go
rename to pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_csvmappingparameters.go
index 8d87036b1b..b6fb13d96b 100644
--- a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_csvmappingparameters.go
+++ b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_csvmappingparameters.go
@@ -1,9 +1,9 @@
 package kinesisanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationReferenceDataSource_CSVMappingParameters AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationReferenceDataSource.CSVMappingParameters)
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_jsonmappingparameters.go b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_jsonmappingparameters.go
similarity index 92%
rename from goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_jsonmappingparameters.go
rename to pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_jsonmappingparameters.go
index 8d6fbb571b..0b27671d8a 100644
--- a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_jsonmappingparameters.go
+++ b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_jsonmappingparameters.go
@@ -1,9 +1,9 @@
 package kinesisanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationReferenceDataSource_JSONMappingParameters AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationReferenceDataSource.JSONMappingParameters)
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_mappingparameters.go b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_mappingparameters.go
similarity index 96%
rename from goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_mappingparameters.go
rename to pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_mappingparameters.go
index 3828b8638a..e8953ef790 100644
--- a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_mappingparameters.go
+++ b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_mappingparameters.go
@@ -1,7 +1,7 @@
 package kinesisanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationReferenceDataSource_MappingParameters AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationReferenceDataSource.MappingParameters)
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_recordcolumn.go b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_recordcolumn.go
similarity index 94%
rename from goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_recordcolumn.go
rename to pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_recordcolumn.go
index 0109ceea16..fbdf658b0a 100644
--- a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_recordcolumn.go
+++ b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_recordcolumn.go
@@ -1,9 +1,9 @@
 package kinesisanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationReferenceDataSource_RecordColumn AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationReferenceDataSource.RecordColumn)
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_recordformat.go b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_recordformat.go
similarity index 93%
rename from goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_recordformat.go
rename to pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_recordformat.go
index ac34a00d4a..44ee05fee5 100644
--- a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_recordformat.go
+++ b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_recordformat.go
@@ -1,9 +1,9 @@
 package kinesisanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationReferenceDataSource_RecordFormat AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationReferenceDataSource.RecordFormat)
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_referencedatasource.go b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_referencedatasource.go
similarity index 94%
rename from goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_referencedatasource.go
rename to pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_referencedatasource.go
index 524d8dcae7..85a16f20fe 100644
--- a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_referencedatasource.go
+++ b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_referencedatasource.go
@@ -1,9 +1,9 @@
 package kinesisanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationReferenceDataSource_ReferenceDataSource AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationReferenceDataSource.ReferenceDataSource)
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_referenceschema.go b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_referenceschema.go
similarity index 94%
rename from goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_referenceschema.go
rename to pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_referenceschema.go
index e26b806058..d50412d52d 100644
--- a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_referenceschema.go
+++ b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_referenceschema.go
@@ -1,9 +1,9 @@
 package kinesisanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationReferenceDataSource_ReferenceSchema AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationReferenceDataSource.ReferenceSchema)
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_s3referencedatasource.go b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_s3referencedatasource.go
similarity index 94%
rename from goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_s3referencedatasource.go
rename to pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_s3referencedatasource.go
index 34f8121c9f..dac009fb41 100644
--- a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_s3referencedatasource.go
+++ b/pkg/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_s3referencedatasource.go
@@ -1,9 +1,9 @@
 package kinesisanalytics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationReferenceDataSource_S3ReferenceDataSource AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationReferenceDataSource.S3ReferenceDataSource)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application.go
similarity index 96%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application.go
index 31d47263b0..c045fa9bd3 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationcodeconfiguration.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationcodeconfiguration.go
similarity index 93%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationcodeconfiguration.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationcodeconfiguration.go
index 78c2fb8093..a333c7e8e7 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationcodeconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationcodeconfiguration.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_ApplicationCodeConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.ApplicationCodeConfiguration)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationconfiguration.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationconfiguration.go
similarity index 98%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationconfiguration.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationconfiguration.go
index c4c8034138..0afa768fb3 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationconfiguration.go
@@ -1,7 +1,7 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_ApplicationConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.ApplicationConfiguration)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationsnapshotconfiguration.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationsnapshotconfiguration.go
similarity index 92%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationsnapshotconfiguration.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationsnapshotconfiguration.go
index 9434167528..3be1b0a12f 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationsnapshotconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationsnapshotconfiguration.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_ApplicationSnapshotConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.ApplicationSnapshotConfiguration)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_catalogconfiguration.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_catalogconfiguration.go
similarity index 96%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_catalogconfiguration.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_catalogconfiguration.go
index 5b1b04bda7..549b14add3 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_catalogconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_catalogconfiguration.go
@@ -1,7 +1,7 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_CatalogConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.CatalogConfiguration)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_checkpointconfiguration.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_checkpointconfiguration.go
similarity index 95%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_checkpointconfiguration.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_checkpointconfiguration.go
index e5ada9ccb7..614a1274f3 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_checkpointconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_checkpointconfiguration.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_CheckpointConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.CheckpointConfiguration)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_codecontent.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_codecontent.go
similarity index 94%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_codecontent.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_codecontent.go
index f90fb39843..759f6722ba 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_codecontent.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_codecontent.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_CodeContent AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.CodeContent)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_csvmappingparameters.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_csvmappingparameters.go
similarity index 93%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_csvmappingparameters.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_csvmappingparameters.go
index d80e8adb9d..c7dfc980fa 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_csvmappingparameters.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_csvmappingparameters.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_CSVMappingParameters AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.CSVMappingParameters)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_customartifactconfiguration.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_customartifactconfiguration.go
similarity index 94%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_customartifactconfiguration.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_customartifactconfiguration.go
index f51a949286..66885d68ec 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_customartifactconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_customartifactconfiguration.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_CustomArtifactConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.CustomArtifactConfiguration)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_customartifactsconfiguration.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_customartifactsconfiguration.go
similarity index 95%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_customartifactsconfiguration.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_customartifactsconfiguration.go
index f43e53a8b2..054f546f83 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_customartifactsconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_customartifactsconfiguration.go
@@ -1,7 +1,7 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_CustomArtifactsConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.CustomArtifactsConfiguration)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_deployasapplicationconfiguration.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_deployasapplicationconfiguration.go
similarity index 96%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_deployasapplicationconfiguration.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_deployasapplicationconfiguration.go
index 689f35dffa..ccaef9c3d3 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_deployasapplicationconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_deployasapplicationconfiguration.go
@@ -1,7 +1,7 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_DeployAsApplicationConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.DeployAsApplicationConfiguration)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_environmentproperties.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_environmentproperties.go
similarity index 95%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_environmentproperties.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_environmentproperties.go
index b3c68c4228..574794753e 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_environmentproperties.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_environmentproperties.go
@@ -1,7 +1,7 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_EnvironmentProperties AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.EnvironmentProperties)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_flinkapplicationconfiguration.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_flinkapplicationconfiguration.go
similarity index 97%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_flinkapplicationconfiguration.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_flinkapplicationconfiguration.go
index d935d3dd84..6ce150979c 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_flinkapplicationconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_flinkapplicationconfiguration.go
@@ -1,7 +1,7 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_FlinkApplicationConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.FlinkApplicationConfiguration)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_gluedatacatalogconfiguration.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_gluedatacatalogconfiguration.go
similarity index 92%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_gluedatacatalogconfiguration.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_gluedatacatalogconfiguration.go
index abbb9bd92d..a685d41dbe 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_gluedatacatalogconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_gluedatacatalogconfiguration.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_GlueDataCatalogConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.GlueDataCatalogConfiguration)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_input.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_input.go
similarity index 95%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_input.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_input.go
index 6f91eb9643..4c391355e5 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_input.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_input.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_Input AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.Input)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputlambdaprocessor.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputlambdaprocessor.go
similarity index 92%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputlambdaprocessor.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputlambdaprocessor.go
index 59f4fdb831..064c8a2423 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputlambdaprocessor.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputlambdaprocessor.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_InputLambdaProcessor AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.InputLambdaProcessor)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputparallelism.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputparallelism.go
similarity index 92%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputparallelism.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputparallelism.go
index 3aa75219cf..1dde1fae9b 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputparallelism.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputparallelism.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_InputParallelism AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.InputParallelism)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputprocessingconfiguration.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputprocessingconfiguration.go
similarity index 96%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputprocessingconfiguration.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputprocessingconfiguration.go
index d29df1ef49..408ff72397 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputprocessingconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputprocessingconfiguration.go
@@ -1,7 +1,7 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_InputProcessingConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.InputProcessingConfiguration)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputschema.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputschema.go
similarity index 94%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputschema.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputschema.go
index 48337c43d5..78bb2a498e 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputschema.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputschema.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_InputSchema AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.InputSchema)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_jsonmappingparameters.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_jsonmappingparameters.go
similarity index 92%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_jsonmappingparameters.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_jsonmappingparameters.go
index 37e1738164..100b62cbad 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_jsonmappingparameters.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_jsonmappingparameters.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_JSONMappingParameters AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.JSONMappingParameters)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_kinesisfirehoseinput.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_kinesisfirehoseinput.go
similarity index 92%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_kinesisfirehoseinput.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_kinesisfirehoseinput.go
index 1efc9ceed3..385bf02606 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_kinesisfirehoseinput.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_kinesisfirehoseinput.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_KinesisFirehoseInput AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.KinesisFirehoseInput)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_kinesisstreamsinput.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_kinesisstreamsinput.go
similarity index 92%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_kinesisstreamsinput.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_kinesisstreamsinput.go
index 517d70b7a9..16e56e3c08 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_kinesisstreamsinput.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_kinesisstreamsinput.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_KinesisStreamsInput AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.KinesisStreamsInput)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_mappingparameters.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_mappingparameters.go
similarity index 96%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_mappingparameters.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_mappingparameters.go
index 6b46b9d27d..7f1fb36c31 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_mappingparameters.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_mappingparameters.go
@@ -1,7 +1,7 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_MappingParameters AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.MappingParameters)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_mavenreference.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_mavenreference.go
similarity index 94%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_mavenreference.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_mavenreference.go
index a8fb1eefd7..cbf131911b 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_mavenreference.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_mavenreference.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_MavenReference AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.MavenReference)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_monitoringconfiguration.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_monitoringconfiguration.go
similarity index 94%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_monitoringconfiguration.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_monitoringconfiguration.go
index 990c231311..71b9e6e6ed 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_monitoringconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_monitoringconfiguration.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_MonitoringConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.MonitoringConfiguration)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_parallelismconfiguration.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_parallelismconfiguration.go
similarity index 95%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_parallelismconfiguration.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_parallelismconfiguration.go
index 437116ded7..94e7d2a764 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_parallelismconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_parallelismconfiguration.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_ParallelismConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.ParallelismConfiguration)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_propertygroup.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_propertygroup.go
similarity index 93%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_propertygroup.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_propertygroup.go
index a8b3b6962d..4784ff8793 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_propertygroup.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_propertygroup.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_PropertyGroup AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.PropertyGroup)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_recordcolumn.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_recordcolumn.go
similarity index 93%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_recordcolumn.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_recordcolumn.go
index 5bc34cf774..c1e68d04f5 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_recordcolumn.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_recordcolumn.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_RecordColumn AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.RecordColumn)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_recordformat.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_recordformat.go
similarity index 93%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_recordformat.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_recordformat.go
index 3f8e7c0524..06ad4e405f 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_recordformat.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_recordformat.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_RecordFormat AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.RecordFormat)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_s3contentbaselocation.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_s3contentbaselocation.go
similarity index 93%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_s3contentbaselocation.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_s3contentbaselocation.go
index 8785363a5d..052fc3a3f9 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_s3contentbaselocation.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_s3contentbaselocation.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_S3ContentBaseLocation AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.S3ContentBaseLocation)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_s3contentlocation.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_s3contentlocation.go
similarity index 94%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_s3contentlocation.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_s3contentlocation.go
index 1c7ab41428..ccc80ff1c5 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_s3contentlocation.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_s3contentlocation.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_S3ContentLocation AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.S3ContentLocation)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_sqlapplicationconfiguration.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_sqlapplicationconfiguration.go
similarity index 96%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_sqlapplicationconfiguration.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_sqlapplicationconfiguration.go
index 69ef2d2d77..96690a828c 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_sqlapplicationconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_sqlapplicationconfiguration.go
@@ -1,7 +1,7 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_SqlApplicationConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.SqlApplicationConfiguration)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_zeppelinapplicationconfiguration.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_zeppelinapplicationconfiguration.go
similarity index 97%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_zeppelinapplicationconfiguration.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_zeppelinapplicationconfiguration.go
index 65cd36ac47..d0a1c8e0f2 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_zeppelinapplicationconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_zeppelinapplicationconfiguration.go
@@ -1,7 +1,7 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_ZeppelinApplicationConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.ZeppelinApplicationConfiguration)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_zeppelinmonitoringconfiguration.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_zeppelinmonitoringconfiguration.go
similarity index 92%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_zeppelinmonitoringconfiguration.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_zeppelinmonitoringconfiguration.go
index 766391514f..89ddde1526 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_zeppelinmonitoringconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_zeppelinmonitoringconfiguration.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_ZeppelinMonitoringConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.ZeppelinMonitoringConfiguration)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationcloudwatchloggingoption.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationcloudwatchloggingoption.go
similarity index 97%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationcloudwatchloggingoption.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationcloudwatchloggingoption.go
index cad9fda5b9..314d8b7374 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationcloudwatchloggingoption.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationcloudwatchloggingoption.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationCloudWatchLoggingOption AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationCloudWatchLoggingOption)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationcloudwatchloggingoption_cloudwatchloggingoption.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationcloudwatchloggingoption_cloudwatchloggingoption.go
similarity index 93%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationcloudwatchloggingoption_cloudwatchloggingoption.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationcloudwatchloggingoption_cloudwatchloggingoption.go
index c3eb975ae6..28573add7f 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationcloudwatchloggingoption_cloudwatchloggingoption.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationcloudwatchloggingoption_cloudwatchloggingoption.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationCloudWatchLoggingOption_CloudWatchLoggingOption AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationCloudWatchLoggingOption.CloudWatchLoggingOption)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput.go
similarity index 96%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput.go
index 244671eff1..11d61e05a2 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationOutput AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationOutput)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_destinationschema.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_destinationschema.go
similarity index 92%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_destinationschema.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_destinationschema.go
index 34d9359a01..f33509e163 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_destinationschema.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_destinationschema.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationOutput_DestinationSchema AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationOutput.DestinationSchema)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_kinesisfirehoseoutput.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_kinesisfirehoseoutput.go
similarity index 92%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_kinesisfirehoseoutput.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_kinesisfirehoseoutput.go
index 58b69cd764..7db612f9f9 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_kinesisfirehoseoutput.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_kinesisfirehoseoutput.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationOutput_KinesisFirehoseOutput AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationOutput.KinesisFirehoseOutput)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_kinesisstreamsoutput.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_kinesisstreamsoutput.go
similarity index 92%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_kinesisstreamsoutput.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_kinesisstreamsoutput.go
index d6a0a945bb..d6fa250b44 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_kinesisstreamsoutput.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_kinesisstreamsoutput.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationOutput_KinesisStreamsOutput AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationOutput.KinesisStreamsOutput)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_lambdaoutput.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_lambdaoutput.go
similarity index 92%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_lambdaoutput.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_lambdaoutput.go
index fa89ec4713..bff0d139a8 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_lambdaoutput.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_lambdaoutput.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationOutput_LambdaOutput AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationOutput.LambdaOutput)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_output.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_output.go
similarity index 95%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_output.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_output.go
index 35d9dcd586..e9cb074fc8 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_output.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_output.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationOutput_Output AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationOutput.Output)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource.go
similarity index 97%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource.go
index 12aa07c32d..eee46d1ded 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationReferenceDataSource AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_csvmappingparameters.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_csvmappingparameters.go
similarity index 94%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_csvmappingparameters.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_csvmappingparameters.go
index a0cb9aa090..c68485a53b 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_csvmappingparameters.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_csvmappingparameters.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationReferenceDataSource_CSVMappingParameters AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.CSVMappingParameters)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_jsonmappingparameters.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_jsonmappingparameters.go
similarity index 92%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_jsonmappingparameters.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_jsonmappingparameters.go
index 0f67c035e6..7059aa8557 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_jsonmappingparameters.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_jsonmappingparameters.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationReferenceDataSource_JSONMappingParameters AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.JSONMappingParameters)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_mappingparameters.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_mappingparameters.go
similarity index 97%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_mappingparameters.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_mappingparameters.go
index 354bf621c2..560c3e1ed6 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_mappingparameters.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_mappingparameters.go
@@ -1,7 +1,7 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationReferenceDataSource_MappingParameters AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.MappingParameters)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_recordcolumn.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_recordcolumn.go
similarity index 94%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_recordcolumn.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_recordcolumn.go
index 9f64d445bf..d6b1c79d8b 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_recordcolumn.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_recordcolumn.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationReferenceDataSource_RecordColumn AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.RecordColumn)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_recordformat.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_recordformat.go
similarity index 94%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_recordformat.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_recordformat.go
index 1fcc09f929..16204f76e1 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_recordformat.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_recordformat.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationReferenceDataSource_RecordFormat AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.RecordFormat)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_referencedatasource.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_referencedatasource.go
similarity index 95%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_referencedatasource.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_referencedatasource.go
index d8a99aa208..851a929fc1 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_referencedatasource.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_referencedatasource.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationReferenceDataSource_ReferenceDataSource AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.ReferenceDataSource)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_referenceschema.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_referenceschema.go
similarity index 94%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_referenceschema.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_referenceschema.go
index de83f58f5f..4b8ea32240 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_referenceschema.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_referenceschema.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationReferenceDataSource_ReferenceSchema AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.ReferenceSchema)
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_s3referencedatasource.go b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_s3referencedatasource.go
similarity index 93%
rename from goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_s3referencedatasource.go
rename to pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_s3referencedatasource.go
index 4a9553f630..6138eea3d3 100644
--- a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_s3referencedatasource.go
+++ b/pkg/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_s3referencedatasource.go
@@ -1,9 +1,9 @@
 package kinesisanalyticsv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationReferenceDataSource_S3ReferenceDataSource AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.S3ReferenceDataSource)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream.go
similarity index 97%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream.go
index d7e657b5d0..20d1be6ad7 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchservicebufferinghints.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchservicebufferinghints.go
similarity index 94%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchservicebufferinghints.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchservicebufferinghints.go
index d194e6dc29..c21a87200f 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchservicebufferinghints.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchservicebufferinghints.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_AmazonopensearchserviceBufferingHints AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceBufferingHints)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchservicedestinationconfiguration.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchservicedestinationconfiguration.go
similarity index 97%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchservicedestinationconfiguration.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchservicedestinationconfiguration.go
index 7569accd87..61619ceb07 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchservicedestinationconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchservicedestinationconfiguration.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_AmazonopensearchserviceDestinationConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceDestinationConfiguration)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchserviceretryoptions.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchserviceretryoptions.go
similarity index 92%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchserviceretryoptions.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchserviceretryoptions.go
index cacfadefb5..2b27942000 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchserviceretryoptions.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchserviceretryoptions.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_AmazonopensearchserviceRetryOptions AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceRetryOptions)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_bufferinghints.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_bufferinghints.go
similarity index 93%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_bufferinghints.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_bufferinghints.go
index 9e05c041ac..1186f5a854 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_bufferinghints.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_bufferinghints.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_BufferingHints AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.BufferingHints)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_cloudwatchloggingoptions.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_cloudwatchloggingoptions.go
similarity index 94%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_cloudwatchloggingoptions.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_cloudwatchloggingoptions.go
index 2d177c59ad..ab78d2afbe 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_cloudwatchloggingoptions.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_cloudwatchloggingoptions.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_CloudWatchLoggingOptions AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_copycommand.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_copycommand.go
similarity index 94%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_copycommand.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_copycommand.go
index 1a50c4b93d..cccf23da52 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_copycommand.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_copycommand.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_CopyCommand AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.CopyCommand)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_dataformatconversionconfiguration.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_dataformatconversionconfiguration.go
similarity index 95%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_dataformatconversionconfiguration.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_dataformatconversionconfiguration.go
index dc427b91c2..bbd994f9a4 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_dataformatconversionconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_dataformatconversionconfiguration.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_DataFormatConversionConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.DataFormatConversionConfiguration)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_deliverystreamencryptionconfigurationinput.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_deliverystreamencryptionconfigurationinput.go
similarity index 94%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_deliverystreamencryptionconfigurationinput.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_deliverystreamencryptionconfigurationinput.go
index 6272548ccb..9e1b1b457b 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_deliverystreamencryptionconfigurationinput.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_deliverystreamencryptionconfigurationinput.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_DeliveryStreamEncryptionConfigurationInput AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.DeliveryStreamEncryptionConfigurationInput)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_deserializer.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_deserializer.go
similarity index 96%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_deserializer.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_deserializer.go
index e262d25893..7b20677873 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_deserializer.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_deserializer.go
@@ -1,7 +1,7 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_Deserializer AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.Deserializer)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_dynamicpartitioningconfiguration.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_dynamicpartitioningconfiguration.go
similarity index 93%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_dynamicpartitioningconfiguration.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_dynamicpartitioningconfiguration.go
index 9dfe35a141..75ed81d388 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_dynamicpartitioningconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_dynamicpartitioningconfiguration.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_DynamicPartitioningConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.DynamicPartitioningConfiguration)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchbufferinghints.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchbufferinghints.go
similarity index 93%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchbufferinghints.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchbufferinghints.go
index 4b35ac5497..476e6c4b09 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchbufferinghints.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchbufferinghints.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_ElasticsearchBufferingHints AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.ElasticsearchBufferingHints)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchdestinationconfiguration.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchdestinationconfiguration.go
similarity index 97%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchdestinationconfiguration.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchdestinationconfiguration.go
index ee5a972b73..741ee19a73 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchdestinationconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchdestinationconfiguration.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_ElasticsearchDestinationConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.ElasticsearchDestinationConfiguration)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchretryoptions.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchretryoptions.go
similarity index 92%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchretryoptions.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchretryoptions.go
index 13a29b51c6..ecfb95c678 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchretryoptions.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchretryoptions.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_ElasticsearchRetryOptions AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.ElasticsearchRetryOptions)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_encryptionconfiguration.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_encryptionconfiguration.go
similarity index 93%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_encryptionconfiguration.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_encryptionconfiguration.go
index 35aa54863d..1b3f992162 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_encryptionconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_encryptionconfiguration.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_EncryptionConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.EncryptionConfiguration)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_extendeds3destinationconfiguration.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_extendeds3destinationconfiguration.go
similarity index 97%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_extendeds3destinationconfiguration.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_extendeds3destinationconfiguration.go
index 62723bd639..bf443cf51e 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_extendeds3destinationconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_extendeds3destinationconfiguration.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_ExtendedS3DestinationConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.ExtendedS3DestinationConfiguration)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_hivejsonserde.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_hivejsonserde.go
similarity index 92%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_hivejsonserde.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_hivejsonserde.go
index 1ca59c7a10..b1a15978c0 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_hivejsonserde.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_hivejsonserde.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_HiveJsonSerDe AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.HiveJsonSerDe)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointcommonattribute.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointcommonattribute.go
similarity index 93%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointcommonattribute.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointcommonattribute.go
index 74a512df57..91cb42273c 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointcommonattribute.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointcommonattribute.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_HttpEndpointCommonAttribute AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.HttpEndpointCommonAttribute)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointconfiguration.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointconfiguration.go
similarity index 94%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointconfiguration.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointconfiguration.go
index 7adf824943..044c85e660 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointconfiguration.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_HttpEndpointConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.HttpEndpointConfiguration)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointdestinationconfiguration.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointdestinationconfiguration.go
similarity index 97%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointdestinationconfiguration.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointdestinationconfiguration.go
index 712e67a377..f418c0ff8a 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointdestinationconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointdestinationconfiguration.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_HttpEndpointDestinationConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.HttpEndpointDestinationConfiguration)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointrequestconfiguration.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointrequestconfiguration.go
similarity index 94%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointrequestconfiguration.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointrequestconfiguration.go
index 7b5199019f..85d019ca27 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointrequestconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointrequestconfiguration.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_HttpEndpointRequestConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.HttpEndpointRequestConfiguration)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_inputformatconfiguration.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_inputformatconfiguration.go
similarity index 96%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_inputformatconfiguration.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_inputformatconfiguration.go
index 0c42560bf7..1456cea5e3 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_inputformatconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_inputformatconfiguration.go
@@ -1,7 +1,7 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_InputFormatConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.InputFormatConfiguration)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_kinesisstreamsourceconfiguration.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_kinesisstreamsourceconfiguration.go
similarity index 93%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_kinesisstreamsourceconfiguration.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_kinesisstreamsourceconfiguration.go
index 2d6ac9d439..286e225a19 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_kinesisstreamsourceconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_kinesisstreamsourceconfiguration.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_KinesisStreamSourceConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.KinesisStreamSourceConfiguration)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_kmsencryptionconfig.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_kmsencryptionconfig.go
similarity index 92%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_kmsencryptionconfig.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_kmsencryptionconfig.go
index f98f15e632..4eb90cfc7e 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_kmsencryptionconfig.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_kmsencryptionconfig.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_KMSEncryptionConfig AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.KMSEncryptionConfig)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_openxjsonserde.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_openxjsonserde.go
similarity index 94%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_openxjsonserde.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_openxjsonserde.go
index 5a6e1848ae..8ec094d5f7 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_openxjsonserde.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_openxjsonserde.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_OpenXJsonSerDe AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.OpenXJsonSerDe)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_orcserde.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_orcserde.go
similarity index 97%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_orcserde.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_orcserde.go
index a99c06bbc7..75b30f1b96 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_orcserde.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_orcserde.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_OrcSerDe AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.OrcSerDe)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_outputformatconfiguration.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_outputformatconfiguration.go
similarity index 96%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_outputformatconfiguration.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_outputformatconfiguration.go
index e29d45e4f4..946f42acb3 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_outputformatconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_outputformatconfiguration.go
@@ -1,7 +1,7 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_OutputFormatConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.OutputFormatConfiguration)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_parquetserde.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_parquetserde.go
similarity index 95%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_parquetserde.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_parquetserde.go
index afe01453a0..40e98732c3 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_parquetserde.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_parquetserde.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_ParquetSerDe AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.ParquetSerDe)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processingconfiguration.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processingconfiguration.go
similarity index 93%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processingconfiguration.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processingconfiguration.go
index 5eb93096e0..f648859934 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processingconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processingconfiguration.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_ProcessingConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processor.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processor.go
similarity index 93%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processor.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processor.go
index 273de6d8cb..09070f0f01 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processor.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processor.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_Processor AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.Processor)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processorparameter.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processorparameter.go
similarity index 93%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processorparameter.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processorparameter.go
index ee191ee52f..4aad7766f1 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processorparameter.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processorparameter.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_ProcessorParameter AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.ProcessorParameter)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_redshiftdestinationconfiguration.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_redshiftdestinationconfiguration.go
similarity index 97%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_redshiftdestinationconfiguration.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_redshiftdestinationconfiguration.go
index 451c74d833..5805e4aa2e 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_redshiftdestinationconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_redshiftdestinationconfiguration.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_RedshiftDestinationConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.RedshiftDestinationConfiguration)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_redshiftretryoptions.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_redshiftretryoptions.go
similarity index 92%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_redshiftretryoptions.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_redshiftretryoptions.go
index 5d9a32137d..04d63bad86 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_redshiftretryoptions.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_redshiftretryoptions.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_RedshiftRetryOptions AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.RedshiftRetryOptions)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_retryoptions.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_retryoptions.go
similarity index 92%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_retryoptions.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_retryoptions.go
index 075d6ff2ec..5fccfbfbf4 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_retryoptions.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_retryoptions.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_RetryOptions AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.RetryOptions)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_s3destinationconfiguration.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_s3destinationconfiguration.go
similarity index 96%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_s3destinationconfiguration.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_s3destinationconfiguration.go
index 2190e38c66..c81a13c2de 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_s3destinationconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_s3destinationconfiguration.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_S3DestinationConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_schemaconfiguration.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_schemaconfiguration.go
similarity index 95%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_schemaconfiguration.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_schemaconfiguration.go
index a4116792a7..02d44da511 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_schemaconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_schemaconfiguration.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_SchemaConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.SchemaConfiguration)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_serializer.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_serializer.go
similarity index 96%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_serializer.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_serializer.go
index 1beae7dd5e..94b7d46dce 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_serializer.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_serializer.go
@@ -1,7 +1,7 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_Serializer AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.Serializer)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_splunkdestinationconfiguration.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_splunkdestinationconfiguration.go
similarity index 97%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_splunkdestinationconfiguration.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_splunkdestinationconfiguration.go
index 27b31fabda..5318db3f3f 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_splunkdestinationconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_splunkdestinationconfiguration.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_SplunkDestinationConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.SplunkDestinationConfiguration)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_splunkretryoptions.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_splunkretryoptions.go
similarity index 92%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_splunkretryoptions.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_splunkretryoptions.go
index 11c6d0056f..e566c812e8 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_splunkretryoptions.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_splunkretryoptions.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_SplunkRetryOptions AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.SplunkRetryOptions)
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_vpcconfiguration.go b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_vpcconfiguration.go
similarity index 94%
rename from goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_vpcconfiguration.go
rename to pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_vpcconfiguration.go
index 7bcc49666b..9662e84698 100644
--- a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_vpcconfiguration.go
+++ b/pkg/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_vpcconfiguration.go
@@ -1,9 +1,9 @@
 package kinesisfirehose
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeliveryStream_VpcConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.VpcConfiguration)
diff --git a/goformation/cloudformation/kms/aws-kms-alias.go b/pkg/goformation/cloudformation/kms/aws-kms-alias.go
similarity index 96%
rename from goformation/cloudformation/kms/aws-kms-alias.go
rename to pkg/goformation/cloudformation/kms/aws-kms-alias.go
index b820b14834..d030dc381a 100644
--- a/goformation/cloudformation/kms/aws-kms-alias.go
+++ b/pkg/goformation/cloudformation/kms/aws-kms-alias.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Alias AWS CloudFormation Resource (AWS::KMS::Alias)
diff --git a/goformation/cloudformation/kms/aws-kms-key.go b/pkg/goformation/cloudformation/kms/aws-kms-key.go
similarity index 96%
rename from goformation/cloudformation/kms/aws-kms-key.go
rename to pkg/goformation/cloudformation/kms/aws-kms-key.go
index adaf9b963e..210ed86f90 100644
--- a/goformation/cloudformation/kms/aws-kms-key.go
+++ b/pkg/goformation/cloudformation/kms/aws-kms-key.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Key AWS CloudFormation Resource (AWS::KMS::Key)
diff --git a/goformation/cloudformation/kms/aws-kms-replicakey.go b/pkg/goformation/cloudformation/kms/aws-kms-replicakey.go
similarity index 95%
rename from goformation/cloudformation/kms/aws-kms-replicakey.go
rename to pkg/goformation/cloudformation/kms/aws-kms-replicakey.go
index 49079bbf10..7a9c3e9a49 100644
--- a/goformation/cloudformation/kms/aws-kms-replicakey.go
+++ b/pkg/goformation/cloudformation/kms/aws-kms-replicakey.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReplicaKey AWS CloudFormation Resource (AWS::KMS::ReplicaKey)
diff --git a/goformation/cloudformation/lakeformation/aws-lakeformation-datalakesettings.go b/pkg/goformation/cloudformation/lakeformation/aws-lakeformation-datalakesettings.go
similarity index 96%
rename from goformation/cloudformation/lakeformation/aws-lakeformation-datalakesettings.go
rename to pkg/goformation/cloudformation/lakeformation/aws-lakeformation-datalakesettings.go
index 6282732004..5083e36dbf 100644
--- a/goformation/cloudformation/lakeformation/aws-lakeformation-datalakesettings.go
+++ b/pkg/goformation/cloudformation/lakeformation/aws-lakeformation-datalakesettings.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataLakeSettings AWS CloudFormation Resource (AWS::LakeFormation::DataLakeSettings)
diff --git a/goformation/cloudformation/lakeformation/aws-lakeformation-datalakesettings_admins.go b/pkg/goformation/cloudformation/lakeformation/aws-lakeformation-datalakesettings_admins.go
similarity index 94%
rename from goformation/cloudformation/lakeformation/aws-lakeformation-datalakesettings_admins.go
rename to pkg/goformation/cloudformation/lakeformation/aws-lakeformation-datalakesettings_admins.go
index e913a3c9c5..c4ab9b87a1 100644
--- a/goformation/cloudformation/lakeformation/aws-lakeformation-datalakesettings_admins.go
+++ b/pkg/goformation/cloudformation/lakeformation/aws-lakeformation-datalakesettings_admins.go
@@ -1,7 +1,7 @@
 package lakeformation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataLakeSettings_Admins AWS CloudFormation Resource (AWS::LakeFormation::DataLakeSettings.Admins)
diff --git a/goformation/cloudformation/lakeformation/aws-lakeformation-datalakesettings_datalakeprincipal.go b/pkg/goformation/cloudformation/lakeformation/aws-lakeformation-datalakesettings_datalakeprincipal.go
similarity index 92%
rename from goformation/cloudformation/lakeformation/aws-lakeformation-datalakesettings_datalakeprincipal.go
rename to pkg/goformation/cloudformation/lakeformation/aws-lakeformation-datalakesettings_datalakeprincipal.go
index 8a30a18a9b..ca20e9304c 100644
--- a/goformation/cloudformation/lakeformation/aws-lakeformation-datalakesettings_datalakeprincipal.go
+++ b/pkg/goformation/cloudformation/lakeformation/aws-lakeformation-datalakesettings_datalakeprincipal.go
@@ -1,9 +1,9 @@
 package lakeformation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataLakeSettings_DataLakePrincipal AWS CloudFormation Resource (AWS::LakeFormation::DataLakeSettings.DataLakePrincipal)
diff --git a/goformation/cloudformation/lakeformation/aws-lakeformation-permissions.go b/pkg/goformation/cloudformation/lakeformation/aws-lakeformation-permissions.go
similarity index 97%
rename from goformation/cloudformation/lakeformation/aws-lakeformation-permissions.go
rename to pkg/goformation/cloudformation/lakeformation/aws-lakeformation-permissions.go
index d8277c3dc0..e39e041687 100644
--- a/goformation/cloudformation/lakeformation/aws-lakeformation-permissions.go
+++ b/pkg/goformation/cloudformation/lakeformation/aws-lakeformation-permissions.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Permissions AWS CloudFormation Resource (AWS::LakeFormation::Permissions)
diff --git a/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_columnwildcard.go b/pkg/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_columnwildcard.go
similarity index 92%
rename from goformation/cloudformation/lakeformation/aws-lakeformation-permissions_columnwildcard.go
rename to pkg/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_columnwildcard.go
index d3cac9e59e..0eefee44ec 100644
--- a/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_columnwildcard.go
+++ b/pkg/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_columnwildcard.go
@@ -1,9 +1,9 @@
 package lakeformation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Permissions_ColumnWildcard AWS CloudFormation Resource (AWS::LakeFormation::Permissions.ColumnWildcard)
diff --git a/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_databaseresource.go b/pkg/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_databaseresource.go
similarity index 93%
rename from goformation/cloudformation/lakeformation/aws-lakeformation-permissions_databaseresource.go
rename to pkg/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_databaseresource.go
index f492cc7af7..3606f008b2 100644
--- a/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_databaseresource.go
+++ b/pkg/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_databaseresource.go
@@ -1,9 +1,9 @@
 package lakeformation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Permissions_DatabaseResource AWS CloudFormation Resource (AWS::LakeFormation::Permissions.DatabaseResource)
diff --git a/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_datalakeprincipal.go b/pkg/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_datalakeprincipal.go
similarity index 92%
rename from goformation/cloudformation/lakeformation/aws-lakeformation-permissions_datalakeprincipal.go
rename to pkg/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_datalakeprincipal.go
index fe616b3913..60c947c447 100644
--- a/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_datalakeprincipal.go
+++ b/pkg/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_datalakeprincipal.go
@@ -1,9 +1,9 @@
 package lakeformation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Permissions_DataLakePrincipal AWS CloudFormation Resource (AWS::LakeFormation::Permissions.DataLakePrincipal)
diff --git a/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_datalocationresource.go b/pkg/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_datalocationresource.go
similarity index 93%
rename from goformation/cloudformation/lakeformation/aws-lakeformation-permissions_datalocationresource.go
rename to pkg/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_datalocationresource.go
index 3e1d6538c2..4928f7d3c1 100644
--- a/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_datalocationresource.go
+++ b/pkg/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_datalocationresource.go
@@ -1,9 +1,9 @@
 package lakeformation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Permissions_DataLocationResource AWS CloudFormation Resource (AWS::LakeFormation::Permissions.DataLocationResource)
diff --git a/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_resource.go b/pkg/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_resource.go
similarity index 97%
rename from goformation/cloudformation/lakeformation/aws-lakeformation-permissions_resource.go
rename to pkg/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_resource.go
index 7aa7a41eb4..8ef0c44b27 100644
--- a/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_resource.go
+++ b/pkg/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_resource.go
@@ -1,7 +1,7 @@
 package lakeformation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Permissions_Resource AWS CloudFormation Resource (AWS::LakeFormation::Permissions.Resource)
diff --git a/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_tableresource.go b/pkg/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_tableresource.go
similarity index 94%
rename from goformation/cloudformation/lakeformation/aws-lakeformation-permissions_tableresource.go
rename to pkg/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_tableresource.go
index e7c0cac53e..28bfb59a76 100644
--- a/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_tableresource.go
+++ b/pkg/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_tableresource.go
@@ -1,9 +1,9 @@
 package lakeformation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Permissions_TableResource AWS CloudFormation Resource (AWS::LakeFormation::Permissions.TableResource)
diff --git a/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_tablewildcard.go b/pkg/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_tablewildcard.go
similarity index 94%
rename from goformation/cloudformation/lakeformation/aws-lakeformation-permissions_tablewildcard.go
rename to pkg/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_tablewildcard.go
index 1b78580112..c2171be9fc 100644
--- a/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_tablewildcard.go
+++ b/pkg/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_tablewildcard.go
@@ -1,7 +1,7 @@
 package lakeformation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Permissions_TableWildcard AWS CloudFormation Resource (AWS::LakeFormation::Permissions.TableWildcard)
diff --git a/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_tablewithcolumnsresource.go b/pkg/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_tablewithcolumnsresource.go
similarity index 95%
rename from goformation/cloudformation/lakeformation/aws-lakeformation-permissions_tablewithcolumnsresource.go
rename to pkg/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_tablewithcolumnsresource.go
index 1bf6bd286f..1b4f0fd7e6 100644
--- a/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_tablewithcolumnsresource.go
+++ b/pkg/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_tablewithcolumnsresource.go
@@ -1,9 +1,9 @@
 package lakeformation
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Permissions_TableWithColumnsResource AWS CloudFormation Resource (AWS::LakeFormation::Permissions.TableWithColumnsResource)
diff --git a/goformation/cloudformation/lakeformation/aws-lakeformation-resource.go b/pkg/goformation/cloudformation/lakeformation/aws-lakeformation-resource.go
similarity index 96%
rename from goformation/cloudformation/lakeformation/aws-lakeformation-resource.go
rename to pkg/goformation/cloudformation/lakeformation/aws-lakeformation-resource.go
index 36ac622c9a..8a85a17f20 100644
--- a/goformation/cloudformation/lakeformation/aws-lakeformation-resource.go
+++ b/pkg/goformation/cloudformation/lakeformation/aws-lakeformation-resource.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Resource AWS CloudFormation Resource (AWS::LakeFormation::Resource)
diff --git a/goformation/cloudformation/lambda/aws-lambda-alias.go b/pkg/goformation/cloudformation/lambda/aws-lambda-alias.go
similarity index 97%
rename from goformation/cloudformation/lambda/aws-lambda-alias.go
rename to pkg/goformation/cloudformation/lambda/aws-lambda-alias.go
index 45f807e8b0..14892010b5 100644
--- a/goformation/cloudformation/lambda/aws-lambda-alias.go
+++ b/pkg/goformation/cloudformation/lambda/aws-lambda-alias.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Alias AWS CloudFormation Resource (AWS::Lambda::Alias)
diff --git a/goformation/cloudformation/lambda/aws-lambda-alias_aliasroutingconfiguration.go b/pkg/goformation/cloudformation/lambda/aws-lambda-alias_aliasroutingconfiguration.go
similarity index 95%
rename from goformation/cloudformation/lambda/aws-lambda-alias_aliasroutingconfiguration.go
rename to pkg/goformation/cloudformation/lambda/aws-lambda-alias_aliasroutingconfiguration.go
index ec33f8723a..57a7e3f74d 100644
--- a/goformation/cloudformation/lambda/aws-lambda-alias_aliasroutingconfiguration.go
+++ b/pkg/goformation/cloudformation/lambda/aws-lambda-alias_aliasroutingconfiguration.go
@@ -1,7 +1,7 @@
 package lambda
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Alias_AliasRoutingConfiguration AWS CloudFormation Resource (AWS::Lambda::Alias.AliasRoutingConfiguration)
diff --git a/goformation/cloudformation/lambda/aws-lambda-alias_provisionedconcurrencyconfiguration.go b/pkg/goformation/cloudformation/lambda/aws-lambda-alias_provisionedconcurrencyconfiguration.go
similarity index 92%
rename from goformation/cloudformation/lambda/aws-lambda-alias_provisionedconcurrencyconfiguration.go
rename to pkg/goformation/cloudformation/lambda/aws-lambda-alias_provisionedconcurrencyconfiguration.go
index 0bb2700648..a4452981ff 100644
--- a/goformation/cloudformation/lambda/aws-lambda-alias_provisionedconcurrencyconfiguration.go
+++ b/pkg/goformation/cloudformation/lambda/aws-lambda-alias_provisionedconcurrencyconfiguration.go
@@ -1,9 +1,9 @@
 package lambda
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Alias_ProvisionedConcurrencyConfiguration AWS CloudFormation Resource (AWS::Lambda::Alias.ProvisionedConcurrencyConfiguration)
diff --git a/goformation/cloudformation/lambda/aws-lambda-alias_versionweight.go b/pkg/goformation/cloudformation/lambda/aws-lambda-alias_versionweight.go
similarity index 92%
rename from goformation/cloudformation/lambda/aws-lambda-alias_versionweight.go
rename to pkg/goformation/cloudformation/lambda/aws-lambda-alias_versionweight.go
index 4591c7e0a5..56f8a9feeb 100644
--- a/goformation/cloudformation/lambda/aws-lambda-alias_versionweight.go
+++ b/pkg/goformation/cloudformation/lambda/aws-lambda-alias_versionweight.go
@@ -1,9 +1,9 @@
 package lambda
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Alias_VersionWeight AWS CloudFormation Resource (AWS::Lambda::Alias.VersionWeight)
diff --git a/goformation/cloudformation/lambda/aws-lambda-codesigningconfig.go b/pkg/goformation/cloudformation/lambda/aws-lambda-codesigningconfig.go
similarity index 97%
rename from goformation/cloudformation/lambda/aws-lambda-codesigningconfig.go
rename to pkg/goformation/cloudformation/lambda/aws-lambda-codesigningconfig.go
index e3c3f9d452..5fb7d8eb05 100644
--- a/goformation/cloudformation/lambda/aws-lambda-codesigningconfig.go
+++ b/pkg/goformation/cloudformation/lambda/aws-lambda-codesigningconfig.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CodeSigningConfig AWS CloudFormation Resource (AWS::Lambda::CodeSigningConfig)
diff --git a/goformation/cloudformation/lambda/aws-lambda-codesigningconfig_allowedpublishers.go b/pkg/goformation/cloudformation/lambda/aws-lambda-codesigningconfig_allowedpublishers.go
similarity index 92%
rename from goformation/cloudformation/lambda/aws-lambda-codesigningconfig_allowedpublishers.go
rename to pkg/goformation/cloudformation/lambda/aws-lambda-codesigningconfig_allowedpublishers.go
index b3df0eb467..7419d8adc5 100644
--- a/goformation/cloudformation/lambda/aws-lambda-codesigningconfig_allowedpublishers.go
+++ b/pkg/goformation/cloudformation/lambda/aws-lambda-codesigningconfig_allowedpublishers.go
@@ -1,9 +1,9 @@
 package lambda
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CodeSigningConfig_AllowedPublishers AWS CloudFormation Resource (AWS::Lambda::CodeSigningConfig.AllowedPublishers)
diff --git a/goformation/cloudformation/lambda/aws-lambda-codesigningconfig_codesigningpolicies.go b/pkg/goformation/cloudformation/lambda/aws-lambda-codesigningconfig_codesigningpolicies.go
similarity index 92%
rename from goformation/cloudformation/lambda/aws-lambda-codesigningconfig_codesigningpolicies.go
rename to pkg/goformation/cloudformation/lambda/aws-lambda-codesigningconfig_codesigningpolicies.go
index 76d3c37e33..ca206046b8 100644
--- a/goformation/cloudformation/lambda/aws-lambda-codesigningconfig_codesigningpolicies.go
+++ b/pkg/goformation/cloudformation/lambda/aws-lambda-codesigningconfig_codesigningpolicies.go
@@ -1,9 +1,9 @@
 package lambda
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CodeSigningConfig_CodeSigningPolicies AWS CloudFormation Resource (AWS::Lambda::CodeSigningConfig.CodeSigningPolicies)
diff --git a/goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig.go b/pkg/goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig.go
similarity index 97%
rename from goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig.go
rename to pkg/goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig.go
index cf0575850b..dabf353440 100644
--- a/goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig.go
+++ b/pkg/goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EventInvokeConfig AWS CloudFormation Resource (AWS::Lambda::EventInvokeConfig)
diff --git a/goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig_destinationconfig.go b/pkg/goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig_destinationconfig.go
similarity index 96%
rename from goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig_destinationconfig.go
rename to pkg/goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig_destinationconfig.go
index 433ebb4148..19d120172a 100644
--- a/goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig_destinationconfig.go
+++ b/pkg/goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig_destinationconfig.go
@@ -1,7 +1,7 @@
 package lambda
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EventInvokeConfig_DestinationConfig AWS CloudFormation Resource (AWS::Lambda::EventInvokeConfig.DestinationConfig)
diff --git a/goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig_onfailure.go b/pkg/goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig_onfailure.go
similarity index 92%
rename from goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig_onfailure.go
rename to pkg/goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig_onfailure.go
index 8c1ac41f70..a7d8267934 100644
--- a/goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig_onfailure.go
+++ b/pkg/goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig_onfailure.go
@@ -1,9 +1,9 @@
 package lambda
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EventInvokeConfig_OnFailure AWS CloudFormation Resource (AWS::Lambda::EventInvokeConfig.OnFailure)
diff --git a/goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig_onsuccess.go b/pkg/goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig_onsuccess.go
similarity index 92%
rename from goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig_onsuccess.go
rename to pkg/goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig_onsuccess.go
index 3bc916c0c9..b250f5a277 100644
--- a/goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig_onsuccess.go
+++ b/pkg/goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig_onsuccess.go
@@ -1,9 +1,9 @@
 package lambda
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EventInvokeConfig_OnSuccess AWS CloudFormation Resource (AWS::Lambda::EventInvokeConfig.OnSuccess)
diff --git a/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping.go b/pkg/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping.go
similarity index 98%
rename from goformation/cloudformation/lambda/aws-lambda-eventsourcemapping.go
rename to pkg/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping.go
index 89f3622409..ba197dd424 100644
--- a/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping.go
+++ b/pkg/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EventSourceMapping AWS CloudFormation Resource (AWS::Lambda::EventSourceMapping)
diff --git a/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_destinationconfig.go b/pkg/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_destinationconfig.go
similarity index 95%
rename from goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_destinationconfig.go
rename to pkg/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_destinationconfig.go
index bb74695deb..971933d9d7 100644
--- a/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_destinationconfig.go
+++ b/pkg/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_destinationconfig.go
@@ -1,7 +1,7 @@
 package lambda
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EventSourceMapping_DestinationConfig AWS CloudFormation Resource (AWS::Lambda::EventSourceMapping.DestinationConfig)
diff --git a/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_endpoints.go b/pkg/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_endpoints.go
similarity index 92%
rename from goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_endpoints.go
rename to pkg/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_endpoints.go
index 38f936144c..6e292d92f2 100644
--- a/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_endpoints.go
+++ b/pkg/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_endpoints.go
@@ -1,9 +1,9 @@
 package lambda
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EventSourceMapping_Endpoints AWS CloudFormation Resource (AWS::Lambda::EventSourceMapping.Endpoints)
diff --git a/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_onfailure.go b/pkg/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_onfailure.go
similarity index 91%
rename from goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_onfailure.go
rename to pkg/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_onfailure.go
index b957e63feb..d3849804f1 100644
--- a/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_onfailure.go
+++ b/pkg/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_onfailure.go
@@ -1,9 +1,9 @@
 package lambda
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EventSourceMapping_OnFailure AWS CloudFormation Resource (AWS::Lambda::EventSourceMapping.OnFailure)
diff --git a/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_selfmanagedeventsource.go b/pkg/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_selfmanagedeventsource.go
similarity index 95%
rename from goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_selfmanagedeventsource.go
rename to pkg/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_selfmanagedeventsource.go
index 44c1683be3..b3edca9585 100644
--- a/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_selfmanagedeventsource.go
+++ b/pkg/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_selfmanagedeventsource.go
@@ -1,7 +1,7 @@
 package lambda
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EventSourceMapping_SelfManagedEventSource AWS CloudFormation Resource (AWS::Lambda::EventSourceMapping.SelfManagedEventSource)
diff --git a/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_sourceaccessconfiguration.go b/pkg/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_sourceaccessconfiguration.go
similarity index 93%
rename from goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_sourceaccessconfiguration.go
rename to pkg/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_sourceaccessconfiguration.go
index 771e192f45..e6c5f7dc3e 100644
--- a/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_sourceaccessconfiguration.go
+++ b/pkg/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_sourceaccessconfiguration.go
@@ -1,9 +1,9 @@
 package lambda
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EventSourceMapping_SourceAccessConfiguration AWS CloudFormation Resource (AWS::Lambda::EventSourceMapping.SourceAccessConfiguration)
diff --git a/goformation/cloudformation/lambda/aws-lambda-function.go b/pkg/goformation/cloudformation/lambda/aws-lambda-function.go
similarity index 97%
rename from goformation/cloudformation/lambda/aws-lambda-function.go
rename to pkg/goformation/cloudformation/lambda/aws-lambda-function.go
index d1118345ea..35d4d9130d 100644
--- a/goformation/cloudformation/lambda/aws-lambda-function.go
+++ b/pkg/goformation/cloudformation/lambda/aws-lambda-function.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function AWS CloudFormation Resource (AWS::Lambda::Function)
diff --git a/goformation/cloudformation/lambda/aws-lambda-function_code.go b/pkg/goformation/cloudformation/lambda/aws-lambda-function_code.go
similarity index 94%
rename from goformation/cloudformation/lambda/aws-lambda-function_code.go
rename to pkg/goformation/cloudformation/lambda/aws-lambda-function_code.go
index 36783c8b7f..d3b23c5003 100644
--- a/goformation/cloudformation/lambda/aws-lambda-function_code.go
+++ b/pkg/goformation/cloudformation/lambda/aws-lambda-function_code.go
@@ -1,9 +1,9 @@
 package lambda
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_Code AWS CloudFormation Resource (AWS::Lambda::Function.Code)
diff --git a/goformation/cloudformation/lambda/aws-lambda-function_deadletterconfig.go b/pkg/goformation/cloudformation/lambda/aws-lambda-function_deadletterconfig.go
similarity index 91%
rename from goformation/cloudformation/lambda/aws-lambda-function_deadletterconfig.go
rename to pkg/goformation/cloudformation/lambda/aws-lambda-function_deadletterconfig.go
index ff07a260ec..2b8ccb37db 100644
--- a/goformation/cloudformation/lambda/aws-lambda-function_deadletterconfig.go
+++ b/pkg/goformation/cloudformation/lambda/aws-lambda-function_deadletterconfig.go
@@ -1,9 +1,9 @@
 package lambda
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_DeadLetterConfig AWS CloudFormation Resource (AWS::Lambda::Function.DeadLetterConfig)
diff --git a/goformation/cloudformation/lambda/aws-lambda-function_environment.go b/pkg/goformation/cloudformation/lambda/aws-lambda-function_environment.go
similarity index 91%
rename from goformation/cloudformation/lambda/aws-lambda-function_environment.go
rename to pkg/goformation/cloudformation/lambda/aws-lambda-function_environment.go
index c58f09375a..90274048b8 100644
--- a/goformation/cloudformation/lambda/aws-lambda-function_environment.go
+++ b/pkg/goformation/cloudformation/lambda/aws-lambda-function_environment.go
@@ -1,9 +1,9 @@
 package lambda
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_Environment AWS CloudFormation Resource (AWS::Lambda::Function.Environment)
diff --git a/goformation/cloudformation/lambda/aws-lambda-function_filesystemconfig.go b/pkg/goformation/cloudformation/lambda/aws-lambda-function_filesystemconfig.go
similarity index 92%
rename from goformation/cloudformation/lambda/aws-lambda-function_filesystemconfig.go
rename to pkg/goformation/cloudformation/lambda/aws-lambda-function_filesystemconfig.go
index e2555e40bc..d4a61d2688 100644
--- a/goformation/cloudformation/lambda/aws-lambda-function_filesystemconfig.go
+++ b/pkg/goformation/cloudformation/lambda/aws-lambda-function_filesystemconfig.go
@@ -1,9 +1,9 @@
 package lambda
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_FileSystemConfig AWS CloudFormation Resource (AWS::Lambda::Function.FileSystemConfig)
diff --git a/goformation/cloudformation/lambda/aws-lambda-function_imageconfig.go b/pkg/goformation/cloudformation/lambda/aws-lambda-function_imageconfig.go
similarity index 93%
rename from goformation/cloudformation/lambda/aws-lambda-function_imageconfig.go
rename to pkg/goformation/cloudformation/lambda/aws-lambda-function_imageconfig.go
index 49683b949d..3e1055222d 100644
--- a/goformation/cloudformation/lambda/aws-lambda-function_imageconfig.go
+++ b/pkg/goformation/cloudformation/lambda/aws-lambda-function_imageconfig.go
@@ -1,9 +1,9 @@
 package lambda
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_ImageConfig AWS CloudFormation Resource (AWS::Lambda::Function.ImageConfig)
diff --git a/goformation/cloudformation/lambda/aws-lambda-function_tracingconfig.go b/pkg/goformation/cloudformation/lambda/aws-lambda-function_tracingconfig.go
similarity index 91%
rename from goformation/cloudformation/lambda/aws-lambda-function_tracingconfig.go
rename to pkg/goformation/cloudformation/lambda/aws-lambda-function_tracingconfig.go
index 68e06f3bd0..46d809f18f 100644
--- a/goformation/cloudformation/lambda/aws-lambda-function_tracingconfig.go
+++ b/pkg/goformation/cloudformation/lambda/aws-lambda-function_tracingconfig.go
@@ -1,9 +1,9 @@
 package lambda
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_TracingConfig AWS CloudFormation Resource (AWS::Lambda::Function.TracingConfig)
diff --git a/goformation/cloudformation/lambda/aws-lambda-function_vpcconfig.go b/pkg/goformation/cloudformation/lambda/aws-lambda-function_vpcconfig.go
similarity index 92%
rename from goformation/cloudformation/lambda/aws-lambda-function_vpcconfig.go
rename to pkg/goformation/cloudformation/lambda/aws-lambda-function_vpcconfig.go
index a45638076f..fcafa54de9 100644
--- a/goformation/cloudformation/lambda/aws-lambda-function_vpcconfig.go
+++ b/pkg/goformation/cloudformation/lambda/aws-lambda-function_vpcconfig.go
@@ -1,9 +1,9 @@
 package lambda
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_VpcConfig AWS CloudFormation Resource (AWS::Lambda::Function.VpcConfig)
diff --git a/goformation/cloudformation/lambda/aws-lambda-layerversion.go b/pkg/goformation/cloudformation/lambda/aws-lambda-layerversion.go
similarity index 97%
rename from goformation/cloudformation/lambda/aws-lambda-layerversion.go
rename to pkg/goformation/cloudformation/lambda/aws-lambda-layerversion.go
index f3a4a99bd3..3b74af6bff 100644
--- a/goformation/cloudformation/lambda/aws-lambda-layerversion.go
+++ b/pkg/goformation/cloudformation/lambda/aws-lambda-layerversion.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LayerVersion AWS CloudFormation Resource (AWS::Lambda::LayerVersion)
diff --git a/goformation/cloudformation/lambda/aws-lambda-layerversion_content.go b/pkg/goformation/cloudformation/lambda/aws-lambda-layerversion_content.go
similarity index 93%
rename from goformation/cloudformation/lambda/aws-lambda-layerversion_content.go
rename to pkg/goformation/cloudformation/lambda/aws-lambda-layerversion_content.go
index c641035a24..dd8fcc9148 100644
--- a/goformation/cloudformation/lambda/aws-lambda-layerversion_content.go
+++ b/pkg/goformation/cloudformation/lambda/aws-lambda-layerversion_content.go
@@ -1,9 +1,9 @@
 package lambda
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LayerVersion_Content AWS CloudFormation Resource (AWS::Lambda::LayerVersion.Content)
diff --git a/goformation/cloudformation/lambda/aws-lambda-layerversionpermission.go b/pkg/goformation/cloudformation/lambda/aws-lambda-layerversionpermission.go
similarity index 97%
rename from goformation/cloudformation/lambda/aws-lambda-layerversionpermission.go
rename to pkg/goformation/cloudformation/lambda/aws-lambda-layerversionpermission.go
index b7fa4cd40e..d72b380dd5 100644
--- a/goformation/cloudformation/lambda/aws-lambda-layerversionpermission.go
+++ b/pkg/goformation/cloudformation/lambda/aws-lambda-layerversionpermission.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LayerVersionPermission AWS CloudFormation Resource (AWS::Lambda::LayerVersionPermission)
diff --git a/goformation/cloudformation/lambda/aws-lambda-permission.go b/pkg/goformation/cloudformation/lambda/aws-lambda-permission.go
similarity index 97%
rename from goformation/cloudformation/lambda/aws-lambda-permission.go
rename to pkg/goformation/cloudformation/lambda/aws-lambda-permission.go
index 5b08a0b5a9..4177b673be 100644
--- a/goformation/cloudformation/lambda/aws-lambda-permission.go
+++ b/pkg/goformation/cloudformation/lambda/aws-lambda-permission.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Permission AWS CloudFormation Resource (AWS::Lambda::Permission)
diff --git a/goformation/cloudformation/lambda/aws-lambda-version.go b/pkg/goformation/cloudformation/lambda/aws-lambda-version.go
similarity index 97%
rename from goformation/cloudformation/lambda/aws-lambda-version.go
rename to pkg/goformation/cloudformation/lambda/aws-lambda-version.go
index 8762ff931d..8218a7c4e1 100644
--- a/goformation/cloudformation/lambda/aws-lambda-version.go
+++ b/pkg/goformation/cloudformation/lambda/aws-lambda-version.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Version AWS CloudFormation Resource (AWS::Lambda::Version)
diff --git a/goformation/cloudformation/lambda/aws-lambda-version_provisionedconcurrencyconfiguration.go b/pkg/goformation/cloudformation/lambda/aws-lambda-version_provisionedconcurrencyconfiguration.go
similarity index 92%
rename from goformation/cloudformation/lambda/aws-lambda-version_provisionedconcurrencyconfiguration.go
rename to pkg/goformation/cloudformation/lambda/aws-lambda-version_provisionedconcurrencyconfiguration.go
index dc6d2b9381..1c64250a4f 100644
--- a/goformation/cloudformation/lambda/aws-lambda-version_provisionedconcurrencyconfiguration.go
+++ b/pkg/goformation/cloudformation/lambda/aws-lambda-version_provisionedconcurrencyconfiguration.go
@@ -1,9 +1,9 @@
 package lambda
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Version_ProvisionedConcurrencyConfiguration AWS CloudFormation Resource (AWS::Lambda::Version.ProvisionedConcurrencyConfiguration)
diff --git a/goformation/cloudformation/licensemanager/aws-licensemanager-grant.go b/pkg/goformation/cloudformation/licensemanager/aws-licensemanager-grant.go
similarity index 97%
rename from goformation/cloudformation/licensemanager/aws-licensemanager-grant.go
rename to pkg/goformation/cloudformation/licensemanager/aws-licensemanager-grant.go
index 150115a57d..1596c8f130 100644
--- a/goformation/cloudformation/licensemanager/aws-licensemanager-grant.go
+++ b/pkg/goformation/cloudformation/licensemanager/aws-licensemanager-grant.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Grant AWS CloudFormation Resource (AWS::LicenseManager::Grant)
diff --git a/goformation/cloudformation/licensemanager/aws-licensemanager-license.go b/pkg/goformation/cloudformation/licensemanager/aws-licensemanager-license.go
similarity index 97%
rename from goformation/cloudformation/licensemanager/aws-licensemanager-license.go
rename to pkg/goformation/cloudformation/licensemanager/aws-licensemanager-license.go
index 1d8e0e765d..37787ba59d 100644
--- a/goformation/cloudformation/licensemanager/aws-licensemanager-license.go
+++ b/pkg/goformation/cloudformation/licensemanager/aws-licensemanager-license.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // License AWS CloudFormation Resource (AWS::LicenseManager::License)
diff --git a/goformation/cloudformation/licensemanager/aws-licensemanager-license_borrowconfiguration.go b/pkg/goformation/cloudformation/licensemanager/aws-licensemanager-license_borrowconfiguration.go
similarity index 93%
rename from goformation/cloudformation/licensemanager/aws-licensemanager-license_borrowconfiguration.go
rename to pkg/goformation/cloudformation/licensemanager/aws-licensemanager-license_borrowconfiguration.go
index 6ee210adbb..07c32f16b2 100644
--- a/goformation/cloudformation/licensemanager/aws-licensemanager-license_borrowconfiguration.go
+++ b/pkg/goformation/cloudformation/licensemanager/aws-licensemanager-license_borrowconfiguration.go
@@ -1,9 +1,9 @@
 package licensemanager
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // License_BorrowConfiguration AWS CloudFormation Resource (AWS::LicenseManager::License.BorrowConfiguration)
diff --git a/goformation/cloudformation/licensemanager/aws-licensemanager-license_consumptionconfiguration.go b/pkg/goformation/cloudformation/licensemanager/aws-licensemanager-license_consumptionconfiguration.go
similarity index 94%
rename from goformation/cloudformation/licensemanager/aws-licensemanager-license_consumptionconfiguration.go
rename to pkg/goformation/cloudformation/licensemanager/aws-licensemanager-license_consumptionconfiguration.go
index 4220016ebe..fc9d065b8e 100644
--- a/goformation/cloudformation/licensemanager/aws-licensemanager-license_consumptionconfiguration.go
+++ b/pkg/goformation/cloudformation/licensemanager/aws-licensemanager-license_consumptionconfiguration.go
@@ -1,9 +1,9 @@
 package licensemanager
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // License_ConsumptionConfiguration AWS CloudFormation Resource (AWS::LicenseManager::License.ConsumptionConfiguration)
diff --git a/goformation/cloudformation/licensemanager/aws-licensemanager-license_entitlement.go b/pkg/goformation/cloudformation/licensemanager/aws-licensemanager-license_entitlement.go
similarity index 95%
rename from goformation/cloudformation/licensemanager/aws-licensemanager-license_entitlement.go
rename to pkg/goformation/cloudformation/licensemanager/aws-licensemanager-license_entitlement.go
index 4a3da712c7..51996a2426 100644
--- a/goformation/cloudformation/licensemanager/aws-licensemanager-license_entitlement.go
+++ b/pkg/goformation/cloudformation/licensemanager/aws-licensemanager-license_entitlement.go
@@ -1,9 +1,9 @@
 package licensemanager
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // License_Entitlement AWS CloudFormation Resource (AWS::LicenseManager::License.Entitlement)
diff --git a/goformation/cloudformation/licensemanager/aws-licensemanager-license_issuerdata.go b/pkg/goformation/cloudformation/licensemanager/aws-licensemanager-license_issuerdata.go
similarity index 92%
rename from goformation/cloudformation/licensemanager/aws-licensemanager-license_issuerdata.go
rename to pkg/goformation/cloudformation/licensemanager/aws-licensemanager-license_issuerdata.go
index a655bf0bae..a85b07f70c 100644
--- a/goformation/cloudformation/licensemanager/aws-licensemanager-license_issuerdata.go
+++ b/pkg/goformation/cloudformation/licensemanager/aws-licensemanager-license_issuerdata.go
@@ -1,9 +1,9 @@
 package licensemanager
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // License_IssuerData AWS CloudFormation Resource (AWS::LicenseManager::License.IssuerData)
diff --git a/goformation/cloudformation/licensemanager/aws-licensemanager-license_metadata.go b/pkg/goformation/cloudformation/licensemanager/aws-licensemanager-license_metadata.go
similarity index 92%
rename from goformation/cloudformation/licensemanager/aws-licensemanager-license_metadata.go
rename to pkg/goformation/cloudformation/licensemanager/aws-licensemanager-license_metadata.go
index 6dcfcd9030..ad18a7887d 100644
--- a/goformation/cloudformation/licensemanager/aws-licensemanager-license_metadata.go
+++ b/pkg/goformation/cloudformation/licensemanager/aws-licensemanager-license_metadata.go
@@ -1,9 +1,9 @@
 package licensemanager
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // License_Metadata AWS CloudFormation Resource (AWS::LicenseManager::License.Metadata)
diff --git a/goformation/cloudformation/licensemanager/aws-licensemanager-license_provisionalconfiguration.go b/pkg/goformation/cloudformation/licensemanager/aws-licensemanager-license_provisionalconfiguration.go
similarity index 92%
rename from goformation/cloudformation/licensemanager/aws-licensemanager-license_provisionalconfiguration.go
rename to pkg/goformation/cloudformation/licensemanager/aws-licensemanager-license_provisionalconfiguration.go
index 5bd1659469..7dbd86fe00 100644
--- a/goformation/cloudformation/licensemanager/aws-licensemanager-license_provisionalconfiguration.go
+++ b/pkg/goformation/cloudformation/licensemanager/aws-licensemanager-license_provisionalconfiguration.go
@@ -1,9 +1,9 @@
 package licensemanager
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // License_ProvisionalConfiguration AWS CloudFormation Resource (AWS::LicenseManager::License.ProvisionalConfiguration)
diff --git a/goformation/cloudformation/licensemanager/aws-licensemanager-license_validitydateformat.go b/pkg/goformation/cloudformation/licensemanager/aws-licensemanager-license_validitydateformat.go
similarity index 93%
rename from goformation/cloudformation/licensemanager/aws-licensemanager-license_validitydateformat.go
rename to pkg/goformation/cloudformation/licensemanager/aws-licensemanager-license_validitydateformat.go
index f7314a4050..9dd0d4705c 100644
--- a/goformation/cloudformation/licensemanager/aws-licensemanager-license_validitydateformat.go
+++ b/pkg/goformation/cloudformation/licensemanager/aws-licensemanager-license_validitydateformat.go
@@ -1,9 +1,9 @@
 package licensemanager
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // License_ValidityDateFormat AWS CloudFormation Resource (AWS::LicenseManager::License.ValidityDateFormat)
diff --git a/goformation/cloudformation/lightsail/aws-lightsail-database.go b/pkg/goformation/cloudformation/lightsail/aws-lightsail-database.go
similarity index 97%
rename from goformation/cloudformation/lightsail/aws-lightsail-database.go
rename to pkg/goformation/cloudformation/lightsail/aws-lightsail-database.go
index 7710b0a611..971c421c4e 100644
--- a/goformation/cloudformation/lightsail/aws-lightsail-database.go
+++ b/pkg/goformation/cloudformation/lightsail/aws-lightsail-database.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Database AWS CloudFormation Resource (AWS::Lightsail::Database)
diff --git a/goformation/cloudformation/lightsail/aws-lightsail-database_relationaldatabaseparameter.go b/pkg/goformation/cloudformation/lightsail/aws-lightsail-database_relationaldatabaseparameter.go
similarity index 96%
rename from goformation/cloudformation/lightsail/aws-lightsail-database_relationaldatabaseparameter.go
rename to pkg/goformation/cloudformation/lightsail/aws-lightsail-database_relationaldatabaseparameter.go
index 21f94a9b8e..2c3b424644 100644
--- a/goformation/cloudformation/lightsail/aws-lightsail-database_relationaldatabaseparameter.go
+++ b/pkg/goformation/cloudformation/lightsail/aws-lightsail-database_relationaldatabaseparameter.go
@@ -1,9 +1,9 @@
 package lightsail
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Database_RelationalDatabaseParameter AWS CloudFormation Resource (AWS::Lightsail::Database.RelationalDatabaseParameter)
diff --git a/goformation/cloudformation/lightsail/aws-lightsail-disk.go b/pkg/goformation/cloudformation/lightsail/aws-lightsail-disk.go
similarity index 95%
rename from goformation/cloudformation/lightsail/aws-lightsail-disk.go
rename to pkg/goformation/cloudformation/lightsail/aws-lightsail-disk.go
index 916afb947d..312d7d5bd9 100644
--- a/goformation/cloudformation/lightsail/aws-lightsail-disk.go
+++ b/pkg/goformation/cloudformation/lightsail/aws-lightsail-disk.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Disk AWS CloudFormation Resource (AWS::Lightsail::Disk)
diff --git a/goformation/cloudformation/lightsail/aws-lightsail-disk_addon.go b/pkg/goformation/cloudformation/lightsail/aws-lightsail-disk_addon.go
similarity index 93%
rename from goformation/cloudformation/lightsail/aws-lightsail-disk_addon.go
rename to pkg/goformation/cloudformation/lightsail/aws-lightsail-disk_addon.go
index 38eedf1e6b..0bab505af6 100644
--- a/goformation/cloudformation/lightsail/aws-lightsail-disk_addon.go
+++ b/pkg/goformation/cloudformation/lightsail/aws-lightsail-disk_addon.go
@@ -1,9 +1,9 @@
 package lightsail
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Disk_AddOn AWS CloudFormation Resource (AWS::Lightsail::Disk.AddOn)
diff --git a/goformation/cloudformation/lightsail/aws-lightsail-disk_autosnapshotaddon.go b/pkg/goformation/cloudformation/lightsail/aws-lightsail-disk_autosnapshotaddon.go
similarity index 91%
rename from goformation/cloudformation/lightsail/aws-lightsail-disk_autosnapshotaddon.go
rename to pkg/goformation/cloudformation/lightsail/aws-lightsail-disk_autosnapshotaddon.go
index 0c13090a2f..21cc0c463b 100644
--- a/goformation/cloudformation/lightsail/aws-lightsail-disk_autosnapshotaddon.go
+++ b/pkg/goformation/cloudformation/lightsail/aws-lightsail-disk_autosnapshotaddon.go
@@ -1,9 +1,9 @@
 package lightsail
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Disk_AutoSnapshotAddOn AWS CloudFormation Resource (AWS::Lightsail::Disk.AutoSnapshotAddOn)
diff --git a/goformation/cloudformation/lightsail/aws-lightsail-instance.go b/pkg/goformation/cloudformation/lightsail/aws-lightsail-instance.go
similarity index 96%
rename from goformation/cloudformation/lightsail/aws-lightsail-instance.go
rename to pkg/goformation/cloudformation/lightsail/aws-lightsail-instance.go
index b54f6ce1e1..5bc84f6650 100644
--- a/goformation/cloudformation/lightsail/aws-lightsail-instance.go
+++ b/pkg/goformation/cloudformation/lightsail/aws-lightsail-instance.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance AWS CloudFormation Resource (AWS::Lightsail::Instance)
diff --git a/goformation/cloudformation/lightsail/aws-lightsail-instance_addon.go b/pkg/goformation/cloudformation/lightsail/aws-lightsail-instance_addon.go
similarity index 93%
rename from goformation/cloudformation/lightsail/aws-lightsail-instance_addon.go
rename to pkg/goformation/cloudformation/lightsail/aws-lightsail-instance_addon.go
index 28a2885b82..568fd6437f 100644
--- a/goformation/cloudformation/lightsail/aws-lightsail-instance_addon.go
+++ b/pkg/goformation/cloudformation/lightsail/aws-lightsail-instance_addon.go
@@ -1,9 +1,9 @@
 package lightsail
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance_AddOn AWS CloudFormation Resource (AWS::Lightsail::Instance.AddOn)
diff --git a/goformation/cloudformation/lightsail/aws-lightsail-instance_autosnapshotaddon.go b/pkg/goformation/cloudformation/lightsail/aws-lightsail-instance_autosnapshotaddon.go
similarity index 91%
rename from goformation/cloudformation/lightsail/aws-lightsail-instance_autosnapshotaddon.go
rename to pkg/goformation/cloudformation/lightsail/aws-lightsail-instance_autosnapshotaddon.go
index 8878294dad..4814c42ee3 100644
--- a/goformation/cloudformation/lightsail/aws-lightsail-instance_autosnapshotaddon.go
+++ b/pkg/goformation/cloudformation/lightsail/aws-lightsail-instance_autosnapshotaddon.go
@@ -1,9 +1,9 @@
 package lightsail
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance_AutoSnapshotAddOn AWS CloudFormation Resource (AWS::Lightsail::Instance.AutoSnapshotAddOn)
diff --git a/goformation/cloudformation/lightsail/aws-lightsail-instance_disk.go b/pkg/goformation/cloudformation/lightsail/aws-lightsail-instance_disk.go
similarity index 95%
rename from goformation/cloudformation/lightsail/aws-lightsail-instance_disk.go
rename to pkg/goformation/cloudformation/lightsail/aws-lightsail-instance_disk.go
index 995b848ecc..d79aa94d20 100644
--- a/goformation/cloudformation/lightsail/aws-lightsail-instance_disk.go
+++ b/pkg/goformation/cloudformation/lightsail/aws-lightsail-instance_disk.go
@@ -1,9 +1,9 @@
 package lightsail
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance_Disk AWS CloudFormation Resource (AWS::Lightsail::Instance.Disk)
diff --git a/goformation/cloudformation/lightsail/aws-lightsail-instance_hardware.go b/pkg/goformation/cloudformation/lightsail/aws-lightsail-instance_hardware.go
similarity index 93%
rename from goformation/cloudformation/lightsail/aws-lightsail-instance_hardware.go
rename to pkg/goformation/cloudformation/lightsail/aws-lightsail-instance_hardware.go
index 9f7253e882..b4191b9260 100644
--- a/goformation/cloudformation/lightsail/aws-lightsail-instance_hardware.go
+++ b/pkg/goformation/cloudformation/lightsail/aws-lightsail-instance_hardware.go
@@ -1,9 +1,9 @@
 package lightsail
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance_Hardware AWS CloudFormation Resource (AWS::Lightsail::Instance.Hardware)
diff --git a/goformation/cloudformation/lightsail/aws-lightsail-instance_location.go b/pkg/goformation/cloudformation/lightsail/aws-lightsail-instance_location.go
similarity index 92%
rename from goformation/cloudformation/lightsail/aws-lightsail-instance_location.go
rename to pkg/goformation/cloudformation/lightsail/aws-lightsail-instance_location.go
index 1a18e10ee4..7f72ffbd3f 100644
--- a/goformation/cloudformation/lightsail/aws-lightsail-instance_location.go
+++ b/pkg/goformation/cloudformation/lightsail/aws-lightsail-instance_location.go
@@ -1,9 +1,9 @@
 package lightsail
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance_Location AWS CloudFormation Resource (AWS::Lightsail::Instance.Location)
diff --git a/goformation/cloudformation/lightsail/aws-lightsail-instance_monthlytransfer.go b/pkg/goformation/cloudformation/lightsail/aws-lightsail-instance_monthlytransfer.go
similarity index 91%
rename from goformation/cloudformation/lightsail/aws-lightsail-instance_monthlytransfer.go
rename to pkg/goformation/cloudformation/lightsail/aws-lightsail-instance_monthlytransfer.go
index 3764f96aec..7651582026 100644
--- a/goformation/cloudformation/lightsail/aws-lightsail-instance_monthlytransfer.go
+++ b/pkg/goformation/cloudformation/lightsail/aws-lightsail-instance_monthlytransfer.go
@@ -1,9 +1,9 @@
 package lightsail
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance_MonthlyTransfer AWS CloudFormation Resource (AWS::Lightsail::Instance.MonthlyTransfer)
diff --git a/goformation/cloudformation/lightsail/aws-lightsail-instance_networking.go b/pkg/goformation/cloudformation/lightsail/aws-lightsail-instance_networking.go
similarity index 96%
rename from goformation/cloudformation/lightsail/aws-lightsail-instance_networking.go
rename to pkg/goformation/cloudformation/lightsail/aws-lightsail-instance_networking.go
index 639499080c..402a6891cf 100644
--- a/goformation/cloudformation/lightsail/aws-lightsail-instance_networking.go
+++ b/pkg/goformation/cloudformation/lightsail/aws-lightsail-instance_networking.go
@@ -1,7 +1,7 @@
 package lightsail
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance_Networking AWS CloudFormation Resource (AWS::Lightsail::Instance.Networking)
diff --git a/goformation/cloudformation/lightsail/aws-lightsail-instance_port.go b/pkg/goformation/cloudformation/lightsail/aws-lightsail-instance_port.go
similarity index 96%
rename from goformation/cloudformation/lightsail/aws-lightsail-instance_port.go
rename to pkg/goformation/cloudformation/lightsail/aws-lightsail-instance_port.go
index b69842fd97..aeff67e1ec 100644
--- a/goformation/cloudformation/lightsail/aws-lightsail-instance_port.go
+++ b/pkg/goformation/cloudformation/lightsail/aws-lightsail-instance_port.go
@@ -1,9 +1,9 @@
 package lightsail
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance_Port AWS CloudFormation Resource (AWS::Lightsail::Instance.Port)
diff --git a/goformation/cloudformation/lightsail/aws-lightsail-instance_state.go b/pkg/goformation/cloudformation/lightsail/aws-lightsail-instance_state.go
similarity index 92%
rename from goformation/cloudformation/lightsail/aws-lightsail-instance_state.go
rename to pkg/goformation/cloudformation/lightsail/aws-lightsail-instance_state.go
index e5d5df4d3b..f23789d94e 100644
--- a/goformation/cloudformation/lightsail/aws-lightsail-instance_state.go
+++ b/pkg/goformation/cloudformation/lightsail/aws-lightsail-instance_state.go
@@ -1,9 +1,9 @@
 package lightsail
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance_State AWS CloudFormation Resource (AWS::Lightsail::Instance.State)
diff --git a/goformation/cloudformation/lightsail/aws-lightsail-staticip.go b/pkg/goformation/cloudformation/lightsail/aws-lightsail-staticip.go
similarity index 96%
rename from goformation/cloudformation/lightsail/aws-lightsail-staticip.go
rename to pkg/goformation/cloudformation/lightsail/aws-lightsail-staticip.go
index aa05a76d80..e9814e5716 100644
--- a/goformation/cloudformation/lightsail/aws-lightsail-staticip.go
+++ b/pkg/goformation/cloudformation/lightsail/aws-lightsail-staticip.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StaticIp AWS CloudFormation Resource (AWS::Lightsail::StaticIp)
diff --git a/goformation/cloudformation/location/aws-location-geofencecollection.go b/pkg/goformation/cloudformation/location/aws-location-geofencecollection.go
similarity index 97%
rename from goformation/cloudformation/location/aws-location-geofencecollection.go
rename to pkg/goformation/cloudformation/location/aws-location-geofencecollection.go
index 84027a2e32..82ae938424 100644
--- a/goformation/cloudformation/location/aws-location-geofencecollection.go
+++ b/pkg/goformation/cloudformation/location/aws-location-geofencecollection.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GeofenceCollection AWS CloudFormation Resource (AWS::Location::GeofenceCollection)
diff --git a/goformation/cloudformation/location/aws-location-map.go b/pkg/goformation/cloudformation/location/aws-location-map.go
similarity index 97%
rename from goformation/cloudformation/location/aws-location-map.go
rename to pkg/goformation/cloudformation/location/aws-location-map.go
index eb075768cf..03ae737bc6 100644
--- a/goformation/cloudformation/location/aws-location-map.go
+++ b/pkg/goformation/cloudformation/location/aws-location-map.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Map AWS CloudFormation Resource (AWS::Location::Map)
diff --git a/goformation/cloudformation/location/aws-location-map_mapconfiguration.go b/pkg/goformation/cloudformation/location/aws-location-map_mapconfiguration.go
similarity index 91%
rename from goformation/cloudformation/location/aws-location-map_mapconfiguration.go
rename to pkg/goformation/cloudformation/location/aws-location-map_mapconfiguration.go
index 4a458b0e7b..c922e7c080 100644
--- a/goformation/cloudformation/location/aws-location-map_mapconfiguration.go
+++ b/pkg/goformation/cloudformation/location/aws-location-map_mapconfiguration.go
@@ -1,9 +1,9 @@
 package location
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Map_MapConfiguration AWS CloudFormation Resource (AWS::Location::Map.MapConfiguration)
diff --git a/goformation/cloudformation/location/aws-location-placeindex.go b/pkg/goformation/cloudformation/location/aws-location-placeindex.go
similarity index 97%
rename from goformation/cloudformation/location/aws-location-placeindex.go
rename to pkg/goformation/cloudformation/location/aws-location-placeindex.go
index d867391057..7d924d91f6 100644
--- a/goformation/cloudformation/location/aws-location-placeindex.go
+++ b/pkg/goformation/cloudformation/location/aws-location-placeindex.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PlaceIndex AWS CloudFormation Resource (AWS::Location::PlaceIndex)
diff --git a/goformation/cloudformation/location/aws-location-placeindex_datasourceconfiguration.go b/pkg/goformation/cloudformation/location/aws-location-placeindex_datasourceconfiguration.go
similarity index 92%
rename from goformation/cloudformation/location/aws-location-placeindex_datasourceconfiguration.go
rename to pkg/goformation/cloudformation/location/aws-location-placeindex_datasourceconfiguration.go
index 8cc1abda0b..4f1101fc97 100644
--- a/goformation/cloudformation/location/aws-location-placeindex_datasourceconfiguration.go
+++ b/pkg/goformation/cloudformation/location/aws-location-placeindex_datasourceconfiguration.go
@@ -1,9 +1,9 @@
 package location
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PlaceIndex_DataSourceConfiguration AWS CloudFormation Resource (AWS::Location::PlaceIndex.DataSourceConfiguration)
diff --git a/goformation/cloudformation/location/aws-location-routecalculator.go b/pkg/goformation/cloudformation/location/aws-location-routecalculator.go
similarity index 97%
rename from goformation/cloudformation/location/aws-location-routecalculator.go
rename to pkg/goformation/cloudformation/location/aws-location-routecalculator.go
index adbb8b7a3f..945d48b2d2 100644
--- a/goformation/cloudformation/location/aws-location-routecalculator.go
+++ b/pkg/goformation/cloudformation/location/aws-location-routecalculator.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RouteCalculator AWS CloudFormation Resource (AWS::Location::RouteCalculator)
diff --git a/goformation/cloudformation/location/aws-location-tracker.go b/pkg/goformation/cloudformation/location/aws-location-tracker.go
similarity index 97%
rename from goformation/cloudformation/location/aws-location-tracker.go
rename to pkg/goformation/cloudformation/location/aws-location-tracker.go
index db29abb3d8..4e518d778a 100644
--- a/goformation/cloudformation/location/aws-location-tracker.go
+++ b/pkg/goformation/cloudformation/location/aws-location-tracker.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Tracker AWS CloudFormation Resource (AWS::Location::Tracker)
diff --git a/goformation/cloudformation/location/aws-location-trackerconsumer.go b/pkg/goformation/cloudformation/location/aws-location-trackerconsumer.go
similarity index 96%
rename from goformation/cloudformation/location/aws-location-trackerconsumer.go
rename to pkg/goformation/cloudformation/location/aws-location-trackerconsumer.go
index 97d83ef786..f76c6561de 100644
--- a/goformation/cloudformation/location/aws-location-trackerconsumer.go
+++ b/pkg/goformation/cloudformation/location/aws-location-trackerconsumer.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TrackerConsumer AWS CloudFormation Resource (AWS::Location::TrackerConsumer)
diff --git a/goformation/cloudformation/logs/aws-logs-destination.go b/pkg/goformation/cloudformation/logs/aws-logs-destination.go
similarity index 97%
rename from goformation/cloudformation/logs/aws-logs-destination.go
rename to pkg/goformation/cloudformation/logs/aws-logs-destination.go
index 8e29e62215..f12632095c 100644
--- a/goformation/cloudformation/logs/aws-logs-destination.go
+++ b/pkg/goformation/cloudformation/logs/aws-logs-destination.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Destination AWS CloudFormation Resource (AWS::Logs::Destination)
diff --git a/goformation/cloudformation/logs/aws-logs-loggroup.go b/pkg/goformation/cloudformation/logs/aws-logs-loggroup.go
similarity index 95%
rename from goformation/cloudformation/logs/aws-logs-loggroup.go
rename to pkg/goformation/cloudformation/logs/aws-logs-loggroup.go
index 46b374f5e8..02bac3d9fa 100644
--- a/goformation/cloudformation/logs/aws-logs-loggroup.go
+++ b/pkg/goformation/cloudformation/logs/aws-logs-loggroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LogGroup AWS CloudFormation Resource (AWS::Logs::LogGroup)
diff --git a/goformation/cloudformation/logs/aws-logs-logstream.go b/pkg/goformation/cloudformation/logs/aws-logs-logstream.go
similarity index 96%
rename from goformation/cloudformation/logs/aws-logs-logstream.go
rename to pkg/goformation/cloudformation/logs/aws-logs-logstream.go
index 5a74804f4a..97c5a765ed 100644
--- a/goformation/cloudformation/logs/aws-logs-logstream.go
+++ b/pkg/goformation/cloudformation/logs/aws-logs-logstream.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LogStream AWS CloudFormation Resource (AWS::Logs::LogStream)
diff --git a/goformation/cloudformation/logs/aws-logs-metricfilter.go b/pkg/goformation/cloudformation/logs/aws-logs-metricfilter.go
similarity index 96%
rename from goformation/cloudformation/logs/aws-logs-metricfilter.go
rename to pkg/goformation/cloudformation/logs/aws-logs-metricfilter.go
index 1c25ffba65..e9ec8bb652 100644
--- a/goformation/cloudformation/logs/aws-logs-metricfilter.go
+++ b/pkg/goformation/cloudformation/logs/aws-logs-metricfilter.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MetricFilter AWS CloudFormation Resource (AWS::Logs::MetricFilter)
diff --git a/goformation/cloudformation/logs/aws-logs-metricfilter_metrictransformation.go b/pkg/goformation/cloudformation/logs/aws-logs-metricfilter_metrictransformation.go
similarity index 94%
rename from goformation/cloudformation/logs/aws-logs-metricfilter_metrictransformation.go
rename to pkg/goformation/cloudformation/logs/aws-logs-metricfilter_metrictransformation.go
index 2060486d96..5d923d5b34 100644
--- a/goformation/cloudformation/logs/aws-logs-metricfilter_metrictransformation.go
+++ b/pkg/goformation/cloudformation/logs/aws-logs-metricfilter_metrictransformation.go
@@ -1,9 +1,9 @@
 package logs
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MetricFilter_MetricTransformation AWS CloudFormation Resource (AWS::Logs::MetricFilter.MetricTransformation)
diff --git a/goformation/cloudformation/logs/aws-logs-querydefinition.go b/pkg/goformation/cloudformation/logs/aws-logs-querydefinition.go
similarity index 96%
rename from goformation/cloudformation/logs/aws-logs-querydefinition.go
rename to pkg/goformation/cloudformation/logs/aws-logs-querydefinition.go
index 876f84c13e..082ff70990 100644
--- a/goformation/cloudformation/logs/aws-logs-querydefinition.go
+++ b/pkg/goformation/cloudformation/logs/aws-logs-querydefinition.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // QueryDefinition AWS CloudFormation Resource (AWS::Logs::QueryDefinition)
diff --git a/goformation/cloudformation/logs/aws-logs-resourcepolicy.go b/pkg/goformation/cloudformation/logs/aws-logs-resourcepolicy.go
similarity index 96%
rename from goformation/cloudformation/logs/aws-logs-resourcepolicy.go
rename to pkg/goformation/cloudformation/logs/aws-logs-resourcepolicy.go
index 95034903a9..eb0329c047 100644
--- a/goformation/cloudformation/logs/aws-logs-resourcepolicy.go
+++ b/pkg/goformation/cloudformation/logs/aws-logs-resourcepolicy.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourcePolicy AWS CloudFormation Resource (AWS::Logs::ResourcePolicy)
diff --git a/goformation/cloudformation/logs/aws-logs-subscriptionfilter.go b/pkg/goformation/cloudformation/logs/aws-logs-subscriptionfilter.go
similarity index 97%
rename from goformation/cloudformation/logs/aws-logs-subscriptionfilter.go
rename to pkg/goformation/cloudformation/logs/aws-logs-subscriptionfilter.go
index 7c0b29a661..fdeb46ce6e 100644
--- a/goformation/cloudformation/logs/aws-logs-subscriptionfilter.go
+++ b/pkg/goformation/cloudformation/logs/aws-logs-subscriptionfilter.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SubscriptionFilter AWS CloudFormation Resource (AWS::Logs::SubscriptionFilter)
diff --git a/goformation/cloudformation/lookoutequipment/aws-lookoutequipment-inferencescheduler.go b/pkg/goformation/cloudformation/lookoutequipment/aws-lookoutequipment-inferencescheduler.go
similarity index 96%
rename from goformation/cloudformation/lookoutequipment/aws-lookoutequipment-inferencescheduler.go
rename to pkg/goformation/cloudformation/lookoutequipment/aws-lookoutequipment-inferencescheduler.go
index ea54d36adb..08c793fad9 100644
--- a/goformation/cloudformation/lookoutequipment/aws-lookoutequipment-inferencescheduler.go
+++ b/pkg/goformation/cloudformation/lookoutequipment/aws-lookoutequipment-inferencescheduler.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InferenceScheduler AWS CloudFormation Resource (AWS::LookoutEquipment::InferenceScheduler)
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert.go b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert.go
similarity index 97%
rename from goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert.go
rename to pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert.go
index 5c62fe6ccd..6c89b7d6a2 100644
--- a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert.go
+++ b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Alert AWS CloudFormation Resource (AWS::LookoutMetrics::Alert)
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_action.go b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_action.go
similarity index 96%
rename from goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_action.go
rename to pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_action.go
index 77fd501516..730ec03908 100644
--- a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_action.go
+++ b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_action.go
@@ -1,7 +1,7 @@
 package lookoutmetrics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Alert_Action AWS CloudFormation Resource (AWS::LookoutMetrics::Alert.Action)
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_lambdaconfiguration.go b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_lambdaconfiguration.go
similarity index 93%
rename from goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_lambdaconfiguration.go
rename to pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_lambdaconfiguration.go
index 74d413ea7b..1ce6d9fd34 100644
--- a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_lambdaconfiguration.go
+++ b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_lambdaconfiguration.go
@@ -1,9 +1,9 @@
 package lookoutmetrics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Alert_LambdaConfiguration AWS CloudFormation Resource (AWS::LookoutMetrics::Alert.LambdaConfiguration)
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_snsconfiguration.go b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_snsconfiguration.go
similarity index 93%
rename from goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_snsconfiguration.go
rename to pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_snsconfiguration.go
index d45b52acef..b2b70ad99f 100644
--- a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_snsconfiguration.go
+++ b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_snsconfiguration.go
@@ -1,9 +1,9 @@
 package lookoutmetrics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Alert_SNSConfiguration AWS CloudFormation Resource (AWS::LookoutMetrics::Alert.SNSConfiguration)
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector.go b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector.go
similarity index 97%
rename from goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector.go
rename to pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector.go
index 4d8960701f..55ede812a7 100644
--- a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector.go
+++ b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AnomalyDetector AWS CloudFormation Resource (AWS::LookoutMetrics::AnomalyDetector)
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_anomalydetectorconfig.go b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_anomalydetectorconfig.go
similarity index 92%
rename from goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_anomalydetectorconfig.go
rename to pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_anomalydetectorconfig.go
index a0f918f428..e621de8b61 100644
--- a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_anomalydetectorconfig.go
+++ b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_anomalydetectorconfig.go
@@ -1,9 +1,9 @@
 package lookoutmetrics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AnomalyDetector_AnomalyDetectorConfig AWS CloudFormation Resource (AWS::LookoutMetrics::AnomalyDetector.AnomalyDetectorConfig)
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_appflowconfig.go b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_appflowconfig.go
similarity index 93%
rename from goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_appflowconfig.go
rename to pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_appflowconfig.go
index a722aed92d..2c79e98009 100644
--- a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_appflowconfig.go
+++ b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_appflowconfig.go
@@ -1,9 +1,9 @@
 package lookoutmetrics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AnomalyDetector_AppFlowConfig AWS CloudFormation Resource (AWS::LookoutMetrics::AnomalyDetector.AppFlowConfig)
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_cloudwatchconfig.go b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_cloudwatchconfig.go
similarity index 92%
rename from goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_cloudwatchconfig.go
rename to pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_cloudwatchconfig.go
index fbecca2369..d33447a347 100644
--- a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_cloudwatchconfig.go
+++ b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_cloudwatchconfig.go
@@ -1,9 +1,9 @@
 package lookoutmetrics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AnomalyDetector_CloudwatchConfig AWS CloudFormation Resource (AWS::LookoutMetrics::AnomalyDetector.CloudwatchConfig)
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_csvformatdescriptor.go b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_csvformatdescriptor.go
similarity index 95%
rename from goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_csvformatdescriptor.go
rename to pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_csvformatdescriptor.go
index 0f873eab8c..c659e85580 100644
--- a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_csvformatdescriptor.go
+++ b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_csvformatdescriptor.go
@@ -1,9 +1,9 @@
 package lookoutmetrics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AnomalyDetector_CsvFormatDescriptor AWS CloudFormation Resource (AWS::LookoutMetrics::AnomalyDetector.CsvFormatDescriptor)
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_fileformatdescriptor.go b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_fileformatdescriptor.go
similarity index 96%
rename from goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_fileformatdescriptor.go
rename to pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_fileformatdescriptor.go
index f5aa97ded6..474530b26d 100644
--- a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_fileformatdescriptor.go
+++ b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_fileformatdescriptor.go
@@ -1,7 +1,7 @@
 package lookoutmetrics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AnomalyDetector_FileFormatDescriptor AWS CloudFormation Resource (AWS::LookoutMetrics::AnomalyDetector.FileFormatDescriptor)
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_jsonformatdescriptor.go b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_jsonformatdescriptor.go
similarity index 93%
rename from goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_jsonformatdescriptor.go
rename to pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_jsonformatdescriptor.go
index ac27c5c067..0fcea29d0f 100644
--- a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_jsonformatdescriptor.go
+++ b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_jsonformatdescriptor.go
@@ -1,9 +1,9 @@
 package lookoutmetrics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AnomalyDetector_JsonFormatDescriptor AWS CloudFormation Resource (AWS::LookoutMetrics::AnomalyDetector.JsonFormatDescriptor)
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metric.go b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metric.go
similarity index 94%
rename from goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metric.go
rename to pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metric.go
index 3a1d7724af..2d6bdf33e9 100644
--- a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metric.go
+++ b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metric.go
@@ -1,9 +1,9 @@
 package lookoutmetrics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AnomalyDetector_Metric AWS CloudFormation Resource (AWS::LookoutMetrics::AnomalyDetector.Metric)
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metricset.go b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metricset.go
similarity index 96%
rename from goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metricset.go
rename to pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metricset.go
index f00b9e7245..3a9be442d4 100644
--- a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metricset.go
+++ b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metricset.go
@@ -1,9 +1,9 @@
 package lookoutmetrics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AnomalyDetector_MetricSet AWS CloudFormation Resource (AWS::LookoutMetrics::AnomalyDetector.MetricSet)
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metricsource.go b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metricsource.go
similarity index 97%
rename from goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metricsource.go
rename to pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metricsource.go
index cd6200e1f2..12d332bed9 100644
--- a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metricsource.go
+++ b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metricsource.go
@@ -1,7 +1,7 @@
 package lookoutmetrics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AnomalyDetector_MetricSource AWS CloudFormation Resource (AWS::LookoutMetrics::AnomalyDetector.MetricSource)
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_rdssourceconfig.go b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_rdssourceconfig.go
similarity index 96%
rename from goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_rdssourceconfig.go
rename to pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_rdssourceconfig.go
index 04266b00c1..a234bea4be 100644
--- a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_rdssourceconfig.go
+++ b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_rdssourceconfig.go
@@ -1,9 +1,9 @@
 package lookoutmetrics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AnomalyDetector_RDSSourceConfig AWS CloudFormation Resource (AWS::LookoutMetrics::AnomalyDetector.RDSSourceConfig)
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_redshiftsourceconfig.go b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_redshiftsourceconfig.go
similarity index 96%
rename from goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_redshiftsourceconfig.go
rename to pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_redshiftsourceconfig.go
index e0b5546fb1..0dfb3d1a8c 100644
--- a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_redshiftsourceconfig.go
+++ b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_redshiftsourceconfig.go
@@ -1,9 +1,9 @@
 package lookoutmetrics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AnomalyDetector_RedshiftSourceConfig AWS CloudFormation Resource (AWS::LookoutMetrics::AnomalyDetector.RedshiftSourceConfig)
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_s3sourceconfig.go b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_s3sourceconfig.go
similarity index 95%
rename from goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_s3sourceconfig.go
rename to pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_s3sourceconfig.go
index 41dd1b031f..2c231c77e6 100644
--- a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_s3sourceconfig.go
+++ b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_s3sourceconfig.go
@@ -1,9 +1,9 @@
 package lookoutmetrics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AnomalyDetector_S3SourceConfig AWS CloudFormation Resource (AWS::LookoutMetrics::AnomalyDetector.S3SourceConfig)
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_timestampcolumn.go b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_timestampcolumn.go
similarity index 93%
rename from goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_timestampcolumn.go
rename to pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_timestampcolumn.go
index a59f475910..90e9a2a327 100644
--- a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_timestampcolumn.go
+++ b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_timestampcolumn.go
@@ -1,9 +1,9 @@
 package lookoutmetrics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AnomalyDetector_TimestampColumn AWS CloudFormation Resource (AWS::LookoutMetrics::AnomalyDetector.TimestampColumn)
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_vpcconfiguration.go b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_vpcconfiguration.go
similarity index 93%
rename from goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_vpcconfiguration.go
rename to pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_vpcconfiguration.go
index d502e71203..a538ff489a 100644
--- a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_vpcconfiguration.go
+++ b/pkg/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_vpcconfiguration.go
@@ -1,9 +1,9 @@
 package lookoutmetrics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AnomalyDetector_VpcConfiguration AWS CloudFormation Resource (AWS::LookoutMetrics::AnomalyDetector.VpcConfiguration)
diff --git a/goformation/cloudformation/lookoutvision/aws-lookoutvision-project.go b/pkg/goformation/cloudformation/lookoutvision/aws-lookoutvision-project.go
similarity index 96%
rename from goformation/cloudformation/lookoutvision/aws-lookoutvision-project.go
rename to pkg/goformation/cloudformation/lookoutvision/aws-lookoutvision-project.go
index 45c08bdefb..b9a4eb1dba 100644
--- a/goformation/cloudformation/lookoutvision/aws-lookoutvision-project.go
+++ b/pkg/goformation/cloudformation/lookoutvision/aws-lookoutvision-project.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project AWS CloudFormation Resource (AWS::LookoutVision::Project)
diff --git a/goformation/cloudformation/macie/aws-macie-customdataidentifier.go b/pkg/goformation/cloudformation/macie/aws-macie-customdataidentifier.go
similarity index 97%
rename from goformation/cloudformation/macie/aws-macie-customdataidentifier.go
rename to pkg/goformation/cloudformation/macie/aws-macie-customdataidentifier.go
index 7538d640c5..1622294be1 100644
--- a/goformation/cloudformation/macie/aws-macie-customdataidentifier.go
+++ b/pkg/goformation/cloudformation/macie/aws-macie-customdataidentifier.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CustomDataIdentifier AWS CloudFormation Resource (AWS::Macie::CustomDataIdentifier)
diff --git a/goformation/cloudformation/macie/aws-macie-findingsfilter.go b/pkg/goformation/cloudformation/macie/aws-macie-findingsfilter.go
similarity index 97%
rename from goformation/cloudformation/macie/aws-macie-findingsfilter.go
rename to pkg/goformation/cloudformation/macie/aws-macie-findingsfilter.go
index ef22f627f1..ba0659b974 100644
--- a/goformation/cloudformation/macie/aws-macie-findingsfilter.go
+++ b/pkg/goformation/cloudformation/macie/aws-macie-findingsfilter.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FindingsFilter AWS CloudFormation Resource (AWS::Macie::FindingsFilter)
diff --git a/goformation/cloudformation/macie/aws-macie-findingsfilter_criterion.go b/pkg/goformation/cloudformation/macie/aws-macie-findingsfilter_criterion.go
similarity index 94%
rename from goformation/cloudformation/macie/aws-macie-findingsfilter_criterion.go
rename to pkg/goformation/cloudformation/macie/aws-macie-findingsfilter_criterion.go
index 827e70f8e0..3c4e4dc30a 100644
--- a/goformation/cloudformation/macie/aws-macie-findingsfilter_criterion.go
+++ b/pkg/goformation/cloudformation/macie/aws-macie-findingsfilter_criterion.go
@@ -1,7 +1,7 @@
 package macie
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FindingsFilter_Criterion AWS CloudFormation Resource (AWS::Macie::FindingsFilter.Criterion)
diff --git a/goformation/cloudformation/macie/aws-macie-findingsfilter_findingcriteria.go b/pkg/goformation/cloudformation/macie/aws-macie-findingsfilter_findingcriteria.go
similarity index 95%
rename from goformation/cloudformation/macie/aws-macie-findingsfilter_findingcriteria.go
rename to pkg/goformation/cloudformation/macie/aws-macie-findingsfilter_findingcriteria.go
index a30e8f616b..8ed3149b66 100644
--- a/goformation/cloudformation/macie/aws-macie-findingsfilter_findingcriteria.go
+++ b/pkg/goformation/cloudformation/macie/aws-macie-findingsfilter_findingcriteria.go
@@ -1,7 +1,7 @@
 package macie
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FindingsFilter_FindingCriteria AWS CloudFormation Resource (AWS::Macie::FindingsFilter.FindingCriteria)
diff --git a/goformation/cloudformation/macie/aws-macie-findingsfilter_findingsfilterlistitem.go b/pkg/goformation/cloudformation/macie/aws-macie-findingsfilter_findingsfilterlistitem.go
similarity index 93%
rename from goformation/cloudformation/macie/aws-macie-findingsfilter_findingsfilterlistitem.go
rename to pkg/goformation/cloudformation/macie/aws-macie-findingsfilter_findingsfilterlistitem.go
index ed3da25565..11fdb4f135 100644
--- a/goformation/cloudformation/macie/aws-macie-findingsfilter_findingsfilterlistitem.go
+++ b/pkg/goformation/cloudformation/macie/aws-macie-findingsfilter_findingsfilterlistitem.go
@@ -1,9 +1,9 @@
 package macie
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FindingsFilter_FindingsFilterListItem AWS CloudFormation Resource (AWS::Macie::FindingsFilter.FindingsFilterListItem)
diff --git a/goformation/cloudformation/macie/aws-macie-session.go b/pkg/goformation/cloudformation/macie/aws-macie-session.go
similarity index 96%
rename from goformation/cloudformation/macie/aws-macie-session.go
rename to pkg/goformation/cloudformation/macie/aws-macie-session.go
index ca83d4ae93..bceae74edc 100644
--- a/goformation/cloudformation/macie/aws-macie-session.go
+++ b/pkg/goformation/cloudformation/macie/aws-macie-session.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Session AWS CloudFormation Resource (AWS::Macie::Session)
diff --git a/goformation/cloudformation/managedblockchain/aws-managedblockchain-member.go b/pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-member.go
similarity index 97%
rename from goformation/cloudformation/managedblockchain/aws-managedblockchain-member.go
rename to pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-member.go
index 06061bf664..d648e07e65 100644
--- a/goformation/cloudformation/managedblockchain/aws-managedblockchain-member.go
+++ b/pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-member.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Member AWS CloudFormation Resource (AWS::ManagedBlockchain::Member)
diff --git a/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_approvalthresholdpolicy.go b/pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_approvalthresholdpolicy.go
similarity index 94%
rename from goformation/cloudformation/managedblockchain/aws-managedblockchain-member_approvalthresholdpolicy.go
rename to pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_approvalthresholdpolicy.go
index d3f9bd7b94..70feea871b 100644
--- a/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_approvalthresholdpolicy.go
+++ b/pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_approvalthresholdpolicy.go
@@ -1,9 +1,9 @@
 package managedblockchain
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Member_ApprovalThresholdPolicy AWS CloudFormation Resource (AWS::ManagedBlockchain::Member.ApprovalThresholdPolicy)
diff --git a/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_memberconfiguration.go b/pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_memberconfiguration.go
similarity index 94%
rename from goformation/cloudformation/managedblockchain/aws-managedblockchain-member_memberconfiguration.go
rename to pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_memberconfiguration.go
index f4f7671f24..5cdc859161 100644
--- a/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_memberconfiguration.go
+++ b/pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_memberconfiguration.go
@@ -1,9 +1,9 @@
 package managedblockchain
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Member_MemberConfiguration AWS CloudFormation Resource (AWS::ManagedBlockchain::Member.MemberConfiguration)
diff --git a/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_memberfabricconfiguration.go b/pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_memberfabricconfiguration.go
similarity index 93%
rename from goformation/cloudformation/managedblockchain/aws-managedblockchain-member_memberfabricconfiguration.go
rename to pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_memberfabricconfiguration.go
index 6d0122e5db..8dffd8bbe0 100644
--- a/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_memberfabricconfiguration.go
+++ b/pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_memberfabricconfiguration.go
@@ -1,9 +1,9 @@
 package managedblockchain
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Member_MemberFabricConfiguration AWS CloudFormation Resource (AWS::ManagedBlockchain::Member.MemberFabricConfiguration)
diff --git a/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_memberframeworkconfiguration.go b/pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_memberframeworkconfiguration.go
similarity index 96%
rename from goformation/cloudformation/managedblockchain/aws-managedblockchain-member_memberframeworkconfiguration.go
rename to pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_memberframeworkconfiguration.go
index 669d3f27d9..fb35171157 100644
--- a/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_memberframeworkconfiguration.go
+++ b/pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_memberframeworkconfiguration.go
@@ -1,7 +1,7 @@
 package managedblockchain
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Member_MemberFrameworkConfiguration AWS CloudFormation Resource (AWS::ManagedBlockchain::Member.MemberFrameworkConfiguration)
diff --git a/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_networkconfiguration.go b/pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_networkconfiguration.go
similarity index 95%
rename from goformation/cloudformation/managedblockchain/aws-managedblockchain-member_networkconfiguration.go
rename to pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_networkconfiguration.go
index d1f70c253d..0a10c16d51 100644
--- a/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_networkconfiguration.go
+++ b/pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_networkconfiguration.go
@@ -1,9 +1,9 @@
 package managedblockchain
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Member_NetworkConfiguration AWS CloudFormation Resource (AWS::ManagedBlockchain::Member.NetworkConfiguration)
diff --git a/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_networkfabricconfiguration.go b/pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_networkfabricconfiguration.go
similarity index 92%
rename from goformation/cloudformation/managedblockchain/aws-managedblockchain-member_networkfabricconfiguration.go
rename to pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_networkfabricconfiguration.go
index 4c63d31ba5..fbb99882e3 100644
--- a/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_networkfabricconfiguration.go
+++ b/pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_networkfabricconfiguration.go
@@ -1,9 +1,9 @@
 package managedblockchain
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Member_NetworkFabricConfiguration AWS CloudFormation Resource (AWS::ManagedBlockchain::Member.NetworkFabricConfiguration)
diff --git a/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_networkframeworkconfiguration.go b/pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_networkframeworkconfiguration.go
similarity index 96%
rename from goformation/cloudformation/managedblockchain/aws-managedblockchain-member_networkframeworkconfiguration.go
rename to pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_networkframeworkconfiguration.go
index 4c4314727c..14cfeaa529 100644
--- a/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_networkframeworkconfiguration.go
+++ b/pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_networkframeworkconfiguration.go
@@ -1,7 +1,7 @@
 package managedblockchain
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Member_NetworkFrameworkConfiguration AWS CloudFormation Resource (AWS::ManagedBlockchain::Member.NetworkFrameworkConfiguration)
diff --git a/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_votingpolicy.go b/pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_votingpolicy.go
similarity index 95%
rename from goformation/cloudformation/managedblockchain/aws-managedblockchain-member_votingpolicy.go
rename to pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_votingpolicy.go
index 8517a22bd7..08f5664178 100644
--- a/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_votingpolicy.go
+++ b/pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_votingpolicy.go
@@ -1,7 +1,7 @@
 package managedblockchain
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Member_VotingPolicy AWS CloudFormation Resource (AWS::ManagedBlockchain::Member.VotingPolicy)
diff --git a/goformation/cloudformation/managedblockchain/aws-managedblockchain-node.go b/pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-node.go
similarity index 96%
rename from goformation/cloudformation/managedblockchain/aws-managedblockchain-node.go
rename to pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-node.go
index 7d11f252c6..0a09f05d3f 100644
--- a/goformation/cloudformation/managedblockchain/aws-managedblockchain-node.go
+++ b/pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-node.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Node AWS CloudFormation Resource (AWS::ManagedBlockchain::Node)
diff --git a/goformation/cloudformation/managedblockchain/aws-managedblockchain-node_nodeconfiguration.go b/pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-node_nodeconfiguration.go
similarity index 93%
rename from goformation/cloudformation/managedblockchain/aws-managedblockchain-node_nodeconfiguration.go
rename to pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-node_nodeconfiguration.go
index ca14fd88d9..d3bc5ff156 100644
--- a/goformation/cloudformation/managedblockchain/aws-managedblockchain-node_nodeconfiguration.go
+++ b/pkg/goformation/cloudformation/managedblockchain/aws-managedblockchain-node_nodeconfiguration.go
@@ -1,9 +1,9 @@
 package managedblockchain
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Node_NodeConfiguration AWS CloudFormation Resource (AWS::ManagedBlockchain::Node.NodeConfiguration)
diff --git a/goformation/cloudformation/mediaconnect/aws-mediaconnect-flow.go b/pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flow.go
similarity index 97%
rename from goformation/cloudformation/mediaconnect/aws-mediaconnect-flow.go
rename to pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flow.go
index e55f1aabb7..5f39db0137 100644
--- a/goformation/cloudformation/mediaconnect/aws-mediaconnect-flow.go
+++ b/pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flow.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow AWS CloudFormation Resource (AWS::MediaConnect::Flow)
diff --git a/goformation/cloudformation/mediaconnect/aws-mediaconnect-flow_encryption.go b/pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flow_encryption.go
similarity index 96%
rename from goformation/cloudformation/mediaconnect/aws-mediaconnect-flow_encryption.go
rename to pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flow_encryption.go
index 3f79ba6d20..60953b3063 100644
--- a/goformation/cloudformation/mediaconnect/aws-mediaconnect-flow_encryption.go
+++ b/pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flow_encryption.go
@@ -1,9 +1,9 @@
 package mediaconnect
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_Encryption AWS CloudFormation Resource (AWS::MediaConnect::Flow.Encryption)
diff --git a/goformation/cloudformation/mediaconnect/aws-mediaconnect-flow_failoverconfig.go b/pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flow_failoverconfig.go
similarity index 92%
rename from goformation/cloudformation/mediaconnect/aws-mediaconnect-flow_failoverconfig.go
rename to pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flow_failoverconfig.go
index 5def057029..91a55e19f0 100644
--- a/goformation/cloudformation/mediaconnect/aws-mediaconnect-flow_failoverconfig.go
+++ b/pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flow_failoverconfig.go
@@ -1,9 +1,9 @@
 package mediaconnect
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_FailoverConfig AWS CloudFormation Resource (AWS::MediaConnect::Flow.FailoverConfig)
diff --git a/goformation/cloudformation/mediaconnect/aws-mediaconnect-flow_source.go b/pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flow_source.go
similarity index 97%
rename from goformation/cloudformation/mediaconnect/aws-mediaconnect-flow_source.go
rename to pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flow_source.go
index 8105496a46..6abd1f01ea 100644
--- a/goformation/cloudformation/mediaconnect/aws-mediaconnect-flow_source.go
+++ b/pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flow_source.go
@@ -1,9 +1,9 @@
 package mediaconnect
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Flow_Source AWS CloudFormation Resource (AWS::MediaConnect::Flow.Source)
diff --git a/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowentitlement.go b/pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowentitlement.go
similarity index 97%
rename from goformation/cloudformation/mediaconnect/aws-mediaconnect-flowentitlement.go
rename to pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowentitlement.go
index 4b1292c9f7..2a3013a32d 100644
--- a/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowentitlement.go
+++ b/pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowentitlement.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FlowEntitlement AWS CloudFormation Resource (AWS::MediaConnect::FlowEntitlement)
diff --git a/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowentitlement_encryption.go b/pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowentitlement_encryption.go
similarity index 96%
rename from goformation/cloudformation/mediaconnect/aws-mediaconnect-flowentitlement_encryption.go
rename to pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowentitlement_encryption.go
index f435c2fe1b..ce963a139c 100644
--- a/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowentitlement_encryption.go
+++ b/pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowentitlement_encryption.go
@@ -1,9 +1,9 @@
 package mediaconnect
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FlowEntitlement_Encryption AWS CloudFormation Resource (AWS::MediaConnect::FlowEntitlement.Encryption)
diff --git a/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowoutput.go b/pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowoutput.go
similarity index 98%
rename from goformation/cloudformation/mediaconnect/aws-mediaconnect-flowoutput.go
rename to pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowoutput.go
index 785fac484a..03e8162f7c 100644
--- a/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowoutput.go
+++ b/pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowoutput.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FlowOutput AWS CloudFormation Resource (AWS::MediaConnect::FlowOutput)
diff --git a/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_encryption.go b/pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_encryption.go
similarity index 94%
rename from goformation/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_encryption.go
rename to pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_encryption.go
index 85b472ac19..ff42891be8 100644
--- a/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_encryption.go
+++ b/pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_encryption.go
@@ -1,9 +1,9 @@
 package mediaconnect
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FlowOutput_Encryption AWS CloudFormation Resource (AWS::MediaConnect::FlowOutput.Encryption)
diff --git a/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_vpcinterfaceattachment.go b/pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_vpcinterfaceattachment.go
similarity index 92%
rename from goformation/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_vpcinterfaceattachment.go
rename to pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_vpcinterfaceattachment.go
index 5f99ee32ce..0783017500 100644
--- a/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_vpcinterfaceattachment.go
+++ b/pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_vpcinterfaceattachment.go
@@ -1,9 +1,9 @@
 package mediaconnect
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FlowOutput_VpcInterfaceAttachment AWS CloudFormation Resource (AWS::MediaConnect::FlowOutput.VpcInterfaceAttachment)
diff --git a/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowsource.go b/pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowsource.go
similarity index 98%
rename from goformation/cloudformation/mediaconnect/aws-mediaconnect-flowsource.go
rename to pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowsource.go
index 147a84cd0e..8e255707d4 100644
--- a/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowsource.go
+++ b/pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowsource.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FlowSource AWS CloudFormation Resource (AWS::MediaConnect::FlowSource)
diff --git a/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowsource_encryption.go b/pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowsource_encryption.go
similarity index 96%
rename from goformation/cloudformation/mediaconnect/aws-mediaconnect-flowsource_encryption.go
rename to pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowsource_encryption.go
index fc162e8320..62b2de2236 100644
--- a/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowsource_encryption.go
+++ b/pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowsource_encryption.go
@@ -1,9 +1,9 @@
 package mediaconnect
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FlowSource_Encryption AWS CloudFormation Resource (AWS::MediaConnect::FlowSource.Encryption)
diff --git a/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowvpcinterface.go b/pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowvpcinterface.go
similarity index 97%
rename from goformation/cloudformation/mediaconnect/aws-mediaconnect-flowvpcinterface.go
rename to pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowvpcinterface.go
index 79a60ed17e..368415c52e 100644
--- a/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowvpcinterface.go
+++ b/pkg/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowvpcinterface.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FlowVpcInterface AWS CloudFormation Resource (AWS::MediaConnect::FlowVpcInterface)
diff --git a/goformation/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate.go b/pkg/goformation/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate.go
similarity index 97%
rename from goformation/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate.go
rename to pkg/goformation/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate.go
index 883bd44585..254ca9814d 100644
--- a/goformation/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate.go
+++ b/pkg/goformation/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // JobTemplate AWS CloudFormation Resource (AWS::MediaConvert::JobTemplate)
diff --git a/goformation/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate_accelerationsettings.go b/pkg/goformation/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate_accelerationsettings.go
similarity index 92%
rename from goformation/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate_accelerationsettings.go
rename to pkg/goformation/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate_accelerationsettings.go
index 86e11c433f..9cd658ed32 100644
--- a/goformation/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate_accelerationsettings.go
+++ b/pkg/goformation/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate_accelerationsettings.go
@@ -1,9 +1,9 @@
 package mediaconvert
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // JobTemplate_AccelerationSettings AWS CloudFormation Resource (AWS::MediaConvert::JobTemplate.AccelerationSettings)
diff --git a/goformation/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate_hopdestination.go b/pkg/goformation/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate_hopdestination.go
similarity index 93%
rename from goformation/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate_hopdestination.go
rename to pkg/goformation/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate_hopdestination.go
index 04199e9e89..047adbe204 100644
--- a/goformation/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate_hopdestination.go
+++ b/pkg/goformation/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate_hopdestination.go
@@ -1,9 +1,9 @@
 package mediaconvert
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // JobTemplate_HopDestination AWS CloudFormation Resource (AWS::MediaConvert::JobTemplate.HopDestination)
diff --git a/goformation/cloudformation/mediaconvert/aws-mediaconvert-preset.go b/pkg/goformation/cloudformation/mediaconvert/aws-mediaconvert-preset.go
similarity index 97%
rename from goformation/cloudformation/mediaconvert/aws-mediaconvert-preset.go
rename to pkg/goformation/cloudformation/mediaconvert/aws-mediaconvert-preset.go
index a24bd581bd..cddd1213ea 100644
--- a/goformation/cloudformation/mediaconvert/aws-mediaconvert-preset.go
+++ b/pkg/goformation/cloudformation/mediaconvert/aws-mediaconvert-preset.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Preset AWS CloudFormation Resource (AWS::MediaConvert::Preset)
diff --git a/goformation/cloudformation/mediaconvert/aws-mediaconvert-queue.go b/pkg/goformation/cloudformation/mediaconvert/aws-mediaconvert-queue.go
similarity index 97%
rename from goformation/cloudformation/mediaconvert/aws-mediaconvert-queue.go
rename to pkg/goformation/cloudformation/mediaconvert/aws-mediaconvert-queue.go
index 19946b84f8..cb3f74befb 100644
--- a/goformation/cloudformation/mediaconvert/aws-mediaconvert-queue.go
+++ b/pkg/goformation/cloudformation/mediaconvert/aws-mediaconvert-queue.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Queue AWS CloudFormation Resource (AWS::MediaConvert::Queue)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel.go
similarity index 97%
rename from goformation/cloudformation/medialive/aws-medialive-channel.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel.go
index 91e8586ab1..85e037d434 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel AWS CloudFormation Resource (AWS::MediaLive::Channel)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_aacsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_aacsettings.go
similarity index 96%
rename from goformation/cloudformation/medialive/aws-medialive-channel_aacsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_aacsettings.go
index f9870293f0..a33f74353c 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_aacsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_aacsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_AacSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.AacSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_ac3settings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_ac3settings.go
similarity index 95%
rename from goformation/cloudformation/medialive/aws-medialive-channel_ac3settings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_ac3settings.go
index 9bb6b104e1..82cb8bdb04 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_ac3settings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_ac3settings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_Ac3Settings AWS CloudFormation Resource (AWS::MediaLive::Channel.Ac3Settings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_ancillarysourcesettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_ancillarysourcesettings.go
similarity index 92%
rename from goformation/cloudformation/medialive/aws-medialive-channel_ancillarysourcesettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_ancillarysourcesettings.go
index 588f979ee7..13c12c54b0 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_ancillarysourcesettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_ancillarysourcesettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_AncillarySourceSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.AncillarySourceSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_archivecdnsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_archivecdnsettings.go
similarity index 95%
rename from goformation/cloudformation/medialive/aws-medialive-channel_archivecdnsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_archivecdnsettings.go
index 5457452d83..7037df6a3c 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_archivecdnsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_archivecdnsettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_ArchiveCdnSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.ArchiveCdnSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_archivecontainersettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_archivecontainersettings.go
similarity index 96%
rename from goformation/cloudformation/medialive/aws-medialive-channel_archivecontainersettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_archivecontainersettings.go
index 9dbe1aa25e..c759bec02a 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_archivecontainersettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_archivecontainersettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_ArchiveContainerSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.ArchiveContainerSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_archivegroupsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_archivegroupsettings.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_archivegroupsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_archivegroupsettings.go
index 3ad5970c60..81f5f28a10 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_archivegroupsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_archivegroupsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_ArchiveGroupSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.ArchiveGroupSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_archiveoutputsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_archiveoutputsettings.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_archiveoutputsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_archiveoutputsettings.go
index ddee8966d5..1fcb34320f 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_archiveoutputsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_archiveoutputsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_ArchiveOutputSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.ArchiveOutputSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_archives3settings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_archives3settings.go
similarity index 91%
rename from goformation/cloudformation/medialive/aws-medialive-channel_archives3settings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_archives3settings.go
index c64e1ffa9e..d89eca0063 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_archives3settings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_archives3settings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_ArchiveS3Settings AWS CloudFormation Resource (AWS::MediaLive::Channel.ArchiveS3Settings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_aribdestinationsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_aribdestinationsettings.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_aribdestinationsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_aribdestinationsettings.go
index ff36bdc977..60bfd276c2 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_aribdestinationsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_aribdestinationsettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_AribDestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.AribDestinationSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_aribsourcesettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_aribsourcesettings.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_aribsourcesettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_aribsourcesettings.go
index 67d2ed2b29..ed6339b7d9 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_aribsourcesettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_aribsourcesettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_AribSourceSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.AribSourceSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_audiochannelmapping.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_audiochannelmapping.go
similarity index 93%
rename from goformation/cloudformation/medialive/aws-medialive-channel_audiochannelmapping.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_audiochannelmapping.go
index acf32598d8..445853912d 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_audiochannelmapping.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_audiochannelmapping.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_AudioChannelMapping AWS CloudFormation Resource (AWS::MediaLive::Channel.AudioChannelMapping)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_audiocodecsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_audiocodecsettings.go
similarity index 97%
rename from goformation/cloudformation/medialive/aws-medialive-channel_audiocodecsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_audiocodecsettings.go
index 4d436d9240..4eb36949fe 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_audiocodecsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_audiocodecsettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_AudioCodecSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.AudioCodecSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_audiodescription.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_audiodescription.go
similarity index 97%
rename from goformation/cloudformation/medialive/aws-medialive-channel_audiodescription.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_audiodescription.go
index 2665a686aa..7da37caf2e 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_audiodescription.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_audiodescription.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_AudioDescription AWS CloudFormation Resource (AWS::MediaLive::Channel.AudioDescription)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_audiohlsrenditionselection.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_audiohlsrenditionselection.go
similarity index 93%
rename from goformation/cloudformation/medialive/aws-medialive-channel_audiohlsrenditionselection.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_audiohlsrenditionselection.go
index df81e96891..bc82cea124 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_audiohlsrenditionselection.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_audiohlsrenditionselection.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_AudioHlsRenditionSelection AWS CloudFormation Resource (AWS::MediaLive::Channel.AudioHlsRenditionSelection)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_audiolanguageselection.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_audiolanguageselection.go
similarity index 93%
rename from goformation/cloudformation/medialive/aws-medialive-channel_audiolanguageselection.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_audiolanguageselection.go
index 4f94f432c4..ce5736bc0d 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_audiolanguageselection.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_audiolanguageselection.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_AudioLanguageSelection AWS CloudFormation Resource (AWS::MediaLive::Channel.AudioLanguageSelection)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_audionormalizationsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_audionormalizationsettings.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_audionormalizationsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_audionormalizationsettings.go
index 17262ba042..fc5f409ac1 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_audionormalizationsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_audionormalizationsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_AudioNormalizationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.AudioNormalizationSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_audioonlyhlssettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_audioonlyhlssettings.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_audioonlyhlssettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_audioonlyhlssettings.go
index 5011d73feb..2484a6af98 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_audioonlyhlssettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_audioonlyhlssettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_AudioOnlyHlsSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.AudioOnlyHlsSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_audiopidselection.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_audiopidselection.go
similarity index 91%
rename from goformation/cloudformation/medialive/aws-medialive-channel_audiopidselection.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_audiopidselection.go
index a7462ce88d..108bead02f 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_audiopidselection.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_audiopidselection.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_AudioPidSelection AWS CloudFormation Resource (AWS::MediaLive::Channel.AudioPidSelection)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_audioselector.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_audioselector.go
similarity index 92%
rename from goformation/cloudformation/medialive/aws-medialive-channel_audioselector.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_audioselector.go
index c58e5a446b..de490d8961 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_audioselector.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_audioselector.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_AudioSelector AWS CloudFormation Resource (AWS::MediaLive::Channel.AudioSelector)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_audioselectorsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_audioselectorsettings.go
similarity index 97%
rename from goformation/cloudformation/medialive/aws-medialive-channel_audioselectorsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_audioselectorsettings.go
index 32acdc5238..0503f35c5f 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_audioselectorsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_audioselectorsettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_AudioSelectorSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.AudioSelectorSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_audiosilencefailoversettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_audiosilencefailoversettings.go
similarity index 93%
rename from goformation/cloudformation/medialive/aws-medialive-channel_audiosilencefailoversettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_audiosilencefailoversettings.go
index 83a37bcb29..6e1294fb7d 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_audiosilencefailoversettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_audiosilencefailoversettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_AudioSilenceFailoverSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.AudioSilenceFailoverSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_audiotrack.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_audiotrack.go
similarity index 91%
rename from goformation/cloudformation/medialive/aws-medialive-channel_audiotrack.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_audiotrack.go
index ea3c825d6b..6d6e383704 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_audiotrack.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_audiotrack.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_AudioTrack AWS CloudFormation Resource (AWS::MediaLive::Channel.AudioTrack)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_audiotrackselection.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_audiotrackselection.go
similarity index 95%
rename from goformation/cloudformation/medialive/aws-medialive-channel_audiotrackselection.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_audiotrackselection.go
index 3d853d02cd..6a1fb9fe9b 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_audiotrackselection.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_audiotrackselection.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_AudioTrackSelection AWS CloudFormation Resource (AWS::MediaLive::Channel.AudioTrackSelection)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_audiowatermarksettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_audiowatermarksettings.go
similarity index 95%
rename from goformation/cloudformation/medialive/aws-medialive-channel_audiowatermarksettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_audiowatermarksettings.go
index 38cacb1347..2b1a701507 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_audiowatermarksettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_audiowatermarksettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_AudioWatermarkSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.AudioWatermarkSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_automaticinputfailoversettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_automaticinputfailoversettings.go
similarity index 95%
rename from goformation/cloudformation/medialive/aws-medialive-channel_automaticinputfailoversettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_automaticinputfailoversettings.go
index cf27fe4bb6..b047ded759 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_automaticinputfailoversettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_automaticinputfailoversettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_AutomaticInputFailoverSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.AutomaticInputFailoverSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_availblanking.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_availblanking.go
similarity index 92%
rename from goformation/cloudformation/medialive/aws-medialive-channel_availblanking.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_availblanking.go
index e04c63fe2d..198edd1331 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_availblanking.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_availblanking.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_AvailBlanking AWS CloudFormation Resource (AWS::MediaLive::Channel.AvailBlanking)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_availconfiguration.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_availconfiguration.go
similarity index 95%
rename from goformation/cloudformation/medialive/aws-medialive-channel_availconfiguration.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_availconfiguration.go
index 71e8da0951..4929dbce28 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_availconfiguration.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_availconfiguration.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_AvailConfiguration AWS CloudFormation Resource (AWS::MediaLive::Channel.AvailConfiguration)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_availsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_availsettings.go
similarity index 96%
rename from goformation/cloudformation/medialive/aws-medialive-channel_availsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_availsettings.go
index 44b94febab..cc70aa2091 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_availsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_availsettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_AvailSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.AvailSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_blackoutslate.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_blackoutslate.go
similarity index 95%
rename from goformation/cloudformation/medialive/aws-medialive-channel_blackoutslate.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_blackoutslate.go
index 5417eab338..56104c5bdf 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_blackoutslate.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_blackoutslate.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_BlackoutSlate AWS CloudFormation Resource (AWS::MediaLive::Channel.BlackoutSlate)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_burnindestinationsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_burnindestinationsettings.go
similarity index 97%
rename from goformation/cloudformation/medialive/aws-medialive-channel_burnindestinationsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_burnindestinationsettings.go
index a2ee0984fe..84fad64b12 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_burnindestinationsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_burnindestinationsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_BurnInDestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.BurnInDestinationSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_captiondescription.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_captiondescription.go
similarity index 95%
rename from goformation/cloudformation/medialive/aws-medialive-channel_captiondescription.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_captiondescription.go
index 27354bdc85..b1a24831c7 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_captiondescription.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_captiondescription.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_CaptionDescription AWS CloudFormation Resource (AWS::MediaLive::Channel.CaptionDescription)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_captiondestinationsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_captiondestinationsettings.go
similarity index 98%
rename from goformation/cloudformation/medialive/aws-medialive-channel_captiondestinationsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_captiondestinationsettings.go
index 9d63967247..1daa57e485 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_captiondestinationsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_captiondestinationsettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_CaptionDestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.CaptionDestinationSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_captionlanguagemapping.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_captionlanguagemapping.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_captionlanguagemapping.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_captionlanguagemapping.go
index 9e24f3e824..3169716cc4 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_captionlanguagemapping.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_captionlanguagemapping.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_CaptionLanguageMapping AWS CloudFormation Resource (AWS::MediaLive::Channel.CaptionLanguageMapping)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_captionrectangle.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_captionrectangle.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_captionrectangle.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_captionrectangle.go
index b15a9ad103..16be22be50 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_captionrectangle.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_captionrectangle.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_CaptionRectangle AWS CloudFormation Resource (AWS::MediaLive::Channel.CaptionRectangle)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_captionselector.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_captionselector.go
similarity index 93%
rename from goformation/cloudformation/medialive/aws-medialive-channel_captionselector.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_captionselector.go
index 05894264a6..2755942170 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_captionselector.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_captionselector.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_CaptionSelector AWS CloudFormation Resource (AWS::MediaLive::Channel.CaptionSelector)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_captionselectorsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_captionselectorsettings.go
similarity index 98%
rename from goformation/cloudformation/medialive/aws-medialive-channel_captionselectorsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_captionselectorsettings.go
index 6af15116a4..6ffd3dfba9 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_captionselectorsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_captionselectorsettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_CaptionSelectorSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.CaptionSelectorSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_cdiinputspecification.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_cdiinputspecification.go
similarity index 91%
rename from goformation/cloudformation/medialive/aws-medialive-channel_cdiinputspecification.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_cdiinputspecification.go
index 9b0ba2948c..f0cd068a7d 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_cdiinputspecification.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_cdiinputspecification.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_CdiInputSpecification AWS CloudFormation Resource (AWS::MediaLive::Channel.CdiInputSpecification)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_colorspacepassthroughsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_colorspacepassthroughsettings.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_colorspacepassthroughsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_colorspacepassthroughsettings.go
index fb6bbdb1cc..3a13ae87b2 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_colorspacepassthroughsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_colorspacepassthroughsettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_ColorSpacePassthroughSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.ColorSpacePassthroughSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_dvbnitsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_dvbnitsettings.go
similarity index 93%
rename from goformation/cloudformation/medialive/aws-medialive-channel_dvbnitsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_dvbnitsettings.go
index 5237446a76..247a47ac41 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_dvbnitsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_dvbnitsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_DvbNitSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.DvbNitSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_dvbsdtsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_dvbsdtsettings.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_dvbsdtsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_dvbsdtsettings.go
index 637a028625..55f5f06bef 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_dvbsdtsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_dvbsdtsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_DvbSdtSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.DvbSdtSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_dvbsubdestinationsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_dvbsubdestinationsettings.go
similarity index 97%
rename from goformation/cloudformation/medialive/aws-medialive-channel_dvbsubdestinationsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_dvbsubdestinationsettings.go
index 288fefde44..b6c5f72ca7 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_dvbsubdestinationsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_dvbsubdestinationsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_DvbSubDestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.DvbSubDestinationSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_dvbsubsourcesettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_dvbsubsourcesettings.go
similarity index 93%
rename from goformation/cloudformation/medialive/aws-medialive-channel_dvbsubsourcesettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_dvbsubsourcesettings.go
index 33dd8860b3..19824e29a6 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_dvbsubsourcesettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_dvbsubsourcesettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_DvbSubSourceSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.DvbSubSourceSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_dvbtdtsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_dvbtdtsettings.go
similarity index 91%
rename from goformation/cloudformation/medialive/aws-medialive-channel_dvbtdtsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_dvbtdtsettings.go
index 9013ffd6ca..5f1a55aa97 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_dvbtdtsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_dvbtdtsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_DvbTdtSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.DvbTdtSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_eac3settings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_eac3settings.go
similarity index 98%
rename from goformation/cloudformation/medialive/aws-medialive-channel_eac3settings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_eac3settings.go
index f2975eeb1b..311a7d8a44 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_eac3settings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_eac3settings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_Eac3Settings AWS CloudFormation Resource (AWS::MediaLive::Channel.Eac3Settings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_ebuttddestinationsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_ebuttddestinationsettings.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_ebuttddestinationsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_ebuttddestinationsettings.go
index 4ca0304069..5bcaefc1a5 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_ebuttddestinationsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_ebuttddestinationsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_EbuTtDDestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.EbuTtDDestinationSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_embeddeddestinationsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_embeddeddestinationsettings.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_embeddeddestinationsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_embeddeddestinationsettings.go
index 7beb8f4969..bef2d5d6c3 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_embeddeddestinationsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_embeddeddestinationsettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_EmbeddedDestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.EmbeddedDestinationSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_embeddedplusscte20destinationsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_embeddedplusscte20destinationsettings.go
similarity index 95%
rename from goformation/cloudformation/medialive/aws-medialive-channel_embeddedplusscte20destinationsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_embeddedplusscte20destinationsettings.go
index cc1477b53c..619396cb17 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_embeddedplusscte20destinationsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_embeddedplusscte20destinationsettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_EmbeddedPlusScte20DestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.EmbeddedPlusScte20DestinationSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_embeddedsourcesettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_embeddedsourcesettings.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_embeddedsourcesettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_embeddedsourcesettings.go
index 63179ede9a..5a0320fbe6 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_embeddedsourcesettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_embeddedsourcesettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_EmbeddedSourceSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.EmbeddedSourceSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_encodersettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_encodersettings.go
similarity index 98%
rename from goformation/cloudformation/medialive/aws-medialive-channel_encodersettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_encodersettings.go
index 810061c1b3..45f0971b1f 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_encodersettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_encodersettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_EncoderSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.EncoderSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_failovercondition.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_failovercondition.go
similarity index 95%
rename from goformation/cloudformation/medialive/aws-medialive-channel_failovercondition.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_failovercondition.go
index e6ae387480..1336ab8db0 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_failovercondition.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_failovercondition.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_FailoverCondition AWS CloudFormation Resource (AWS::MediaLive::Channel.FailoverCondition)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_failoverconditionsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_failoverconditionsettings.go
similarity index 97%
rename from goformation/cloudformation/medialive/aws-medialive-channel_failoverconditionsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_failoverconditionsettings.go
index 4b86e6f15d..f704471332 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_failoverconditionsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_failoverconditionsettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_FailoverConditionSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.FailoverConditionSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_featureactivations.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_featureactivations.go
similarity index 92%
rename from goformation/cloudformation/medialive/aws-medialive-channel_featureactivations.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_featureactivations.go
index f0d2a37b51..c6cabb35e7 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_featureactivations.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_featureactivations.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_FeatureActivations AWS CloudFormation Resource (AWS::MediaLive::Channel.FeatureActivations)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_fecoutputsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_fecoutputsettings.go
similarity index 93%
rename from goformation/cloudformation/medialive/aws-medialive-channel_fecoutputsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_fecoutputsettings.go
index 752a0c8b25..2bb2d2571d 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_fecoutputsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_fecoutputsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_FecOutputSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.FecOutputSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_fmp4hlssettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_fmp4hlssettings.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_fmp4hlssettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_fmp4hlssettings.go
index 77d58f94c8..bf6b2907ce 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_fmp4hlssettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_fmp4hlssettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_Fmp4HlsSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.Fmp4HlsSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_framecapturecdnsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_framecapturecdnsettings.go
similarity index 95%
rename from goformation/cloudformation/medialive/aws-medialive-channel_framecapturecdnsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_framecapturecdnsettings.go
index ecbb2d204c..06be9bc790 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_framecapturecdnsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_framecapturecdnsettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_FrameCaptureCdnSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.FrameCaptureCdnSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_framecapturegroupsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_framecapturegroupsettings.go
similarity index 96%
rename from goformation/cloudformation/medialive/aws-medialive-channel_framecapturegroupsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_framecapturegroupsettings.go
index b764afc648..6c63ff731a 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_framecapturegroupsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_framecapturegroupsettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_FrameCaptureGroupSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.FrameCaptureGroupSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_framecapturehlssettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_framecapturehlssettings.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_framecapturehlssettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_framecapturehlssettings.go
index db3aab5022..7b2212ff73 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_framecapturehlssettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_framecapturehlssettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_FrameCaptureHlsSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.FrameCaptureHlsSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_framecaptureoutputsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_framecaptureoutputsettings.go
similarity index 92%
rename from goformation/cloudformation/medialive/aws-medialive-channel_framecaptureoutputsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_framecaptureoutputsettings.go
index 9f66aab264..8fa4df061b 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_framecaptureoutputsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_framecaptureoutputsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_FrameCaptureOutputSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.FrameCaptureOutputSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_framecaptures3settings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_framecaptures3settings.go
similarity index 91%
rename from goformation/cloudformation/medialive/aws-medialive-channel_framecaptures3settings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_framecaptures3settings.go
index 97c877befd..63e4645834 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_framecaptures3settings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_framecaptures3settings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_FrameCaptureS3Settings AWS CloudFormation Resource (AWS::MediaLive::Channel.FrameCaptureS3Settings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_framecapturesettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_framecapturesettings.go
similarity index 93%
rename from goformation/cloudformation/medialive/aws-medialive-channel_framecapturesettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_framecapturesettings.go
index e21f4fe205..4213939841 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_framecapturesettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_framecapturesettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_FrameCaptureSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.FrameCaptureSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_globalconfiguration.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_globalconfiguration.go
similarity index 95%
rename from goformation/cloudformation/medialive/aws-medialive-channel_globalconfiguration.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_globalconfiguration.go
index 04a4f543be..4556b7c3ab 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_globalconfiguration.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_globalconfiguration.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_GlobalConfiguration AWS CloudFormation Resource (AWS::MediaLive::Channel.GlobalConfiguration)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_h264colorspacesettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_h264colorspacesettings.go
similarity index 97%
rename from goformation/cloudformation/medialive/aws-medialive-channel_h264colorspacesettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_h264colorspacesettings.go
index 68b8c6753d..fe6fc648b9 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_h264colorspacesettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_h264colorspacesettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_H264ColorSpaceSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.H264ColorSpaceSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_h264filtersettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_h264filtersettings.go
similarity index 95%
rename from goformation/cloudformation/medialive/aws-medialive-channel_h264filtersettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_h264filtersettings.go
index 55fff637bf..a84f881336 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_h264filtersettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_h264filtersettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_H264FilterSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.H264FilterSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_h264settings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_h264settings.go
similarity index 98%
rename from goformation/cloudformation/medialive/aws-medialive-channel_h264settings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_h264settings.go
index fb3aabdaf5..cf54bf733d 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_h264settings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_h264settings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_H264Settings AWS CloudFormation Resource (AWS::MediaLive::Channel.H264Settings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_h265colorspacesettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_h265colorspacesettings.go
similarity index 97%
rename from goformation/cloudformation/medialive/aws-medialive-channel_h265colorspacesettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_h265colorspacesettings.go
index 4f1fda34d3..d739427cda 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_h265colorspacesettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_h265colorspacesettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_H265ColorSpaceSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.H265ColorSpaceSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_h265filtersettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_h265filtersettings.go
similarity index 95%
rename from goformation/cloudformation/medialive/aws-medialive-channel_h265filtersettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_h265filtersettings.go
index b73eacbab2..d2eaf43f92 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_h265filtersettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_h265filtersettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_H265FilterSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.H265FilterSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_h265settings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_h265settings.go
similarity index 98%
rename from goformation/cloudformation/medialive/aws-medialive-channel_h265settings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_h265settings.go
index b7634ad55b..3d209d072c 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_h265settings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_h265settings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_H265Settings AWS CloudFormation Resource (AWS::MediaLive::Channel.H265Settings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_hdr10settings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_hdr10settings.go
similarity index 92%
rename from goformation/cloudformation/medialive/aws-medialive-channel_hdr10settings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_hdr10settings.go
index 0be8fcdd87..a6fe265034 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_hdr10settings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_hdr10settings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_Hdr10Settings AWS CloudFormation Resource (AWS::MediaLive::Channel.Hdr10Settings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_hlsakamaisettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_hlsakamaisettings.go
similarity index 96%
rename from goformation/cloudformation/medialive/aws-medialive-channel_hlsakamaisettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_hlsakamaisettings.go
index 100031bd35..7c6353dd70 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_hlsakamaisettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_hlsakamaisettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_HlsAkamaiSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.HlsAkamaiSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_hlsbasicputsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_hlsbasicputsettings.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_hlsbasicputsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_hlsbasicputsettings.go
index e2558e4d0d..0e3b025441 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_hlsbasicputsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_hlsbasicputsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_HlsBasicPutSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.HlsBasicPutSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_hlscdnsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_hlscdnsettings.go
similarity index 97%
rename from goformation/cloudformation/medialive/aws-medialive-channel_hlscdnsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_hlscdnsettings.go
index a2749e96a1..468d3660d9 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_hlscdnsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_hlscdnsettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_HlsCdnSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.HlsCdnSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_hlsgroupsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_hlsgroupsettings.go
similarity index 99%
rename from goformation/cloudformation/medialive/aws-medialive-channel_hlsgroupsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_hlsgroupsettings.go
index 13516d6189..2f0f3ecd2b 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_hlsgroupsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_hlsgroupsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_HlsGroupSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.HlsGroupSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_hlsinputsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_hlsinputsettings.go
similarity index 95%
rename from goformation/cloudformation/medialive/aws-medialive-channel_hlsinputsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_hlsinputsettings.go
index d68f01b40b..71ee4070a5 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_hlsinputsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_hlsinputsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_HlsInputSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.HlsInputSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_hlsmediastoresettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_hlsmediastoresettings.go
similarity index 95%
rename from goformation/cloudformation/medialive/aws-medialive-channel_hlsmediastoresettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_hlsmediastoresettings.go
index dd4a857f18..bdce25542c 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_hlsmediastoresettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_hlsmediastoresettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_HlsMediaStoreSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.HlsMediaStoreSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_hlsoutputsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_hlsoutputsettings.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_hlsoutputsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_hlsoutputsettings.go
index 5646ecc217..41c02ff7d4 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_hlsoutputsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_hlsoutputsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_HlsOutputSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.HlsOutputSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_hlss3settings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_hlss3settings.go
similarity index 91%
rename from goformation/cloudformation/medialive/aws-medialive-channel_hlss3settings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_hlss3settings.go
index eaa7d7506f..f82ec66d73 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_hlss3settings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_hlss3settings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_HlsS3Settings AWS CloudFormation Resource (AWS::MediaLive::Channel.HlsS3Settings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_hlssettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_hlssettings.go
similarity index 97%
rename from goformation/cloudformation/medialive/aws-medialive-channel_hlssettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_hlssettings.go
index 46bd08a31d..1369bad437 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_hlssettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_hlssettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_HlsSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.HlsSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_hlswebdavsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_hlswebdavsettings.go
similarity index 95%
rename from goformation/cloudformation/medialive/aws-medialive-channel_hlswebdavsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_hlswebdavsettings.go
index cfa7e3f287..a36faa3ab5 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_hlswebdavsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_hlswebdavsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_HlsWebdavSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.HlsWebdavSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_htmlmotiongraphicssettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_htmlmotiongraphicssettings.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_htmlmotiongraphicssettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_htmlmotiongraphicssettings.go
index 0d0bfb2959..f9357e213d 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_htmlmotiongraphicssettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_htmlmotiongraphicssettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_HtmlMotionGraphicsSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.HtmlMotionGraphicsSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_inputattachment.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_inputattachment.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_inputattachment.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_inputattachment.go
index 1eac8b748f..8b39351c0f 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_inputattachment.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_inputattachment.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_InputAttachment AWS CloudFormation Resource (AWS::MediaLive::Channel.InputAttachment)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_inputchannellevel.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_inputchannellevel.go
similarity index 92%
rename from goformation/cloudformation/medialive/aws-medialive-channel_inputchannellevel.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_inputchannellevel.go
index d5495b55f7..8109cacdc9 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_inputchannellevel.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_inputchannellevel.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_InputChannelLevel AWS CloudFormation Resource (AWS::MediaLive::Channel.InputChannelLevel)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_inputlocation.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_inputlocation.go
similarity index 93%
rename from goformation/cloudformation/medialive/aws-medialive-channel_inputlocation.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_inputlocation.go
index a6490d603d..367d1088b5 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_inputlocation.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_inputlocation.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_InputLocation AWS CloudFormation Resource (AWS::MediaLive::Channel.InputLocation)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_inputlossbehavior.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_inputlossbehavior.go
similarity index 95%
rename from goformation/cloudformation/medialive/aws-medialive-channel_inputlossbehavior.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_inputlossbehavior.go
index 49136ba9f9..344951d65a 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_inputlossbehavior.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_inputlossbehavior.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_InputLossBehavior AWS CloudFormation Resource (AWS::MediaLive::Channel.InputLossBehavior)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_inputlossfailoversettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_inputlossfailoversettings.go
similarity index 92%
rename from goformation/cloudformation/medialive/aws-medialive-channel_inputlossfailoversettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_inputlossfailoversettings.go
index d287b7dac5..d13eeb0fc8 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_inputlossfailoversettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_inputlossfailoversettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_InputLossFailoverSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.InputLossFailoverSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_inputsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_inputsettings.go
similarity index 96%
rename from goformation/cloudformation/medialive/aws-medialive-channel_inputsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_inputsettings.go
index e0538a56f5..d359c3466e 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_inputsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_inputsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_InputSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.InputSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_inputspecification.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_inputspecification.go
similarity index 93%
rename from goformation/cloudformation/medialive/aws-medialive-channel_inputspecification.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_inputspecification.go
index 06bdaa49f8..f9aa61f6cb 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_inputspecification.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_inputspecification.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_InputSpecification AWS CloudFormation Resource (AWS::MediaLive::Channel.InputSpecification)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_keyprovidersettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_keyprovidersettings.go
similarity index 95%
rename from goformation/cloudformation/medialive/aws-medialive-channel_keyprovidersettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_keyprovidersettings.go
index da7742db83..8b4a5cffe0 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_keyprovidersettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_keyprovidersettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_KeyProviderSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.KeyProviderSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_m2tssettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_m2tssettings.go
similarity index 99%
rename from goformation/cloudformation/medialive/aws-medialive-channel_m2tssettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_m2tssettings.go
index 8de1e29429..6b6ff2c6aa 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_m2tssettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_m2tssettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_M2tsSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.M2tsSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_m3u8settings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_m3u8settings.go
similarity index 97%
rename from goformation/cloudformation/medialive/aws-medialive-channel_m3u8settings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_m3u8settings.go
index 0aff04e008..8ef960284e 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_m3u8settings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_m3u8settings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_M3u8Settings AWS CloudFormation Resource (AWS::MediaLive::Channel.M3u8Settings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_mediapackagegroupsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_mediapackagegroupsettings.go
similarity index 95%
rename from goformation/cloudformation/medialive/aws-medialive-channel_mediapackagegroupsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_mediapackagegroupsettings.go
index 2ec21eb3af..e039a91ec1 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_mediapackagegroupsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_mediapackagegroupsettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_MediaPackageGroupSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.MediaPackageGroupSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_mediapackageoutputdestinationsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_mediapackageoutputdestinationsettings.go
similarity index 92%
rename from goformation/cloudformation/medialive/aws-medialive-channel_mediapackageoutputdestinationsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_mediapackageoutputdestinationsettings.go
index 1274f4f5cd..c27f302463 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_mediapackageoutputdestinationsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_mediapackageoutputdestinationsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_MediaPackageOutputDestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.MediaPackageOutputDestinationSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_mediapackageoutputsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_mediapackageoutputsettings.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_mediapackageoutputsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_mediapackageoutputsettings.go
index 31afc97ddc..6c8f962015 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_mediapackageoutputsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_mediapackageoutputsettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_MediaPackageOutputSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.MediaPackageOutputSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_motiongraphicsconfiguration.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_motiongraphicsconfiguration.go
similarity index 93%
rename from goformation/cloudformation/medialive/aws-medialive-channel_motiongraphicsconfiguration.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_motiongraphicsconfiguration.go
index fe95646047..319aa63d43 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_motiongraphicsconfiguration.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_motiongraphicsconfiguration.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_MotionGraphicsConfiguration AWS CloudFormation Resource (AWS::MediaLive::Channel.MotionGraphicsConfiguration)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_motiongraphicssettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_motiongraphicssettings.go
similarity index 95%
rename from goformation/cloudformation/medialive/aws-medialive-channel_motiongraphicssettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_motiongraphicssettings.go
index 213f4fbfd3..59fd022724 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_motiongraphicssettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_motiongraphicssettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_MotionGraphicsSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.MotionGraphicsSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_mp2settings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_mp2settings.go
similarity index 93%
rename from goformation/cloudformation/medialive/aws-medialive-channel_mp2settings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_mp2settings.go
index 045fd2da87..a00de03150 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_mp2settings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_mp2settings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_Mp2Settings AWS CloudFormation Resource (AWS::MediaLive::Channel.Mp2Settings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_mpeg2filtersettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_mpeg2filtersettings.go
similarity index 95%
rename from goformation/cloudformation/medialive/aws-medialive-channel_mpeg2filtersettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_mpeg2filtersettings.go
index 9a0a1788a3..ef0d984675 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_mpeg2filtersettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_mpeg2filtersettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_Mpeg2FilterSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.Mpeg2FilterSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_mpeg2settings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_mpeg2settings.go
similarity index 97%
rename from goformation/cloudformation/medialive/aws-medialive-channel_mpeg2settings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_mpeg2settings.go
index efaccf4511..807aeeab47 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_mpeg2settings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_mpeg2settings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_Mpeg2Settings AWS CloudFormation Resource (AWS::MediaLive::Channel.Mpeg2Settings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_mssmoothgroupsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_mssmoothgroupsettings.go
similarity index 98%
rename from goformation/cloudformation/medialive/aws-medialive-channel_mssmoothgroupsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_mssmoothgroupsettings.go
index e2b3d261a5..a85fe443db 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_mssmoothgroupsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_mssmoothgroupsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_MsSmoothGroupSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.MsSmoothGroupSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_mssmoothoutputsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_mssmoothoutputsettings.go
similarity index 93%
rename from goformation/cloudformation/medialive/aws-medialive-channel_mssmoothoutputsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_mssmoothoutputsettings.go
index e26beeaf4b..6b87e08e48 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_mssmoothoutputsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_mssmoothoutputsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_MsSmoothOutputSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.MsSmoothOutputSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_multiplexgroupsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_multiplexgroupsettings.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_multiplexgroupsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_multiplexgroupsettings.go
index 733d8e1eeb..94d8334401 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_multiplexgroupsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_multiplexgroupsettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_MultiplexGroupSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.MultiplexGroupSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_multiplexoutputsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_multiplexoutputsettings.go
similarity index 95%
rename from goformation/cloudformation/medialive/aws-medialive-channel_multiplexoutputsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_multiplexoutputsettings.go
index 6c3f1093a6..1f76858faf 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_multiplexoutputsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_multiplexoutputsettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_MultiplexOutputSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.MultiplexOutputSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_multiplexprogramchanneldestinationsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_multiplexprogramchanneldestinationsettings.go
similarity index 93%
rename from goformation/cloudformation/medialive/aws-medialive-channel_multiplexprogramchanneldestinationsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_multiplexprogramchanneldestinationsettings.go
index 227daf8eca..db96ad50f5 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_multiplexprogramchanneldestinationsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_multiplexprogramchanneldestinationsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_MultiplexProgramChannelDestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.MultiplexProgramChannelDestinationSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_networkinputsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_networkinputsettings.go
similarity index 93%
rename from goformation/cloudformation/medialive/aws-medialive-channel_networkinputsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_networkinputsettings.go
index e38a120b01..552baf98a9 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_networkinputsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_networkinputsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_NetworkInputSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.NetworkInputSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_nielsencbet.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_nielsencbet.go
similarity index 93%
rename from goformation/cloudformation/medialive/aws-medialive-channel_nielsencbet.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_nielsencbet.go
index 67a9d8175b..a397accdff 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_nielsencbet.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_nielsencbet.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_NielsenCBET AWS CloudFormation Resource (AWS::MediaLive::Channel.NielsenCBET)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_nielsenconfiguration.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_nielsenconfiguration.go
similarity index 93%
rename from goformation/cloudformation/medialive/aws-medialive-channel_nielsenconfiguration.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_nielsenconfiguration.go
index 4adfdb698b..6d321e434b 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_nielsenconfiguration.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_nielsenconfiguration.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_NielsenConfiguration AWS CloudFormation Resource (AWS::MediaLive::Channel.NielsenConfiguration)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_nielsennaesiinw.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_nielsennaesiinw.go
similarity index 92%
rename from goformation/cloudformation/medialive/aws-medialive-channel_nielsennaesiinw.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_nielsennaesiinw.go
index 8c8668f5c8..f1c3d3a47c 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_nielsennaesiinw.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_nielsennaesiinw.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_NielsenNaesIiNw AWS CloudFormation Resource (AWS::MediaLive::Channel.NielsenNaesIiNw)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_nielsenwatermarkssettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_nielsenwatermarkssettings.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_nielsenwatermarkssettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_nielsenwatermarkssettings.go
index 5ff1d438e7..09b1f9e7e4 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_nielsenwatermarkssettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_nielsenwatermarkssettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_NielsenWatermarksSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.NielsenWatermarksSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_output.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_output.go
similarity index 95%
rename from goformation/cloudformation/medialive/aws-medialive-channel_output.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_output.go
index d51a6cadd4..4709d341fd 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_output.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_output.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_Output AWS CloudFormation Resource (AWS::MediaLive::Channel.Output)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_outputdestination.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_outputdestination.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_outputdestination.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_outputdestination.go
index eed8d98fa6..27d4ec4fde 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_outputdestination.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_outputdestination.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_OutputDestination AWS CloudFormation Resource (AWS::MediaLive::Channel.OutputDestination)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_outputdestinationsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_outputdestinationsettings.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_outputdestinationsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_outputdestinationsettings.go
index 4568afe3a6..bd3db69f57 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_outputdestinationsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_outputdestinationsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_OutputDestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.OutputDestinationSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_outputgroup.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_outputgroup.go
similarity index 93%
rename from goformation/cloudformation/medialive/aws-medialive-channel_outputgroup.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_outputgroup.go
index f7a9fc5449..9a768c5e5d 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_outputgroup.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_outputgroup.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_OutputGroup AWS CloudFormation Resource (AWS::MediaLive::Channel.OutputGroup)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_outputgroupsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_outputgroupsettings.go
similarity index 98%
rename from goformation/cloudformation/medialive/aws-medialive-channel_outputgroupsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_outputgroupsettings.go
index 7e6ae9ad7b..7e17a5488e 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_outputgroupsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_outputgroupsettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_OutputGroupSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.OutputGroupSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_outputlocationref.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_outputlocationref.go
similarity index 91%
rename from goformation/cloudformation/medialive/aws-medialive-channel_outputlocationref.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_outputlocationref.go
index d816aa9c11..6fcf829c37 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_outputlocationref.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_outputlocationref.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_OutputLocationRef AWS CloudFormation Resource (AWS::MediaLive::Channel.OutputLocationRef)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_outputsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_outputsettings.go
similarity index 98%
rename from goformation/cloudformation/medialive/aws-medialive-channel_outputsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_outputsettings.go
index 2e511c6282..01d959d071 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_outputsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_outputsettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_OutputSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.OutputSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_passthroughsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_passthroughsettings.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_passthroughsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_passthroughsettings.go
index 95f0fe0baf..db27693035 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_passthroughsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_passthroughsettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_PassThroughSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.PassThroughSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_rawsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_rawsettings.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_rawsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_rawsettings.go
index ad555bea83..b611100c00 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_rawsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_rawsettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_RawSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.RawSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_rec601settings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_rec601settings.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_rec601settings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_rec601settings.go
index ae971b4aed..49e265c5ef 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_rec601settings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_rec601settings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_Rec601Settings AWS CloudFormation Resource (AWS::MediaLive::Channel.Rec601Settings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_rec709settings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_rec709settings.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_rec709settings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_rec709settings.go
index c07191ac61..816f9b9ec1 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_rec709settings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_rec709settings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_Rec709Settings AWS CloudFormation Resource (AWS::MediaLive::Channel.Rec709Settings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_remixsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_remixsettings.go
similarity index 93%
rename from goformation/cloudformation/medialive/aws-medialive-channel_remixsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_remixsettings.go
index a37a086518..702a079fd2 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_remixsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_remixsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_RemixSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.RemixSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_rtmpcaptioninfodestinationsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_rtmpcaptioninfodestinationsettings.go
similarity index 95%
rename from goformation/cloudformation/medialive/aws-medialive-channel_rtmpcaptioninfodestinationsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_rtmpcaptioninfodestinationsettings.go
index 87ef7cf0c4..ca49f1a21d 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_rtmpcaptioninfodestinationsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_rtmpcaptioninfodestinationsettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_RtmpCaptionInfoDestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.RtmpCaptionInfoDestinationSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_rtmpgroupsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_rtmpgroupsettings.go
similarity index 96%
rename from goformation/cloudformation/medialive/aws-medialive-channel_rtmpgroupsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_rtmpgroupsettings.go
index d349bd0f55..ff13b66f2c 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_rtmpgroupsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_rtmpgroupsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_RtmpGroupSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.RtmpGroupSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_rtmpoutputsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_rtmpoutputsettings.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_rtmpoutputsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_rtmpoutputsettings.go
index 62c562a69a..6a07a2ece3 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_rtmpoutputsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_rtmpoutputsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_RtmpOutputSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.RtmpOutputSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_scte20plusembeddeddestinationsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_scte20plusembeddeddestinationsettings.go
similarity index 95%
rename from goformation/cloudformation/medialive/aws-medialive-channel_scte20plusembeddeddestinationsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_scte20plusembeddeddestinationsettings.go
index 94db8c37e5..3fc2aef2be 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_scte20plusembeddeddestinationsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_scte20plusembeddeddestinationsettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_Scte20PlusEmbeddedDestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.Scte20PlusEmbeddedDestinationSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_scte20sourcesettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_scte20sourcesettings.go
similarity index 93%
rename from goformation/cloudformation/medialive/aws-medialive-channel_scte20sourcesettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_scte20sourcesettings.go
index f856dd36f5..125f61366d 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_scte20sourcesettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_scte20sourcesettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_Scte20SourceSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.Scte20SourceSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_scte27destinationsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_scte27destinationsettings.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_scte27destinationsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_scte27destinationsettings.go
index de9be73511..ef2eceafea 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_scte27destinationsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_scte27destinationsettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_Scte27DestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.Scte27DestinationSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_scte27sourcesettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_scte27sourcesettings.go
similarity index 93%
rename from goformation/cloudformation/medialive/aws-medialive-channel_scte27sourcesettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_scte27sourcesettings.go
index bb1bd7b161..389ca277f4 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_scte27sourcesettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_scte27sourcesettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_Scte27SourceSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.Scte27SourceSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_scte35spliceinsert.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_scte35spliceinsert.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_scte35spliceinsert.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_scte35spliceinsert.go
index 16df112cc3..ebb28ae791 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_scte35spliceinsert.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_scte35spliceinsert.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_Scte35SpliceInsert AWS CloudFormation Resource (AWS::MediaLive::Channel.Scte35SpliceInsert)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_scte35timesignalapos.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_scte35timesignalapos.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_scte35timesignalapos.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_scte35timesignalapos.go
index 970496b79a..d499f1d034 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_scte35timesignalapos.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_scte35timesignalapos.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_Scte35TimeSignalApos AWS CloudFormation Resource (AWS::MediaLive::Channel.Scte35TimeSignalApos)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_smptettdestinationsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_smptettdestinationsettings.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_smptettdestinationsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_smptettdestinationsettings.go
index ee15e1d50d..f503abf984 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_smptettdestinationsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_smptettdestinationsettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_SmpteTtDestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.SmpteTtDestinationSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_standardhlssettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_standardhlssettings.go
similarity index 93%
rename from goformation/cloudformation/medialive/aws-medialive-channel_standardhlssettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_standardhlssettings.go
index a839a59a1b..d2e7b9f951 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_standardhlssettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_standardhlssettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_StandardHlsSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.StandardHlsSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_statickeysettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_statickeysettings.go
similarity index 93%
rename from goformation/cloudformation/medialive/aws-medialive-channel_statickeysettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_statickeysettings.go
index 92ba61d970..789071bc6b 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_statickeysettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_statickeysettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_StaticKeySettings AWS CloudFormation Resource (AWS::MediaLive::Channel.StaticKeySettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_teletextdestinationsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_teletextdestinationsettings.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_teletextdestinationsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_teletextdestinationsettings.go
index 61728783bc..d67910ef02 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_teletextdestinationsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_teletextdestinationsettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_TeletextDestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.TeletextDestinationSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_teletextsourcesettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_teletextsourcesettings.go
similarity index 93%
rename from goformation/cloudformation/medialive/aws-medialive-channel_teletextsourcesettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_teletextsourcesettings.go
index e3a3ff543c..7517e6a431 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_teletextsourcesettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_teletextsourcesettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_TeletextSourceSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.TeletextSourceSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_temporalfiltersettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_temporalfiltersettings.go
similarity index 93%
rename from goformation/cloudformation/medialive/aws-medialive-channel_temporalfiltersettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_temporalfiltersettings.go
index 5ae1ce4236..6c485ed7b9 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_temporalfiltersettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_temporalfiltersettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_TemporalFilterSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.TemporalFilterSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_timecodeconfig.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_timecodeconfig.go
similarity index 92%
rename from goformation/cloudformation/medialive/aws-medialive-channel_timecodeconfig.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_timecodeconfig.go
index 537f4f06c6..d1f10f7352 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_timecodeconfig.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_timecodeconfig.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_TimecodeConfig AWS CloudFormation Resource (AWS::MediaLive::Channel.TimecodeConfig)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_ttmldestinationsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_ttmldestinationsettings.go
similarity index 92%
rename from goformation/cloudformation/medialive/aws-medialive-channel_ttmldestinationsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_ttmldestinationsettings.go
index e9a0610de8..e0e07a06e6 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_ttmldestinationsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_ttmldestinationsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_TtmlDestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.TtmlDestinationSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_udpcontainersettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_udpcontainersettings.go
similarity index 95%
rename from goformation/cloudformation/medialive/aws-medialive-channel_udpcontainersettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_udpcontainersettings.go
index f2d34b032d..45135fc2ec 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_udpcontainersettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_udpcontainersettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_UdpContainerSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.UdpContainerSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_udpgroupsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_udpgroupsettings.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_udpgroupsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_udpgroupsettings.go
index cda700bad8..a29dd3bbe6 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_udpgroupsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_udpgroupsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_UdpGroupSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.UdpGroupSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_udpoutputsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_udpoutputsettings.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_udpoutputsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_udpoutputsettings.go
index 98901c5a62..e3c7b12946 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_udpoutputsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_udpoutputsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_UdpOutputSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.UdpOutputSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_videoblackfailoversettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_videoblackfailoversettings.go
similarity index 93%
rename from goformation/cloudformation/medialive/aws-medialive-channel_videoblackfailoversettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_videoblackfailoversettings.go
index a2d8234012..2a91e06d6b 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_videoblackfailoversettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_videoblackfailoversettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_VideoBlackFailoverSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.VideoBlackFailoverSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_videocodecsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_videocodecsettings.go
similarity index 97%
rename from goformation/cloudformation/medialive/aws-medialive-channel_videocodecsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_videocodecsettings.go
index 3ca670ca49..3237cf81bd 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_videocodecsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_videocodecsettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_VideoCodecSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.VideoCodecSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_videodescription.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_videodescription.go
similarity index 95%
rename from goformation/cloudformation/medialive/aws-medialive-channel_videodescription.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_videodescription.go
index 5fba65c1ec..348ada50ed 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_videodescription.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_videodescription.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_VideoDescription AWS CloudFormation Resource (AWS::MediaLive::Channel.VideoDescription)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_videoselector.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_videoselector.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_videoselector.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_videoselector.go
index b45a06ecdc..0b982c5774 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_videoselector.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_videoselector.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_VideoSelector AWS CloudFormation Resource (AWS::MediaLive::Channel.VideoSelector)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_videoselectorcolorspacesettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_videoselectorcolorspacesettings.go
similarity index 95%
rename from goformation/cloudformation/medialive/aws-medialive-channel_videoselectorcolorspacesettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_videoselectorcolorspacesettings.go
index e889972291..b3ce1e68ed 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_videoselectorcolorspacesettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_videoselectorcolorspacesettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_VideoSelectorColorSpaceSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.VideoSelectorColorSpaceSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_videoselectorpid.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_videoselectorpid.go
similarity index 91%
rename from goformation/cloudformation/medialive/aws-medialive-channel_videoselectorpid.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_videoselectorpid.go
index 5b173575b9..4c92c9b907 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_videoselectorpid.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_videoselectorpid.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_VideoSelectorPid AWS CloudFormation Resource (AWS::MediaLive::Channel.VideoSelectorPid)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_videoselectorprogramid.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_videoselectorprogramid.go
similarity index 91%
rename from goformation/cloudformation/medialive/aws-medialive-channel_videoselectorprogramid.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_videoselectorprogramid.go
index 25479dc0b0..7a1e03b57b 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_videoselectorprogramid.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_videoselectorprogramid.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_VideoSelectorProgramId AWS CloudFormation Resource (AWS::MediaLive::Channel.VideoSelectorProgramId)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_videoselectorsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_videoselectorsettings.go
similarity index 96%
rename from goformation/cloudformation/medialive/aws-medialive-channel_videoselectorsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_videoselectorsettings.go
index b02c296a5f..dd1e005386 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_videoselectorsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_videoselectorsettings.go
@@ -1,7 +1,7 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_VideoSelectorSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.VideoSelectorSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_vpcoutputsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_vpcoutputsettings.go
similarity index 94%
rename from goformation/cloudformation/medialive/aws-medialive-channel_vpcoutputsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_vpcoutputsettings.go
index fe9b09ea77..51fb1d1aaa 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_vpcoutputsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_vpcoutputsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_VpcOutputSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.VpcOutputSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_wavsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_wavsettings.go
similarity index 93%
rename from goformation/cloudformation/medialive/aws-medialive-channel_wavsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_wavsettings.go
index ae4bdd27fe..8a18e46149 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_wavsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_wavsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_WavSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.WavSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_webvttdestinationsettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_webvttdestinationsettings.go
similarity index 92%
rename from goformation/cloudformation/medialive/aws-medialive-channel_webvttdestinationsettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-channel_webvttdestinationsettings.go
index 89a08fb3c0..2e6746144f 100644
--- a/goformation/cloudformation/medialive/aws-medialive-channel_webvttdestinationsettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-channel_webvttdestinationsettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_WebvttDestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.WebvttDestinationSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-input.go b/pkg/goformation/cloudformation/medialive/aws-medialive-input.go
similarity index 97%
rename from goformation/cloudformation/medialive/aws-medialive-input.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-input.go
index 69a21b6596..b5294021b7 100644
--- a/goformation/cloudformation/medialive/aws-medialive-input.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-input.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Input AWS CloudFormation Resource (AWS::MediaLive::Input)
diff --git a/goformation/cloudformation/medialive/aws-medialive-input_inputdestinationrequest.go b/pkg/goformation/cloudformation/medialive/aws-medialive-input_inputdestinationrequest.go
similarity index 91%
rename from goformation/cloudformation/medialive/aws-medialive-input_inputdestinationrequest.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-input_inputdestinationrequest.go
index 1b8cbd1302..2d485ca242 100644
--- a/goformation/cloudformation/medialive/aws-medialive-input_inputdestinationrequest.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-input_inputdestinationrequest.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Input_InputDestinationRequest AWS CloudFormation Resource (AWS::MediaLive::Input.InputDestinationRequest)
diff --git a/goformation/cloudformation/medialive/aws-medialive-input_inputdevicerequest.go b/pkg/goformation/cloudformation/medialive/aws-medialive-input_inputdevicerequest.go
similarity index 91%
rename from goformation/cloudformation/medialive/aws-medialive-input_inputdevicerequest.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-input_inputdevicerequest.go
index 5e3d372b88..5a94701936 100644
--- a/goformation/cloudformation/medialive/aws-medialive-input_inputdevicerequest.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-input_inputdevicerequest.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Input_InputDeviceRequest AWS CloudFormation Resource (AWS::MediaLive::Input.InputDeviceRequest)
diff --git a/goformation/cloudformation/medialive/aws-medialive-input_inputdevicesettings.go b/pkg/goformation/cloudformation/medialive/aws-medialive-input_inputdevicesettings.go
similarity index 91%
rename from goformation/cloudformation/medialive/aws-medialive-input_inputdevicesettings.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-input_inputdevicesettings.go
index 614118069f..8703b968d9 100644
--- a/goformation/cloudformation/medialive/aws-medialive-input_inputdevicesettings.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-input_inputdevicesettings.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Input_InputDeviceSettings AWS CloudFormation Resource (AWS::MediaLive::Input.InputDeviceSettings)
diff --git a/goformation/cloudformation/medialive/aws-medialive-input_inputsourcerequest.go b/pkg/goformation/cloudformation/medialive/aws-medialive-input_inputsourcerequest.go
similarity index 93%
rename from goformation/cloudformation/medialive/aws-medialive-input_inputsourcerequest.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-input_inputsourcerequest.go
index 30d9414394..18af3bfea4 100644
--- a/goformation/cloudformation/medialive/aws-medialive-input_inputsourcerequest.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-input_inputsourcerequest.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Input_InputSourceRequest AWS CloudFormation Resource (AWS::MediaLive::Input.InputSourceRequest)
diff --git a/goformation/cloudformation/medialive/aws-medialive-input_inputvpcrequest.go b/pkg/goformation/cloudformation/medialive/aws-medialive-input_inputvpcrequest.go
similarity index 92%
rename from goformation/cloudformation/medialive/aws-medialive-input_inputvpcrequest.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-input_inputvpcrequest.go
index dfe764729f..c936bd02f1 100644
--- a/goformation/cloudformation/medialive/aws-medialive-input_inputvpcrequest.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-input_inputvpcrequest.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Input_InputVpcRequest AWS CloudFormation Resource (AWS::MediaLive::Input.InputVpcRequest)
diff --git a/goformation/cloudformation/medialive/aws-medialive-input_mediaconnectflowrequest.go b/pkg/goformation/cloudformation/medialive/aws-medialive-input_mediaconnectflowrequest.go
similarity index 91%
rename from goformation/cloudformation/medialive/aws-medialive-input_mediaconnectflowrequest.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-input_mediaconnectflowrequest.go
index 76f5e86f05..d3dc54b6f6 100644
--- a/goformation/cloudformation/medialive/aws-medialive-input_mediaconnectflowrequest.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-input_mediaconnectflowrequest.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Input_MediaConnectFlowRequest AWS CloudFormation Resource (AWS::MediaLive::Input.MediaConnectFlowRequest)
diff --git a/goformation/cloudformation/medialive/aws-medialive-inputsecuritygroup.go b/pkg/goformation/cloudformation/medialive/aws-medialive-inputsecuritygroup.go
similarity index 98%
rename from goformation/cloudformation/medialive/aws-medialive-inputsecuritygroup.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-inputsecuritygroup.go
index 10040afe72..e34fd9d87a 100644
--- a/goformation/cloudformation/medialive/aws-medialive-inputsecuritygroup.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-inputsecuritygroup.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InputSecurityGroup AWS CloudFormation Resource (AWS::MediaLive::InputSecurityGroup)
diff --git a/goformation/cloudformation/medialive/aws-medialive-inputsecuritygroup_inputwhitelistrulecidr.go b/pkg/goformation/cloudformation/medialive/aws-medialive-inputsecuritygroup_inputwhitelistrulecidr.go
similarity index 92%
rename from goformation/cloudformation/medialive/aws-medialive-inputsecuritygroup_inputwhitelistrulecidr.go
rename to pkg/goformation/cloudformation/medialive/aws-medialive-inputsecuritygroup_inputwhitelistrulecidr.go
index 685de49fbf..a4b90328a6 100644
--- a/goformation/cloudformation/medialive/aws-medialive-inputsecuritygroup_inputwhitelistrulecidr.go
+++ b/pkg/goformation/cloudformation/medialive/aws-medialive-inputsecuritygroup_inputwhitelistrulecidr.go
@@ -1,9 +1,9 @@
 package medialive
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InputSecurityGroup_InputWhitelistRuleCidr AWS CloudFormation Resource (AWS::MediaLive::InputSecurityGroup.InputWhitelistRuleCidr)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-asset.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-asset.go
similarity index 95%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-asset.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-asset.go
index 2e287b148e..0ecaa88a81 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-asset.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-asset.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Asset AWS CloudFormation Resource (AWS::MediaPackage::Asset)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-asset_egressendpoint.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-asset_egressendpoint.go
similarity index 93%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-asset_egressendpoint.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-asset_egressendpoint.go
index 51c6f3838f..2db236128c 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-asset_egressendpoint.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-asset_egressendpoint.go
@@ -1,9 +1,9 @@
 package mediapackage
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Asset_EgressEndpoint AWS CloudFormation Resource (AWS::MediaPackage::Asset.EgressEndpoint)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-channel.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-channel.go
similarity index 95%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-channel.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-channel.go
index d16cbfcb36..22ab7cb868 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-channel.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-channel.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel AWS CloudFormation Resource (AWS::MediaPackage::Channel)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-channel_hlsingest.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-channel_hlsingest.go
similarity index 95%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-channel_hlsingest.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-channel_hlsingest.go
index d7af1eaa46..fd535530f4 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-channel_hlsingest.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-channel_hlsingest.go
@@ -1,7 +1,7 @@
 package mediapackage
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_HlsIngest AWS CloudFormation Resource (AWS::MediaPackage::Channel.HlsIngest)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-channel_ingestendpoint.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-channel_ingestendpoint.go
similarity index 94%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-channel_ingestendpoint.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-channel_ingestendpoint.go
index 534d3aaec0..c6b7e3caa9 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-channel_ingestendpoint.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-channel_ingestendpoint.go
@@ -1,9 +1,9 @@
 package mediapackage
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_IngestEndpoint AWS CloudFormation Resource (AWS::MediaPackage::Channel.IngestEndpoint)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-channel_logconfiguration.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-channel_logconfiguration.go
similarity index 91%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-channel_logconfiguration.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-channel_logconfiguration.go
index b2876cd784..ec8360db88 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-channel_logconfiguration.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-channel_logconfiguration.go
@@ -1,9 +1,9 @@
 package mediapackage
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Channel_LogConfiguration AWS CloudFormation Resource (AWS::MediaPackage::Channel.LogConfiguration)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint.go
similarity index 97%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint.go
index 68e46b93e7..15e7f0623e 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // OriginEndpoint AWS CloudFormation Resource (AWS::MediaPackage::OriginEndpoint)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_adtriggers.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_adtriggers.go
similarity index 95%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_adtriggers.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_adtriggers.go
index f9992713d2..2bbc78df22 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_adtriggers.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_adtriggers.go
@@ -1,7 +1,7 @@
 package mediapackage
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // OriginEndpoint_AdTriggers AWS CloudFormation Resource (AWS::MediaPackage::OriginEndpoint.AdTriggers)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_authorization.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_authorization.go
similarity index 93%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_authorization.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_authorization.go
index ebc8e765c5..80ace6b68e 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_authorization.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_authorization.go
@@ -1,9 +1,9 @@
 package mediapackage
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // OriginEndpoint_Authorization AWS CloudFormation Resource (AWS::MediaPackage::OriginEndpoint.Authorization)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_cmafencryption.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_cmafencryption.go
similarity index 94%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_cmafencryption.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_cmafencryption.go
index 2062cca1d8..0bb11cb335 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_cmafencryption.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_cmafencryption.go
@@ -1,9 +1,9 @@
 package mediapackage
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // OriginEndpoint_CmafEncryption AWS CloudFormation Resource (AWS::MediaPackage::OriginEndpoint.CmafEncryption)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_cmafpackage.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_cmafpackage.go
similarity index 95%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_cmafpackage.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_cmafpackage.go
index b42645997d..f19ac18455 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_cmafpackage.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_cmafpackage.go
@@ -1,9 +1,9 @@
 package mediapackage
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // OriginEndpoint_CmafPackage AWS CloudFormation Resource (AWS::MediaPackage::OriginEndpoint.CmafPackage)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_dashencryption.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_dashencryption.go
similarity index 93%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_dashencryption.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_dashencryption.go
index 920c45a828..478bbe0145 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_dashencryption.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_dashencryption.go
@@ -1,9 +1,9 @@
 package mediapackage
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // OriginEndpoint_DashEncryption AWS CloudFormation Resource (AWS::MediaPackage::OriginEndpoint.DashEncryption)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_dashpackage.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_dashpackage.go
similarity index 97%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_dashpackage.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_dashpackage.go
index b84f953213..10061d1032 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_dashpackage.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_dashpackage.go
@@ -1,9 +1,9 @@
 package mediapackage
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // OriginEndpoint_DashPackage AWS CloudFormation Resource (AWS::MediaPackage::OriginEndpoint.DashPackage)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlsencryption.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlsencryption.go
similarity index 95%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlsencryption.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlsencryption.go
index 39276617d3..c94d566520 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlsencryption.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlsencryption.go
@@ -1,9 +1,9 @@
 package mediapackage
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // OriginEndpoint_HlsEncryption AWS CloudFormation Resource (AWS::MediaPackage::OriginEndpoint.HlsEncryption)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlsmanifest.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlsmanifest.go
similarity index 96%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlsmanifest.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlsmanifest.go
index b1eefd385c..bf2ff5700b 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlsmanifest.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlsmanifest.go
@@ -1,9 +1,9 @@
 package mediapackage
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // OriginEndpoint_HlsManifest AWS CloudFormation Resource (AWS::MediaPackage::OriginEndpoint.HlsManifest)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlspackage.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlspackage.go
similarity index 97%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlspackage.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlspackage.go
index 10471f2773..e0794832ba 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlspackage.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlspackage.go
@@ -1,9 +1,9 @@
 package mediapackage
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // OriginEndpoint_HlsPackage AWS CloudFormation Resource (AWS::MediaPackage::OriginEndpoint.HlsPackage)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_mssencryption.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_mssencryption.go
similarity index 95%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_mssencryption.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_mssencryption.go
index 0c556483be..f046a6288c 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_mssencryption.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_mssencryption.go
@@ -1,7 +1,7 @@
 package mediapackage
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // OriginEndpoint_MssEncryption AWS CloudFormation Resource (AWS::MediaPackage::OriginEndpoint.MssEncryption)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_msspackage.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_msspackage.go
similarity index 94%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_msspackage.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_msspackage.go
index d1bc915b1c..68eec60f38 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_msspackage.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_msspackage.go
@@ -1,9 +1,9 @@
 package mediapackage
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // OriginEndpoint_MssPackage AWS CloudFormation Resource (AWS::MediaPackage::OriginEndpoint.MssPackage)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_spekekeyprovider.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_spekekeyprovider.go
similarity index 95%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_spekekeyprovider.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_spekekeyprovider.go
index 31850a54a3..13e4e04596 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_spekekeyprovider.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_spekekeyprovider.go
@@ -1,9 +1,9 @@
 package mediapackage
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // OriginEndpoint_SpekeKeyProvider AWS CloudFormation Resource (AWS::MediaPackage::OriginEndpoint.SpekeKeyProvider)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_streamselection.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_streamselection.go
similarity index 94%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_streamselection.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_streamselection.go
index a44ccb1fbd..9376403a0f 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_streamselection.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_streamselection.go
@@ -1,9 +1,9 @@
 package mediapackage
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // OriginEndpoint_StreamSelection AWS CloudFormation Resource (AWS::MediaPackage::OriginEndpoint.StreamSelection)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration.go
similarity index 96%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration.go
index c8dec701d0..1892fa0f9c 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PackagingConfiguration AWS CloudFormation Resource (AWS::MediaPackage::PackagingConfiguration)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_cmafencryption.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_cmafencryption.go
similarity index 96%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_cmafencryption.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_cmafencryption.go
index 661c5fb43e..9479d4d13f 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_cmafencryption.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_cmafencryption.go
@@ -1,7 +1,7 @@
 package mediapackage
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PackagingConfiguration_CmafEncryption AWS CloudFormation Resource (AWS::MediaPackage::PackagingConfiguration.CmafEncryption)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_cmafpackage.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_cmafpackage.go
similarity index 95%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_cmafpackage.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_cmafpackage.go
index fde6ffb58f..01aeb54bbe 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_cmafpackage.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_cmafpackage.go
@@ -1,9 +1,9 @@
 package mediapackage
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PackagingConfiguration_CmafPackage AWS CloudFormation Resource (AWS::MediaPackage::PackagingConfiguration.CmafPackage)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashencryption.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashencryption.go
similarity index 96%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashencryption.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashencryption.go
index 899140450c..310392eeb9 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashencryption.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashencryption.go
@@ -1,7 +1,7 @@
 package mediapackage
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PackagingConfiguration_DashEncryption AWS CloudFormation Resource (AWS::MediaPackage::PackagingConfiguration.DashEncryption)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashmanifest.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashmanifest.go
similarity index 95%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashmanifest.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashmanifest.go
index a38b8e4ac0..f7fa4c1a3c 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashmanifest.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashmanifest.go
@@ -1,9 +1,9 @@
 package mediapackage
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PackagingConfiguration_DashManifest AWS CloudFormation Resource (AWS::MediaPackage::PackagingConfiguration.DashManifest)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashpackage.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashpackage.go
similarity index 96%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashpackage.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashpackage.go
index e0e7fe5ea4..6b0ffb71b5 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashpackage.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashpackage.go
@@ -1,9 +1,9 @@
 package mediapackage
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PackagingConfiguration_DashPackage AWS CloudFormation Resource (AWS::MediaPackage::PackagingConfiguration.DashPackage)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlsencryption.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlsencryption.go
similarity index 94%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlsencryption.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlsencryption.go
index 3513bead2a..ed18aa6bdb 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlsencryption.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlsencryption.go
@@ -1,9 +1,9 @@
 package mediapackage
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PackagingConfiguration_HlsEncryption AWS CloudFormation Resource (AWS::MediaPackage::PackagingConfiguration.HlsEncryption)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlsmanifest.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlsmanifest.go
similarity index 96%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlsmanifest.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlsmanifest.go
index 06eceb35a8..1498288344 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlsmanifest.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlsmanifest.go
@@ -1,9 +1,9 @@
 package mediapackage
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PackagingConfiguration_HlsManifest AWS CloudFormation Resource (AWS::MediaPackage::PackagingConfiguration.HlsManifest)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlspackage.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlspackage.go
similarity index 95%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlspackage.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlspackage.go
index 284a99d941..5c198f0e3e 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlspackage.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlspackage.go
@@ -1,9 +1,9 @@
 package mediapackage
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PackagingConfiguration_HlsPackage AWS CloudFormation Resource (AWS::MediaPackage::PackagingConfiguration.HlsPackage)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_mssencryption.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_mssencryption.go
similarity index 96%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_mssencryption.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_mssencryption.go
index 1442828cfb..9c879892aa 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_mssencryption.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_mssencryption.go
@@ -1,7 +1,7 @@
 package mediapackage
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PackagingConfiguration_MssEncryption AWS CloudFormation Resource (AWS::MediaPackage::PackagingConfiguration.MssEncryption)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_mssmanifest.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_mssmanifest.go
similarity index 93%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_mssmanifest.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_mssmanifest.go
index df2c4f8b25..055e692e28 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_mssmanifest.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_mssmanifest.go
@@ -1,9 +1,9 @@
 package mediapackage
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PackagingConfiguration_MssManifest AWS CloudFormation Resource (AWS::MediaPackage::PackagingConfiguration.MssManifest)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_msspackage.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_msspackage.go
similarity index 94%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_msspackage.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_msspackage.go
index 3fabb617eb..7de0c2689f 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_msspackage.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_msspackage.go
@@ -1,9 +1,9 @@
 package mediapackage
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PackagingConfiguration_MssPackage AWS CloudFormation Resource (AWS::MediaPackage::PackagingConfiguration.MssPackage)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_spekekeyprovider.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_spekekeyprovider.go
similarity index 94%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_spekekeyprovider.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_spekekeyprovider.go
index ba565f8acc..90a548f33f 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_spekekeyprovider.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_spekekeyprovider.go
@@ -1,9 +1,9 @@
 package mediapackage
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PackagingConfiguration_SpekeKeyProvider AWS CloudFormation Resource (AWS::MediaPackage::PackagingConfiguration.SpekeKeyProvider)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_streamselection.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_streamselection.go
similarity index 94%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_streamselection.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_streamselection.go
index 4d557e1b05..07c211d77e 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_streamselection.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_streamselection.go
@@ -1,9 +1,9 @@
 package mediapackage
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PackagingConfiguration_StreamSelection AWS CloudFormation Resource (AWS::MediaPackage::PackagingConfiguration.StreamSelection)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-packaginggroup.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packaginggroup.go
similarity index 95%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-packaginggroup.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packaginggroup.go
index 3ad19431ed..8642a2215c 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-packaginggroup.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packaginggroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PackagingGroup AWS CloudFormation Resource (AWS::MediaPackage::PackagingGroup)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-packaginggroup_authorization.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packaginggroup_authorization.go
similarity index 93%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-packaginggroup_authorization.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packaginggroup_authorization.go
index 4f7981ca8d..82f275acdd 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-packaginggroup_authorization.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packaginggroup_authorization.go
@@ -1,9 +1,9 @@
 package mediapackage
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PackagingGroup_Authorization AWS CloudFormation Resource (AWS::MediaPackage::PackagingGroup.Authorization)
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-packaginggroup_logconfiguration.go b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packaginggroup_logconfiguration.go
similarity index 92%
rename from goformation/cloudformation/mediapackage/aws-mediapackage-packaginggroup_logconfiguration.go
rename to pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packaginggroup_logconfiguration.go
index 359a756dc7..58ba92913b 100644
--- a/goformation/cloudformation/mediapackage/aws-mediapackage-packaginggroup_logconfiguration.go
+++ b/pkg/goformation/cloudformation/mediapackage/aws-mediapackage-packaginggroup_logconfiguration.go
@@ -1,9 +1,9 @@
 package mediapackage
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PackagingGroup_LogConfiguration AWS CloudFormation Resource (AWS::MediaPackage::PackagingGroup.LogConfiguration)
diff --git a/goformation/cloudformation/mediastore/aws-mediastore-container.go b/pkg/goformation/cloudformation/mediastore/aws-mediastore-container.go
similarity index 96%
rename from goformation/cloudformation/mediastore/aws-mediastore-container.go
rename to pkg/goformation/cloudformation/mediastore/aws-mediastore-container.go
index 4583fe4ad2..86f713ec84 100644
--- a/goformation/cloudformation/mediastore/aws-mediastore-container.go
+++ b/pkg/goformation/cloudformation/mediastore/aws-mediastore-container.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Container AWS CloudFormation Resource (AWS::MediaStore::Container)
diff --git a/goformation/cloudformation/mediastore/aws-mediastore-container_corsrule.go b/pkg/goformation/cloudformation/mediastore/aws-mediastore-container_corsrule.go
similarity index 95%
rename from goformation/cloudformation/mediastore/aws-mediastore-container_corsrule.go
rename to pkg/goformation/cloudformation/mediastore/aws-mediastore-container_corsrule.go
index 0f6bb76e47..4d2af62ea7 100644
--- a/goformation/cloudformation/mediastore/aws-mediastore-container_corsrule.go
+++ b/pkg/goformation/cloudformation/mediastore/aws-mediastore-container_corsrule.go
@@ -1,9 +1,9 @@
 package mediastore
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Container_CorsRule AWS CloudFormation Resource (AWS::MediaStore::Container.CorsRule)
diff --git a/goformation/cloudformation/mediastore/aws-mediastore-container_metricpolicy.go b/pkg/goformation/cloudformation/mediastore/aws-mediastore-container_metricpolicy.go
similarity index 93%
rename from goformation/cloudformation/mediastore/aws-mediastore-container_metricpolicy.go
rename to pkg/goformation/cloudformation/mediastore/aws-mediastore-container_metricpolicy.go
index f12f5611c9..6ac45815db 100644
--- a/goformation/cloudformation/mediastore/aws-mediastore-container_metricpolicy.go
+++ b/pkg/goformation/cloudformation/mediastore/aws-mediastore-container_metricpolicy.go
@@ -1,9 +1,9 @@
 package mediastore
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Container_MetricPolicy AWS CloudFormation Resource (AWS::MediaStore::Container.MetricPolicy)
diff --git a/goformation/cloudformation/mediastore/aws-mediastore-container_metricpolicyrule.go b/pkg/goformation/cloudformation/mediastore/aws-mediastore-container_metricpolicyrule.go
similarity index 93%
rename from goformation/cloudformation/mediastore/aws-mediastore-container_metricpolicyrule.go
rename to pkg/goformation/cloudformation/mediastore/aws-mediastore-container_metricpolicyrule.go
index f29a9425d7..33c0f98c7c 100644
--- a/goformation/cloudformation/mediastore/aws-mediastore-container_metricpolicyrule.go
+++ b/pkg/goformation/cloudformation/mediastore/aws-mediastore-container_metricpolicyrule.go
@@ -1,9 +1,9 @@
 package mediastore
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Container_MetricPolicyRule AWS CloudFormation Resource (AWS::MediaStore::Container.MetricPolicyRule)
diff --git a/goformation/cloudformation/memorydb/aws-memorydb-acl.go b/pkg/goformation/cloudformation/memorydb/aws-memorydb-acl.go
similarity index 95%
rename from goformation/cloudformation/memorydb/aws-memorydb-acl.go
rename to pkg/goformation/cloudformation/memorydb/aws-memorydb-acl.go
index 430c9ace62..8a645760de 100644
--- a/goformation/cloudformation/memorydb/aws-memorydb-acl.go
+++ b/pkg/goformation/cloudformation/memorydb/aws-memorydb-acl.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ACL AWS CloudFormation Resource (AWS::MemoryDB::ACL)
diff --git a/goformation/cloudformation/memorydb/aws-memorydb-cluster.go b/pkg/goformation/cloudformation/memorydb/aws-memorydb-cluster.go
similarity index 97%
rename from goformation/cloudformation/memorydb/aws-memorydb-cluster.go
rename to pkg/goformation/cloudformation/memorydb/aws-memorydb-cluster.go
index 1f1faf5a51..c91ef69d3c 100644
--- a/goformation/cloudformation/memorydb/aws-memorydb-cluster.go
+++ b/pkg/goformation/cloudformation/memorydb/aws-memorydb-cluster.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster AWS CloudFormation Resource (AWS::MemoryDB::Cluster)
diff --git a/goformation/cloudformation/memorydb/aws-memorydb-cluster_endpoint.go b/pkg/goformation/cloudformation/memorydb/aws-memorydb-cluster_endpoint.go
similarity index 92%
rename from goformation/cloudformation/memorydb/aws-memorydb-cluster_endpoint.go
rename to pkg/goformation/cloudformation/memorydb/aws-memorydb-cluster_endpoint.go
index f7c506f68e..73c222ebcc 100644
--- a/goformation/cloudformation/memorydb/aws-memorydb-cluster_endpoint.go
+++ b/pkg/goformation/cloudformation/memorydb/aws-memorydb-cluster_endpoint.go
@@ -1,9 +1,9 @@
 package memorydb
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_Endpoint AWS CloudFormation Resource (AWS::MemoryDB::Cluster.Endpoint)
diff --git a/goformation/cloudformation/memorydb/aws-memorydb-parametergroup.go b/pkg/goformation/cloudformation/memorydb/aws-memorydb-parametergroup.go
similarity index 95%
rename from goformation/cloudformation/memorydb/aws-memorydb-parametergroup.go
rename to pkg/goformation/cloudformation/memorydb/aws-memorydb-parametergroup.go
index 961a6d2644..c6c0b67403 100644
--- a/goformation/cloudformation/memorydb/aws-memorydb-parametergroup.go
+++ b/pkg/goformation/cloudformation/memorydb/aws-memorydb-parametergroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ParameterGroup AWS CloudFormation Resource (AWS::MemoryDB::ParameterGroup)
diff --git a/goformation/cloudformation/memorydb/aws-memorydb-subnetgroup.go b/pkg/goformation/cloudformation/memorydb/aws-memorydb-subnetgroup.go
similarity index 95%
rename from goformation/cloudformation/memorydb/aws-memorydb-subnetgroup.go
rename to pkg/goformation/cloudformation/memorydb/aws-memorydb-subnetgroup.go
index 1d3275c2b0..fe5dd00661 100644
--- a/goformation/cloudformation/memorydb/aws-memorydb-subnetgroup.go
+++ b/pkg/goformation/cloudformation/memorydb/aws-memorydb-subnetgroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SubnetGroup AWS CloudFormation Resource (AWS::MemoryDB::SubnetGroup)
diff --git a/goformation/cloudformation/memorydb/aws-memorydb-user.go b/pkg/goformation/cloudformation/memorydb/aws-memorydb-user.go
similarity index 95%
rename from goformation/cloudformation/memorydb/aws-memorydb-user.go
rename to pkg/goformation/cloudformation/memorydb/aws-memorydb-user.go
index 2df4b3ce5b..5dbc0db262 100644
--- a/goformation/cloudformation/memorydb/aws-memorydb-user.go
+++ b/pkg/goformation/cloudformation/memorydb/aws-memorydb-user.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // User AWS CloudFormation Resource (AWS::MemoryDB::User)
diff --git a/goformation/cloudformation/msk/aws-msk-cluster.go b/pkg/goformation/cloudformation/msk/aws-msk-cluster.go
similarity index 97%
rename from goformation/cloudformation/msk/aws-msk-cluster.go
rename to pkg/goformation/cloudformation/msk/aws-msk-cluster.go
index 66a0361647..5c821941e1 100644
--- a/goformation/cloudformation/msk/aws-msk-cluster.go
+++ b/pkg/goformation/cloudformation/msk/aws-msk-cluster.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster AWS CloudFormation Resource (AWS::MSK::Cluster)
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_brokerlogs.go b/pkg/goformation/cloudformation/msk/aws-msk-cluster_brokerlogs.go
similarity index 96%
rename from goformation/cloudformation/msk/aws-msk-cluster_brokerlogs.go
rename to pkg/goformation/cloudformation/msk/aws-msk-cluster_brokerlogs.go
index b2ff0b49a6..f1571b77d6 100644
--- a/goformation/cloudformation/msk/aws-msk-cluster_brokerlogs.go
+++ b/pkg/goformation/cloudformation/msk/aws-msk-cluster_brokerlogs.go
@@ -1,7 +1,7 @@
 package msk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_BrokerLogs AWS CloudFormation Resource (AWS::MSK::Cluster.BrokerLogs)
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_brokernodegroupinfo.go b/pkg/goformation/cloudformation/msk/aws-msk-cluster_brokernodegroupinfo.go
similarity index 95%
rename from goformation/cloudformation/msk/aws-msk-cluster_brokernodegroupinfo.go
rename to pkg/goformation/cloudformation/msk/aws-msk-cluster_brokernodegroupinfo.go
index aa3df62ccf..2ef4ce710e 100644
--- a/goformation/cloudformation/msk/aws-msk-cluster_brokernodegroupinfo.go
+++ b/pkg/goformation/cloudformation/msk/aws-msk-cluster_brokernodegroupinfo.go
@@ -1,9 +1,9 @@
 package msk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_BrokerNodeGroupInfo AWS CloudFormation Resource (AWS::MSK::Cluster.BrokerNodeGroupInfo)
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_clientauthentication.go b/pkg/goformation/cloudformation/msk/aws-msk-cluster_clientauthentication.go
similarity index 96%
rename from goformation/cloudformation/msk/aws-msk-cluster_clientauthentication.go
rename to pkg/goformation/cloudformation/msk/aws-msk-cluster_clientauthentication.go
index 046de88b86..d735da0872 100644
--- a/goformation/cloudformation/msk/aws-msk-cluster_clientauthentication.go
+++ b/pkg/goformation/cloudformation/msk/aws-msk-cluster_clientauthentication.go
@@ -1,7 +1,7 @@
 package msk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_ClientAuthentication AWS CloudFormation Resource (AWS::MSK::Cluster.ClientAuthentication)
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_cloudwatchlogs.go b/pkg/goformation/cloudformation/msk/aws-msk-cluster_cloudwatchlogs.go
similarity index 92%
rename from goformation/cloudformation/msk/aws-msk-cluster_cloudwatchlogs.go
rename to pkg/goformation/cloudformation/msk/aws-msk-cluster_cloudwatchlogs.go
index 5400d7c634..d96b3ee723 100644
--- a/goformation/cloudformation/msk/aws-msk-cluster_cloudwatchlogs.go
+++ b/pkg/goformation/cloudformation/msk/aws-msk-cluster_cloudwatchlogs.go
@@ -1,9 +1,9 @@
 package msk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_CloudWatchLogs AWS CloudFormation Resource (AWS::MSK::Cluster.CloudWatchLogs)
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_configurationinfo.go b/pkg/goformation/cloudformation/msk/aws-msk-cluster_configurationinfo.go
similarity index 92%
rename from goformation/cloudformation/msk/aws-msk-cluster_configurationinfo.go
rename to pkg/goformation/cloudformation/msk/aws-msk-cluster_configurationinfo.go
index 17171b51e2..00fc6c4860 100644
--- a/goformation/cloudformation/msk/aws-msk-cluster_configurationinfo.go
+++ b/pkg/goformation/cloudformation/msk/aws-msk-cluster_configurationinfo.go
@@ -1,9 +1,9 @@
 package msk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_ConfigurationInfo AWS CloudFormation Resource (AWS::MSK::Cluster.ConfigurationInfo)
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_connectivityinfo.go b/pkg/goformation/cloudformation/msk/aws-msk-cluster_connectivityinfo.go
similarity index 95%
rename from goformation/cloudformation/msk/aws-msk-cluster_connectivityinfo.go
rename to pkg/goformation/cloudformation/msk/aws-msk-cluster_connectivityinfo.go
index 0045310441..89cd4f5543 100644
--- a/goformation/cloudformation/msk/aws-msk-cluster_connectivityinfo.go
+++ b/pkg/goformation/cloudformation/msk/aws-msk-cluster_connectivityinfo.go
@@ -1,7 +1,7 @@
 package msk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_ConnectivityInfo AWS CloudFormation Resource (AWS::MSK::Cluster.ConnectivityInfo)
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_ebsstorageinfo.go b/pkg/goformation/cloudformation/msk/aws-msk-cluster_ebsstorageinfo.go
similarity index 91%
rename from goformation/cloudformation/msk/aws-msk-cluster_ebsstorageinfo.go
rename to pkg/goformation/cloudformation/msk/aws-msk-cluster_ebsstorageinfo.go
index e6bf1cd0a1..79e994ca4a 100644
--- a/goformation/cloudformation/msk/aws-msk-cluster_ebsstorageinfo.go
+++ b/pkg/goformation/cloudformation/msk/aws-msk-cluster_ebsstorageinfo.go
@@ -1,9 +1,9 @@
 package msk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_EBSStorageInfo AWS CloudFormation Resource (AWS::MSK::Cluster.EBSStorageInfo)
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_encryptionatrest.go b/pkg/goformation/cloudformation/msk/aws-msk-cluster_encryptionatrest.go
similarity index 91%
rename from goformation/cloudformation/msk/aws-msk-cluster_encryptionatrest.go
rename to pkg/goformation/cloudformation/msk/aws-msk-cluster_encryptionatrest.go
index 0e137371d1..61c55e63e0 100644
--- a/goformation/cloudformation/msk/aws-msk-cluster_encryptionatrest.go
+++ b/pkg/goformation/cloudformation/msk/aws-msk-cluster_encryptionatrest.go
@@ -1,9 +1,9 @@
 package msk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_EncryptionAtRest AWS CloudFormation Resource (AWS::MSK::Cluster.EncryptionAtRest)
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_encryptioninfo.go b/pkg/goformation/cloudformation/msk/aws-msk-cluster_encryptioninfo.go
similarity index 96%
rename from goformation/cloudformation/msk/aws-msk-cluster_encryptioninfo.go
rename to pkg/goformation/cloudformation/msk/aws-msk-cluster_encryptioninfo.go
index e98ed6e37e..e8b5e8302c 100644
--- a/goformation/cloudformation/msk/aws-msk-cluster_encryptioninfo.go
+++ b/pkg/goformation/cloudformation/msk/aws-msk-cluster_encryptioninfo.go
@@ -1,7 +1,7 @@
 package msk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_EncryptionInfo AWS CloudFormation Resource (AWS::MSK::Cluster.EncryptionInfo)
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_encryptionintransit.go b/pkg/goformation/cloudformation/msk/aws-msk-cluster_encryptionintransit.go
similarity index 92%
rename from goformation/cloudformation/msk/aws-msk-cluster_encryptionintransit.go
rename to pkg/goformation/cloudformation/msk/aws-msk-cluster_encryptionintransit.go
index 8c57ada03a..bac5373f6e 100644
--- a/goformation/cloudformation/msk/aws-msk-cluster_encryptionintransit.go
+++ b/pkg/goformation/cloudformation/msk/aws-msk-cluster_encryptionintransit.go
@@ -1,9 +1,9 @@
 package msk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_EncryptionInTransit AWS CloudFormation Resource (AWS::MSK::Cluster.EncryptionInTransit)
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_firehose.go b/pkg/goformation/cloudformation/msk/aws-msk-cluster_firehose.go
similarity index 92%
rename from goformation/cloudformation/msk/aws-msk-cluster_firehose.go
rename to pkg/goformation/cloudformation/msk/aws-msk-cluster_firehose.go
index 7e041ffa83..76891e36c8 100644
--- a/goformation/cloudformation/msk/aws-msk-cluster_firehose.go
+++ b/pkg/goformation/cloudformation/msk/aws-msk-cluster_firehose.go
@@ -1,9 +1,9 @@
 package msk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_Firehose AWS CloudFormation Resource (AWS::MSK::Cluster.Firehose)
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_iam.go b/pkg/goformation/cloudformation/msk/aws-msk-cluster_iam.go
similarity index 90%
rename from goformation/cloudformation/msk/aws-msk-cluster_iam.go
rename to pkg/goformation/cloudformation/msk/aws-msk-cluster_iam.go
index 36097e5e79..2226b7fb34 100644
--- a/goformation/cloudformation/msk/aws-msk-cluster_iam.go
+++ b/pkg/goformation/cloudformation/msk/aws-msk-cluster_iam.go
@@ -1,9 +1,9 @@
 package msk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_Iam AWS CloudFormation Resource (AWS::MSK::Cluster.Iam)
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_jmxexporter.go b/pkg/goformation/cloudformation/msk/aws-msk-cluster_jmxexporter.go
similarity index 91%
rename from goformation/cloudformation/msk/aws-msk-cluster_jmxexporter.go
rename to pkg/goformation/cloudformation/msk/aws-msk-cluster_jmxexporter.go
index 83eaba38ce..6b55ad1d9b 100644
--- a/goformation/cloudformation/msk/aws-msk-cluster_jmxexporter.go
+++ b/pkg/goformation/cloudformation/msk/aws-msk-cluster_jmxexporter.go
@@ -1,9 +1,9 @@
 package msk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_JmxExporter AWS CloudFormation Resource (AWS::MSK::Cluster.JmxExporter)
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_logginginfo.go b/pkg/goformation/cloudformation/msk/aws-msk-cluster_logginginfo.go
similarity index 95%
rename from goformation/cloudformation/msk/aws-msk-cluster_logginginfo.go
rename to pkg/goformation/cloudformation/msk/aws-msk-cluster_logginginfo.go
index 6cb65e2110..b57763ed3d 100644
--- a/goformation/cloudformation/msk/aws-msk-cluster_logginginfo.go
+++ b/pkg/goformation/cloudformation/msk/aws-msk-cluster_logginginfo.go
@@ -1,7 +1,7 @@
 package msk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_LoggingInfo AWS CloudFormation Resource (AWS::MSK::Cluster.LoggingInfo)
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_nodeexporter.go b/pkg/goformation/cloudformation/msk/aws-msk-cluster_nodeexporter.go
similarity index 91%
rename from goformation/cloudformation/msk/aws-msk-cluster_nodeexporter.go
rename to pkg/goformation/cloudformation/msk/aws-msk-cluster_nodeexporter.go
index 6be600a8da..98f54b1376 100644
--- a/goformation/cloudformation/msk/aws-msk-cluster_nodeexporter.go
+++ b/pkg/goformation/cloudformation/msk/aws-msk-cluster_nodeexporter.go
@@ -1,9 +1,9 @@
 package msk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_NodeExporter AWS CloudFormation Resource (AWS::MSK::Cluster.NodeExporter)
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_openmonitoring.go b/pkg/goformation/cloudformation/msk/aws-msk-cluster_openmonitoring.go
similarity index 95%
rename from goformation/cloudformation/msk/aws-msk-cluster_openmonitoring.go
rename to pkg/goformation/cloudformation/msk/aws-msk-cluster_openmonitoring.go
index 5e6d5ab4f5..ac2d49bec3 100644
--- a/goformation/cloudformation/msk/aws-msk-cluster_openmonitoring.go
+++ b/pkg/goformation/cloudformation/msk/aws-msk-cluster_openmonitoring.go
@@ -1,7 +1,7 @@
 package msk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_OpenMonitoring AWS CloudFormation Resource (AWS::MSK::Cluster.OpenMonitoring)
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_prometheus.go b/pkg/goformation/cloudformation/msk/aws-msk-cluster_prometheus.go
similarity index 96%
rename from goformation/cloudformation/msk/aws-msk-cluster_prometheus.go
rename to pkg/goformation/cloudformation/msk/aws-msk-cluster_prometheus.go
index 0f9ac6cb91..79423d6f10 100644
--- a/goformation/cloudformation/msk/aws-msk-cluster_prometheus.go
+++ b/pkg/goformation/cloudformation/msk/aws-msk-cluster_prometheus.go
@@ -1,7 +1,7 @@
 package msk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_Prometheus AWS CloudFormation Resource (AWS::MSK::Cluster.Prometheus)
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_publicaccess.go b/pkg/goformation/cloudformation/msk/aws-msk-cluster_publicaccess.go
similarity index 91%
rename from goformation/cloudformation/msk/aws-msk-cluster_publicaccess.go
rename to pkg/goformation/cloudformation/msk/aws-msk-cluster_publicaccess.go
index 7b61f35dc2..d98ee4e6ac 100644
--- a/goformation/cloudformation/msk/aws-msk-cluster_publicaccess.go
+++ b/pkg/goformation/cloudformation/msk/aws-msk-cluster_publicaccess.go
@@ -1,9 +1,9 @@
 package msk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_PublicAccess AWS CloudFormation Resource (AWS::MSK::Cluster.PublicAccess)
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_s3.go b/pkg/goformation/cloudformation/msk/aws-msk-cluster_s3.go
similarity index 93%
rename from goformation/cloudformation/msk/aws-msk-cluster_s3.go
rename to pkg/goformation/cloudformation/msk/aws-msk-cluster_s3.go
index ffe610f90c..0f8ac48a26 100644
--- a/goformation/cloudformation/msk/aws-msk-cluster_s3.go
+++ b/pkg/goformation/cloudformation/msk/aws-msk-cluster_s3.go
@@ -1,9 +1,9 @@
 package msk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_S3 AWS CloudFormation Resource (AWS::MSK::Cluster.S3)
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_sasl.go b/pkg/goformation/cloudformation/msk/aws-msk-cluster_sasl.go
similarity index 95%
rename from goformation/cloudformation/msk/aws-msk-cluster_sasl.go
rename to pkg/goformation/cloudformation/msk/aws-msk-cluster_sasl.go
index 5405150c22..e6bbe63e9a 100644
--- a/goformation/cloudformation/msk/aws-msk-cluster_sasl.go
+++ b/pkg/goformation/cloudformation/msk/aws-msk-cluster_sasl.go
@@ -1,7 +1,7 @@
 package msk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_Sasl AWS CloudFormation Resource (AWS::MSK::Cluster.Sasl)
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_scram.go b/pkg/goformation/cloudformation/msk/aws-msk-cluster_scram.go
similarity index 90%
rename from goformation/cloudformation/msk/aws-msk-cluster_scram.go
rename to pkg/goformation/cloudformation/msk/aws-msk-cluster_scram.go
index 3eea8bcd3b..baed4b1a8f 100644
--- a/goformation/cloudformation/msk/aws-msk-cluster_scram.go
+++ b/pkg/goformation/cloudformation/msk/aws-msk-cluster_scram.go
@@ -1,9 +1,9 @@
 package msk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_Scram AWS CloudFormation Resource (AWS::MSK::Cluster.Scram)
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_storageinfo.go b/pkg/goformation/cloudformation/msk/aws-msk-cluster_storageinfo.go
similarity index 95%
rename from goformation/cloudformation/msk/aws-msk-cluster_storageinfo.go
rename to pkg/goformation/cloudformation/msk/aws-msk-cluster_storageinfo.go
index e20db08710..72d0d9226a 100644
--- a/goformation/cloudformation/msk/aws-msk-cluster_storageinfo.go
+++ b/pkg/goformation/cloudformation/msk/aws-msk-cluster_storageinfo.go
@@ -1,7 +1,7 @@
 package msk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_StorageInfo AWS CloudFormation Resource (AWS::MSK::Cluster.StorageInfo)
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_tls.go b/pkg/goformation/cloudformation/msk/aws-msk-cluster_tls.go
similarity index 92%
rename from goformation/cloudformation/msk/aws-msk-cluster_tls.go
rename to pkg/goformation/cloudformation/msk/aws-msk-cluster_tls.go
index 491b22c16f..ecf12ff1fa 100644
--- a/goformation/cloudformation/msk/aws-msk-cluster_tls.go
+++ b/pkg/goformation/cloudformation/msk/aws-msk-cluster_tls.go
@@ -1,9 +1,9 @@
 package msk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_Tls AWS CloudFormation Resource (AWS::MSK::Cluster.Tls)
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_unauthenticated.go b/pkg/goformation/cloudformation/msk/aws-msk-cluster_unauthenticated.go
similarity index 91%
rename from goformation/cloudformation/msk/aws-msk-cluster_unauthenticated.go
rename to pkg/goformation/cloudformation/msk/aws-msk-cluster_unauthenticated.go
index 221b825c1b..a88981a507 100644
--- a/goformation/cloudformation/msk/aws-msk-cluster_unauthenticated.go
+++ b/pkg/goformation/cloudformation/msk/aws-msk-cluster_unauthenticated.go
@@ -1,9 +1,9 @@
 package msk
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_Unauthenticated AWS CloudFormation Resource (AWS::MSK::Cluster.Unauthenticated)
diff --git a/goformation/cloudformation/mwaa/aws-mwaa-environment.go b/pkg/goformation/cloudformation/mwaa/aws-mwaa-environment.go
similarity index 98%
rename from goformation/cloudformation/mwaa/aws-mwaa-environment.go
rename to pkg/goformation/cloudformation/mwaa/aws-mwaa-environment.go
index bfb5a6a063..d8e5e0f14a 100644
--- a/goformation/cloudformation/mwaa/aws-mwaa-environment.go
+++ b/pkg/goformation/cloudformation/mwaa/aws-mwaa-environment.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Environment AWS CloudFormation Resource (AWS::MWAA::Environment)
diff --git a/goformation/cloudformation/mwaa/aws-mwaa-environment_loggingconfiguration.go b/pkg/goformation/cloudformation/mwaa/aws-mwaa-environment_loggingconfiguration.go
similarity index 97%
rename from goformation/cloudformation/mwaa/aws-mwaa-environment_loggingconfiguration.go
rename to pkg/goformation/cloudformation/mwaa/aws-mwaa-environment_loggingconfiguration.go
index a16e902d2b..3460858c09 100644
--- a/goformation/cloudformation/mwaa/aws-mwaa-environment_loggingconfiguration.go
+++ b/pkg/goformation/cloudformation/mwaa/aws-mwaa-environment_loggingconfiguration.go
@@ -1,7 +1,7 @@
 package mwaa
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Environment_LoggingConfiguration AWS CloudFormation Resource (AWS::MWAA::Environment.LoggingConfiguration)
diff --git a/goformation/cloudformation/mwaa/aws-mwaa-environment_moduleloggingconfiguration.go b/pkg/goformation/cloudformation/mwaa/aws-mwaa-environment_moduleloggingconfiguration.go
similarity index 94%
rename from goformation/cloudformation/mwaa/aws-mwaa-environment_moduleloggingconfiguration.go
rename to pkg/goformation/cloudformation/mwaa/aws-mwaa-environment_moduleloggingconfiguration.go
index 1929308f41..ba721c6fe3 100644
--- a/goformation/cloudformation/mwaa/aws-mwaa-environment_moduleloggingconfiguration.go
+++ b/pkg/goformation/cloudformation/mwaa/aws-mwaa-environment_moduleloggingconfiguration.go
@@ -1,9 +1,9 @@
 package mwaa
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Environment_ModuleLoggingConfiguration AWS CloudFormation Resource (AWS::MWAA::Environment.ModuleLoggingConfiguration)
diff --git a/goformation/cloudformation/mwaa/aws-mwaa-environment_networkconfiguration.go b/pkg/goformation/cloudformation/mwaa/aws-mwaa-environment_networkconfiguration.go
similarity index 93%
rename from goformation/cloudformation/mwaa/aws-mwaa-environment_networkconfiguration.go
rename to pkg/goformation/cloudformation/mwaa/aws-mwaa-environment_networkconfiguration.go
index 7223be670b..42c7155712 100644
--- a/goformation/cloudformation/mwaa/aws-mwaa-environment_networkconfiguration.go
+++ b/pkg/goformation/cloudformation/mwaa/aws-mwaa-environment_networkconfiguration.go
@@ -1,9 +1,9 @@
 package mwaa
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Environment_NetworkConfiguration AWS CloudFormation Resource (AWS::MWAA::Environment.NetworkConfiguration)
diff --git a/goformation/cloudformation/neptune/aws-neptune-dbcluster.go b/pkg/goformation/cloudformation/neptune/aws-neptune-dbcluster.go
similarity index 97%
rename from goformation/cloudformation/neptune/aws-neptune-dbcluster.go
rename to pkg/goformation/cloudformation/neptune/aws-neptune-dbcluster.go
index 199a93a49e..8d97354c52 100644
--- a/goformation/cloudformation/neptune/aws-neptune-dbcluster.go
+++ b/pkg/goformation/cloudformation/neptune/aws-neptune-dbcluster.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DBCluster AWS CloudFormation Resource (AWS::Neptune::DBCluster)
diff --git a/goformation/cloudformation/neptune/aws-neptune-dbcluster_dbclusterrole.go b/pkg/goformation/cloudformation/neptune/aws-neptune-dbcluster_dbclusterrole.go
similarity index 92%
rename from goformation/cloudformation/neptune/aws-neptune-dbcluster_dbclusterrole.go
rename to pkg/goformation/cloudformation/neptune/aws-neptune-dbcluster_dbclusterrole.go
index 445b6bad19..b56dbe6f1a 100644
--- a/goformation/cloudformation/neptune/aws-neptune-dbcluster_dbclusterrole.go
+++ b/pkg/goformation/cloudformation/neptune/aws-neptune-dbcluster_dbclusterrole.go
@@ -1,9 +1,9 @@
 package neptune
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DBCluster_DBClusterRole AWS CloudFormation Resource (AWS::Neptune::DBCluster.DBClusterRole)
diff --git a/goformation/cloudformation/neptune/aws-neptune-dbclusterparametergroup.go b/pkg/goformation/cloudformation/neptune/aws-neptune-dbclusterparametergroup.go
similarity index 95%
rename from goformation/cloudformation/neptune/aws-neptune-dbclusterparametergroup.go
rename to pkg/goformation/cloudformation/neptune/aws-neptune-dbclusterparametergroup.go
index 173e0c6b86..025d9cff5c 100644
--- a/goformation/cloudformation/neptune/aws-neptune-dbclusterparametergroup.go
+++ b/pkg/goformation/cloudformation/neptune/aws-neptune-dbclusterparametergroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DBClusterParameterGroup AWS CloudFormation Resource (AWS::Neptune::DBClusterParameterGroup)
diff --git a/goformation/cloudformation/neptune/aws-neptune-dbinstance.go b/pkg/goformation/cloudformation/neptune/aws-neptune-dbinstance.go
similarity index 96%
rename from goformation/cloudformation/neptune/aws-neptune-dbinstance.go
rename to pkg/goformation/cloudformation/neptune/aws-neptune-dbinstance.go
index 1b71ec7608..7fb65088a8 100644
--- a/goformation/cloudformation/neptune/aws-neptune-dbinstance.go
+++ b/pkg/goformation/cloudformation/neptune/aws-neptune-dbinstance.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DBInstance AWS CloudFormation Resource (AWS::Neptune::DBInstance)
diff --git a/goformation/cloudformation/neptune/aws-neptune-dbparametergroup.go b/pkg/goformation/cloudformation/neptune/aws-neptune-dbparametergroup.go
similarity index 95%
rename from goformation/cloudformation/neptune/aws-neptune-dbparametergroup.go
rename to pkg/goformation/cloudformation/neptune/aws-neptune-dbparametergroup.go
index 1bba4d202f..c70c96638f 100644
--- a/goformation/cloudformation/neptune/aws-neptune-dbparametergroup.go
+++ b/pkg/goformation/cloudformation/neptune/aws-neptune-dbparametergroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DBParameterGroup AWS CloudFormation Resource (AWS::Neptune::DBParameterGroup)
diff --git a/goformation/cloudformation/neptune/aws-neptune-dbsubnetgroup.go b/pkg/goformation/cloudformation/neptune/aws-neptune-dbsubnetgroup.go
similarity index 95%
rename from goformation/cloudformation/neptune/aws-neptune-dbsubnetgroup.go
rename to pkg/goformation/cloudformation/neptune/aws-neptune-dbsubnetgroup.go
index c52e83e8b1..09845e7e79 100644
--- a/goformation/cloudformation/neptune/aws-neptune-dbsubnetgroup.go
+++ b/pkg/goformation/cloudformation/neptune/aws-neptune-dbsubnetgroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DBSubnetGroup AWS CloudFormation Resource (AWS::Neptune::DBSubnetGroup)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewall.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewall.go
similarity index 96%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-firewall.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewall.go
index 09e11d562f..164529ade5 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewall.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewall.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Firewall AWS CloudFormation Resource (AWS::NetworkFirewall::Firewall)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewall_subnetmapping.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewall_subnetmapping.go
similarity index 91%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-firewall_subnetmapping.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewall_subnetmapping.go
index a62a2de73b..8afb61935d 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewall_subnetmapping.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewall_subnetmapping.go
@@ -1,9 +1,9 @@
 package networkfirewall
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Firewall_SubnetMapping AWS CloudFormation Resource (AWS::NetworkFirewall::Firewall.SubnetMapping)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy.go
similarity index 95%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy.go
index 58c54758b7..27fe021f3a 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FirewallPolicy AWS CloudFormation Resource (AWS::NetworkFirewall::FirewallPolicy)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_actiondefinition.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_actiondefinition.go
similarity index 95%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_actiondefinition.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_actiondefinition.go
index d1f06a5ee5..df0706750b 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_actiondefinition.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_actiondefinition.go
@@ -1,7 +1,7 @@
 package networkfirewall
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FirewallPolicy_ActionDefinition AWS CloudFormation Resource (AWS::NetworkFirewall::FirewallPolicy.ActionDefinition)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_customaction.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_customaction.go
similarity index 93%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_customaction.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_customaction.go
index f8b74426a5..14a33b85d7 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_customaction.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_customaction.go
@@ -1,9 +1,9 @@
 package networkfirewall
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FirewallPolicy_CustomAction AWS CloudFormation Resource (AWS::NetworkFirewall::FirewallPolicy.CustomAction)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_dimension.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_dimension.go
similarity index 91%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_dimension.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_dimension.go
index 7f17418c19..996f58d4c3 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_dimension.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_dimension.go
@@ -1,9 +1,9 @@
 package networkfirewall
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FirewallPolicy_Dimension AWS CloudFormation Resource (AWS::NetworkFirewall::FirewallPolicy.Dimension)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_firewallpolicy.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_firewallpolicy.go
similarity index 96%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_firewallpolicy.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_firewallpolicy.go
index 5a0a804ca5..0cd6419382 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_firewallpolicy.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_firewallpolicy.go
@@ -1,9 +1,9 @@
 package networkfirewall
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FirewallPolicy_FirewallPolicy AWS CloudFormation Resource (AWS::NetworkFirewall::FirewallPolicy.FirewallPolicy)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_publishmetricaction.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_publishmetricaction.go
similarity index 95%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_publishmetricaction.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_publishmetricaction.go
index ef39497d31..001541042a 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_publishmetricaction.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_publishmetricaction.go
@@ -1,7 +1,7 @@
 package networkfirewall
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FirewallPolicy_PublishMetricAction AWS CloudFormation Resource (AWS::NetworkFirewall::FirewallPolicy.PublishMetricAction)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statefulengineoptions.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statefulengineoptions.go
similarity index 92%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statefulengineoptions.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statefulengineoptions.go
index f7e9e42d30..73b22a9bc7 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statefulengineoptions.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statefulengineoptions.go
@@ -1,9 +1,9 @@
 package networkfirewall
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FirewallPolicy_StatefulEngineOptions AWS CloudFormation Resource (AWS::NetworkFirewall::FirewallPolicy.StatefulEngineOptions)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statefulrulegroupreference.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statefulrulegroupreference.go
similarity index 93%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statefulrulegroupreference.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statefulrulegroupreference.go
index 3726e7be39..990b7803c8 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statefulrulegroupreference.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statefulrulegroupreference.go
@@ -1,9 +1,9 @@
 package networkfirewall
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FirewallPolicy_StatefulRuleGroupReference AWS CloudFormation Resource (AWS::NetworkFirewall::FirewallPolicy.StatefulRuleGroupReference)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statelessrulegroupreference.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statelessrulegroupreference.go
similarity index 93%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statelessrulegroupreference.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statelessrulegroupreference.go
index 555b02d397..e38e5639c6 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statelessrulegroupreference.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statelessrulegroupreference.go
@@ -1,9 +1,9 @@
 package networkfirewall
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FirewallPolicy_StatelessRuleGroupReference AWS CloudFormation Resource (AWS::NetworkFirewall::FirewallPolicy.StatelessRuleGroupReference)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration.go
similarity index 97%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration.go
index b0fdc16cae..089ed2be90 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LoggingConfiguration AWS CloudFormation Resource (AWS::NetworkFirewall::LoggingConfiguration)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration_logdestinationconfig.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration_logdestinationconfig.go
similarity index 94%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration_logdestinationconfig.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration_logdestinationconfig.go
index ff08db717c..97ca3617a1 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration_logdestinationconfig.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration_logdestinationconfig.go
@@ -1,9 +1,9 @@
 package networkfirewall
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LoggingConfiguration_LogDestinationConfig AWS CloudFormation Resource (AWS::NetworkFirewall::LoggingConfiguration.LogDestinationConfig)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration_loggingconfiguration.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration_loggingconfiguration.go
similarity index 96%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration_loggingconfiguration.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration_loggingconfiguration.go
index 2d0e23cc21..48203952f7 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration_loggingconfiguration.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration_loggingconfiguration.go
@@ -1,7 +1,7 @@
 package networkfirewall
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LoggingConfiguration_LoggingConfiguration AWS CloudFormation Resource (AWS::NetworkFirewall::LoggingConfiguration.LoggingConfiguration)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup.go
similarity index 96%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup.go
index 32def49065..6a6fc5b276 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_actiondefinition.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_actiondefinition.go
similarity index 95%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_actiondefinition.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_actiondefinition.go
index 9bf89541ba..c96ea12051 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_actiondefinition.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_actiondefinition.go
@@ -1,7 +1,7 @@
 package networkfirewall
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_ActionDefinition AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.ActionDefinition)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_address.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_address.go
similarity index 91%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_address.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_address.go
index 93ead10127..583afc9651 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_address.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_address.go
@@ -1,9 +1,9 @@
 package networkfirewall
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_Address AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.Address)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_customaction.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_customaction.go
similarity index 93%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_customaction.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_customaction.go
index 40db69e63a..12e65f3043 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_customaction.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_customaction.go
@@ -1,9 +1,9 @@
 package networkfirewall
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_CustomAction AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.CustomAction)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_dimension.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_dimension.go
similarity index 91%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_dimension.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_dimension.go
index ad2d79f51f..028e1e4a8b 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_dimension.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_dimension.go
@@ -1,9 +1,9 @@
 package networkfirewall
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_Dimension AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.Dimension)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_header.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_header.go
similarity index 95%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_header.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_header.go
index 75c33c4392..dc90ae4782 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_header.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_header.go
@@ -1,9 +1,9 @@
 package networkfirewall
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_Header AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.Header)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ipset.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ipset.go
similarity index 91%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ipset.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ipset.go
index 461430d923..4a9f4797dc 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ipset.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ipset.go
@@ -1,9 +1,9 @@
 package networkfirewall
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_IPSet AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.IPSet)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_matchattributes.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_matchattributes.go
similarity index 95%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_matchattributes.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_matchattributes.go
index 779fb81f10..35f1b57cd2 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_matchattributes.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_matchattributes.go
@@ -1,9 +1,9 @@
 package networkfirewall
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_MatchAttributes AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.MatchAttributes)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_portrange.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_portrange.go
similarity index 92%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_portrange.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_portrange.go
index e9fbdb7c6b..8f46d001ba 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_portrange.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_portrange.go
@@ -1,9 +1,9 @@
 package networkfirewall
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_PortRange AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.PortRange)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_portset.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_portset.go
similarity index 91%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_portset.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_portset.go
index 2396c5e529..f0611ab4a9 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_portset.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_portset.go
@@ -1,9 +1,9 @@
 package networkfirewall
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_PortSet AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.PortSet)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_publishmetricaction.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_publishmetricaction.go
similarity index 95%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_publishmetricaction.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_publishmetricaction.go
index 159952388c..8b178a5749 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_publishmetricaction.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_publishmetricaction.go
@@ -1,7 +1,7 @@
 package networkfirewall
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_PublishMetricAction AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.PublishMetricAction)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ruledefinition.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ruledefinition.go
similarity index 93%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ruledefinition.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ruledefinition.go
index 3fd7f4cc73..16378546ab 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ruledefinition.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ruledefinition.go
@@ -1,9 +1,9 @@
 package networkfirewall
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_RuleDefinition AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.RuleDefinition)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulegroup.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulegroup.go
similarity index 96%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulegroup.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulegroup.go
index 95912711b6..85be34ad99 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulegroup.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulegroup.go
@@ -1,7 +1,7 @@
 package networkfirewall
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_RuleGroup AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.RuleGroup)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ruleoption.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ruleoption.go
similarity index 92%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ruleoption.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ruleoption.go
index 01896d81d6..0173a5534d 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ruleoption.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ruleoption.go
@@ -1,9 +1,9 @@
 package networkfirewall
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_RuleOption AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.RuleOption)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulessource.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulessource.go
similarity index 94%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulessource.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulessource.go
index f175fffb21..e8b8673608 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulessource.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulessource.go
@@ -1,9 +1,9 @@
 package networkfirewall
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_RulesSource AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.RulesSource)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulessourcelist.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulessourcelist.go
similarity index 94%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulessourcelist.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulessourcelist.go
index 0c04cf4035..4feb991bf5 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulessourcelist.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulessourcelist.go
@@ -1,9 +1,9 @@
 package networkfirewall
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_RulesSourceList AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.RulesSourceList)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulevariables.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulevariables.go
similarity index 96%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulevariables.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulevariables.go
index b0e7bb2837..cdb2522e81 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulevariables.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulevariables.go
@@ -1,7 +1,7 @@
 package networkfirewall
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_RuleVariables AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.RuleVariables)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statefulrule.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statefulrule.go
similarity index 93%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statefulrule.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statefulrule.go
index 3bed546a33..fbed27d8bf 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statefulrule.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statefulrule.go
@@ -1,9 +1,9 @@
 package networkfirewall
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_StatefulRule AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.StatefulRule)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statefulruleoptions.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statefulruleoptions.go
similarity index 92%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statefulruleoptions.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statefulruleoptions.go
index b2bd87f716..de8feb21d5 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statefulruleoptions.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statefulruleoptions.go
@@ -1,9 +1,9 @@
 package networkfirewall
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_StatefulRuleOptions AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.StatefulRuleOptions)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statelessrule.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statelessrule.go
similarity index 93%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statelessrule.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statelessrule.go
index c4ea9b59a7..cae7e570bd 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statelessrule.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statelessrule.go
@@ -1,9 +1,9 @@
 package networkfirewall
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_StatelessRule AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.StatelessRule)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statelessrulesandcustomactions.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statelessrulesandcustomactions.go
similarity index 96%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statelessrulesandcustomactions.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statelessrulesandcustomactions.go
index f0a3ce93a9..0603708ba5 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statelessrulesandcustomactions.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statelessrulesandcustomactions.go
@@ -1,7 +1,7 @@
 package networkfirewall
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_StatelessRulesAndCustomActions AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.StatelessRulesAndCustomActions)
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_tcpflagfield.go b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_tcpflagfield.go
similarity index 92%
rename from goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_tcpflagfield.go
rename to pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_tcpflagfield.go
index 0350017c4f..30705eb171 100644
--- a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_tcpflagfield.go
+++ b/pkg/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_tcpflagfield.go
@@ -1,9 +1,9 @@
 package networkfirewall
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_TCPFlagField AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.TCPFlagField)
diff --git a/goformation/cloudformation/networkmanager/aws-networkmanager-customergatewayassociation.go b/pkg/goformation/cloudformation/networkmanager/aws-networkmanager-customergatewayassociation.go
similarity index 97%
rename from goformation/cloudformation/networkmanager/aws-networkmanager-customergatewayassociation.go
rename to pkg/goformation/cloudformation/networkmanager/aws-networkmanager-customergatewayassociation.go
index c64bec18de..11f67ac3f2 100644
--- a/goformation/cloudformation/networkmanager/aws-networkmanager-customergatewayassociation.go
+++ b/pkg/goformation/cloudformation/networkmanager/aws-networkmanager-customergatewayassociation.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CustomerGatewayAssociation AWS CloudFormation Resource (AWS::NetworkManager::CustomerGatewayAssociation)
diff --git a/goformation/cloudformation/networkmanager/aws-networkmanager-device.go b/pkg/goformation/cloudformation/networkmanager/aws-networkmanager-device.go
similarity index 96%
rename from goformation/cloudformation/networkmanager/aws-networkmanager-device.go
rename to pkg/goformation/cloudformation/networkmanager/aws-networkmanager-device.go
index 3391a08d4b..eb24aed226 100644
--- a/goformation/cloudformation/networkmanager/aws-networkmanager-device.go
+++ b/pkg/goformation/cloudformation/networkmanager/aws-networkmanager-device.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Device AWS CloudFormation Resource (AWS::NetworkManager::Device)
diff --git a/goformation/cloudformation/networkmanager/aws-networkmanager-device_location.go b/pkg/goformation/cloudformation/networkmanager/aws-networkmanager-device_location.go
similarity index 93%
rename from goformation/cloudformation/networkmanager/aws-networkmanager-device_location.go
rename to pkg/goformation/cloudformation/networkmanager/aws-networkmanager-device_location.go
index 7040be52d0..8b0e17e178 100644
--- a/goformation/cloudformation/networkmanager/aws-networkmanager-device_location.go
+++ b/pkg/goformation/cloudformation/networkmanager/aws-networkmanager-device_location.go
@@ -1,9 +1,9 @@
 package networkmanager
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Device_Location AWS CloudFormation Resource (AWS::NetworkManager::Device.Location)
diff --git a/goformation/cloudformation/networkmanager/aws-networkmanager-globalnetwork.go b/pkg/goformation/cloudformation/networkmanager/aws-networkmanager-globalnetwork.go
similarity index 95%
rename from goformation/cloudformation/networkmanager/aws-networkmanager-globalnetwork.go
rename to pkg/goformation/cloudformation/networkmanager/aws-networkmanager-globalnetwork.go
index fd8b8ccc37..e3ae0247a1 100644
--- a/goformation/cloudformation/networkmanager/aws-networkmanager-globalnetwork.go
+++ b/pkg/goformation/cloudformation/networkmanager/aws-networkmanager-globalnetwork.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GlobalNetwork AWS CloudFormation Resource (AWS::NetworkManager::GlobalNetwork)
diff --git a/goformation/cloudformation/networkmanager/aws-networkmanager-link.go b/pkg/goformation/cloudformation/networkmanager/aws-networkmanager-link.go
similarity index 96%
rename from goformation/cloudformation/networkmanager/aws-networkmanager-link.go
rename to pkg/goformation/cloudformation/networkmanager/aws-networkmanager-link.go
index 18472279a6..f788c13a50 100644
--- a/goformation/cloudformation/networkmanager/aws-networkmanager-link.go
+++ b/pkg/goformation/cloudformation/networkmanager/aws-networkmanager-link.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Link AWS CloudFormation Resource (AWS::NetworkManager::Link)
diff --git a/goformation/cloudformation/networkmanager/aws-networkmanager-link_bandwidth.go b/pkg/goformation/cloudformation/networkmanager/aws-networkmanager-link_bandwidth.go
similarity index 92%
rename from goformation/cloudformation/networkmanager/aws-networkmanager-link_bandwidth.go
rename to pkg/goformation/cloudformation/networkmanager/aws-networkmanager-link_bandwidth.go
index ad214c42cb..24349cafee 100644
--- a/goformation/cloudformation/networkmanager/aws-networkmanager-link_bandwidth.go
+++ b/pkg/goformation/cloudformation/networkmanager/aws-networkmanager-link_bandwidth.go
@@ -1,9 +1,9 @@
 package networkmanager
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Link_Bandwidth AWS CloudFormation Resource (AWS::NetworkManager::Link.Bandwidth)
diff --git a/goformation/cloudformation/networkmanager/aws-networkmanager-linkassociation.go b/pkg/goformation/cloudformation/networkmanager/aws-networkmanager-linkassociation.go
similarity index 97%
rename from goformation/cloudformation/networkmanager/aws-networkmanager-linkassociation.go
rename to pkg/goformation/cloudformation/networkmanager/aws-networkmanager-linkassociation.go
index f398cf0d99..bc76a2072f 100644
--- a/goformation/cloudformation/networkmanager/aws-networkmanager-linkassociation.go
+++ b/pkg/goformation/cloudformation/networkmanager/aws-networkmanager-linkassociation.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LinkAssociation AWS CloudFormation Resource (AWS::NetworkManager::LinkAssociation)
diff --git a/goformation/cloudformation/networkmanager/aws-networkmanager-site.go b/pkg/goformation/cloudformation/networkmanager/aws-networkmanager-site.go
similarity index 95%
rename from goformation/cloudformation/networkmanager/aws-networkmanager-site.go
rename to pkg/goformation/cloudformation/networkmanager/aws-networkmanager-site.go
index 6b289370ec..e28e1903e1 100644
--- a/goformation/cloudformation/networkmanager/aws-networkmanager-site.go
+++ b/pkg/goformation/cloudformation/networkmanager/aws-networkmanager-site.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Site AWS CloudFormation Resource (AWS::NetworkManager::Site)
diff --git a/goformation/cloudformation/networkmanager/aws-networkmanager-site_location.go b/pkg/goformation/cloudformation/networkmanager/aws-networkmanager-site_location.go
similarity index 93%
rename from goformation/cloudformation/networkmanager/aws-networkmanager-site_location.go
rename to pkg/goformation/cloudformation/networkmanager/aws-networkmanager-site_location.go
index 57099e75b4..fd9af9e529 100644
--- a/goformation/cloudformation/networkmanager/aws-networkmanager-site_location.go
+++ b/pkg/goformation/cloudformation/networkmanager/aws-networkmanager-site_location.go
@@ -1,9 +1,9 @@
 package networkmanager
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Site_Location AWS CloudFormation Resource (AWS::NetworkManager::Site.Location)
diff --git a/goformation/cloudformation/networkmanager/aws-networkmanager-transitgatewayregistration.go b/pkg/goformation/cloudformation/networkmanager/aws-networkmanager-transitgatewayregistration.go
similarity index 96%
rename from goformation/cloudformation/networkmanager/aws-networkmanager-transitgatewayregistration.go
rename to pkg/goformation/cloudformation/networkmanager/aws-networkmanager-transitgatewayregistration.go
index 24d1c6efdf..69ff59b6d6 100644
--- a/goformation/cloudformation/networkmanager/aws-networkmanager-transitgatewayregistration.go
+++ b/pkg/goformation/cloudformation/networkmanager/aws-networkmanager-transitgatewayregistration.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TransitGatewayRegistration AWS CloudFormation Resource (AWS::NetworkManager::TransitGatewayRegistration)
diff --git a/goformation/cloudformation/nimblestudio/aws-nimblestudio-launchprofile.go b/pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-launchprofile.go
similarity index 97%
rename from goformation/cloudformation/nimblestudio/aws-nimblestudio-launchprofile.go
rename to pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-launchprofile.go
index 17604415b2..22c7dbfdef 100644
--- a/goformation/cloudformation/nimblestudio/aws-nimblestudio-launchprofile.go
+++ b/pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-launchprofile.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchProfile AWS CloudFormation Resource (AWS::NimbleStudio::LaunchProfile)
diff --git a/goformation/cloudformation/nimblestudio/aws-nimblestudio-launchprofile_streamconfiguration.go b/pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-launchprofile_streamconfiguration.go
similarity index 95%
rename from goformation/cloudformation/nimblestudio/aws-nimblestudio-launchprofile_streamconfiguration.go
rename to pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-launchprofile_streamconfiguration.go
index 88923432d8..b7d5e0904b 100644
--- a/goformation/cloudformation/nimblestudio/aws-nimblestudio-launchprofile_streamconfiguration.go
+++ b/pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-launchprofile_streamconfiguration.go
@@ -1,9 +1,9 @@
 package nimblestudio
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchProfile_StreamConfiguration AWS CloudFormation Resource (AWS::NimbleStudio::LaunchProfile.StreamConfiguration)
diff --git a/goformation/cloudformation/nimblestudio/aws-nimblestudio-streamingimage.go b/pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-streamingimage.go
similarity index 97%
rename from goformation/cloudformation/nimblestudio/aws-nimblestudio-streamingimage.go
rename to pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-streamingimage.go
index dd4781a62c..0159b8e3ae 100644
--- a/goformation/cloudformation/nimblestudio/aws-nimblestudio-streamingimage.go
+++ b/pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-streamingimage.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StreamingImage AWS CloudFormation Resource (AWS::NimbleStudio::StreamingImage)
diff --git a/goformation/cloudformation/nimblestudio/aws-nimblestudio-studio.go b/pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studio.go
similarity index 97%
rename from goformation/cloudformation/nimblestudio/aws-nimblestudio-studio.go
rename to pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studio.go
index 32c92ffd86..870ab97436 100644
--- a/goformation/cloudformation/nimblestudio/aws-nimblestudio-studio.go
+++ b/pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studio.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Studio AWS CloudFormation Resource (AWS::NimbleStudio::Studio)
diff --git a/goformation/cloudformation/nimblestudio/aws-nimblestudio-studio_studioencryptionconfiguration.go b/pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studio_studioencryptionconfiguration.go
similarity index 93%
rename from goformation/cloudformation/nimblestudio/aws-nimblestudio-studio_studioencryptionconfiguration.go
rename to pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studio_studioencryptionconfiguration.go
index 27a0e15b42..445b8ce236 100644
--- a/goformation/cloudformation/nimblestudio/aws-nimblestudio-studio_studioencryptionconfiguration.go
+++ b/pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studio_studioencryptionconfiguration.go
@@ -1,9 +1,9 @@
 package nimblestudio
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Studio_StudioEncryptionConfiguration AWS CloudFormation Resource (AWS::NimbleStudio::Studio.StudioEncryptionConfiguration)
diff --git a/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent.go b/pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent.go
similarity index 97%
rename from goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent.go
rename to pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent.go
index 24bbecd52e..a82996fc04 100644
--- a/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent.go
+++ b/pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StudioComponent AWS CloudFormation Resource (AWS::NimbleStudio::StudioComponent)
diff --git a/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_activedirectorycomputerattribute.go b/pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_activedirectorycomputerattribute.go
similarity index 93%
rename from goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_activedirectorycomputerattribute.go
rename to pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_activedirectorycomputerattribute.go
index c7775473d4..4949d26fef 100644
--- a/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_activedirectorycomputerattribute.go
+++ b/pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_activedirectorycomputerattribute.go
@@ -1,9 +1,9 @@
 package nimblestudio
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StudioComponent_ActiveDirectoryComputerAttribute AWS CloudFormation Resource (AWS::NimbleStudio::StudioComponent.ActiveDirectoryComputerAttribute)
diff --git a/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_activedirectoryconfiguration.go b/pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_activedirectoryconfiguration.go
similarity index 94%
rename from goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_activedirectoryconfiguration.go
rename to pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_activedirectoryconfiguration.go
index 331eb36187..3557c55dfc 100644
--- a/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_activedirectoryconfiguration.go
+++ b/pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_activedirectoryconfiguration.go
@@ -1,9 +1,9 @@
 package nimblestudio
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StudioComponent_ActiveDirectoryConfiguration AWS CloudFormation Resource (AWS::NimbleStudio::StudioComponent.ActiveDirectoryConfiguration)
diff --git a/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_computefarmconfiguration.go b/pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_computefarmconfiguration.go
similarity index 93%
rename from goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_computefarmconfiguration.go
rename to pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_computefarmconfiguration.go
index a2033bfeb1..dbe34154d5 100644
--- a/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_computefarmconfiguration.go
+++ b/pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_computefarmconfiguration.go
@@ -1,9 +1,9 @@
 package nimblestudio
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StudioComponent_ComputeFarmConfiguration AWS CloudFormation Resource (AWS::NimbleStudio::StudioComponent.ComputeFarmConfiguration)
diff --git a/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_licenseserviceconfiguration.go b/pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_licenseserviceconfiguration.go
similarity index 92%
rename from goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_licenseserviceconfiguration.go
rename to pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_licenseserviceconfiguration.go
index 758eb5772f..fff6352a5d 100644
--- a/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_licenseserviceconfiguration.go
+++ b/pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_licenseserviceconfiguration.go
@@ -1,9 +1,9 @@
 package nimblestudio
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StudioComponent_LicenseServiceConfiguration AWS CloudFormation Resource (AWS::NimbleStudio::StudioComponent.LicenseServiceConfiguration)
diff --git a/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_scriptparameterkeyvalue.go b/pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_scriptparameterkeyvalue.go
similarity index 93%
rename from goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_scriptparameterkeyvalue.go
rename to pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_scriptparameterkeyvalue.go
index 272af77626..979d1740c0 100644
--- a/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_scriptparameterkeyvalue.go
+++ b/pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_scriptparameterkeyvalue.go
@@ -1,9 +1,9 @@
 package nimblestudio
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StudioComponent_ScriptParameterKeyValue AWS CloudFormation Resource (AWS::NimbleStudio::StudioComponent.ScriptParameterKeyValue)
diff --git a/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_sharedfilesystemconfiguration.go b/pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_sharedfilesystemconfiguration.go
similarity index 95%
rename from goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_sharedfilesystemconfiguration.go
rename to pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_sharedfilesystemconfiguration.go
index 37c464704e..3d814c6d36 100644
--- a/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_sharedfilesystemconfiguration.go
+++ b/pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_sharedfilesystemconfiguration.go
@@ -1,9 +1,9 @@
 package nimblestudio
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StudioComponent_SharedFileSystemConfiguration AWS CloudFormation Resource (AWS::NimbleStudio::StudioComponent.SharedFileSystemConfiguration)
diff --git a/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_studiocomponentconfiguration.go b/pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_studiocomponentconfiguration.go
similarity index 97%
rename from goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_studiocomponentconfiguration.go
rename to pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_studiocomponentconfiguration.go
index 575a54e7cf..c794543db2 100644
--- a/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_studiocomponentconfiguration.go
+++ b/pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_studiocomponentconfiguration.go
@@ -1,7 +1,7 @@
 package nimblestudio
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StudioComponent_StudioComponentConfiguration AWS CloudFormation Resource (AWS::NimbleStudio::StudioComponent.StudioComponentConfiguration)
diff --git a/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_studiocomponentinitializationscript.go b/pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_studiocomponentinitializationscript.go
similarity index 95%
rename from goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_studiocomponentinitializationscript.go
rename to pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_studiocomponentinitializationscript.go
index 94fe179767..9c9e8a63e8 100644
--- a/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_studiocomponentinitializationscript.go
+++ b/pkg/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_studiocomponentinitializationscript.go
@@ -1,9 +1,9 @@
 package nimblestudio
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StudioComponent_StudioComponentInitializationScript AWS CloudFormation Resource (AWS::NimbleStudio::StudioComponent.StudioComponentInitializationScript)
diff --git a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain.go b/pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain.go
similarity index 97%
rename from goformation/cloudformation/opensearchservice/aws-opensearchservice-domain.go
rename to pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain.go
index f1e90689bc..292e4c999e 100644
--- a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain.go
+++ b/pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain AWS CloudFormation Resource (AWS::OpenSearchService::Domain)
diff --git a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_advancedsecurityoptionsinput.go b/pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_advancedsecurityoptionsinput.go
similarity index 94%
rename from goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_advancedsecurityoptionsinput.go
rename to pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_advancedsecurityoptionsinput.go
index 333b6db9d3..cfcb630b92 100644
--- a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_advancedsecurityoptionsinput.go
+++ b/pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_advancedsecurityoptionsinput.go
@@ -1,9 +1,9 @@
 package opensearchservice
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain_AdvancedSecurityOptionsInput AWS CloudFormation Resource (AWS::OpenSearchService::Domain.AdvancedSecurityOptionsInput)
diff --git a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_clusterconfig.go b/pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_clusterconfig.go
similarity index 96%
rename from goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_clusterconfig.go
rename to pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_clusterconfig.go
index b7f8f9ba1a..119efed2c4 100644
--- a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_clusterconfig.go
+++ b/pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_clusterconfig.go
@@ -1,9 +1,9 @@
 package opensearchservice
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain_ClusterConfig AWS CloudFormation Resource (AWS::OpenSearchService::Domain.ClusterConfig)
diff --git a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_cognitooptions.go b/pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_cognitooptions.go
similarity index 94%
rename from goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_cognitooptions.go
rename to pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_cognitooptions.go
index 7ee64bf0ef..b599c9c3b3 100644
--- a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_cognitooptions.go
+++ b/pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_cognitooptions.go
@@ -1,9 +1,9 @@
 package opensearchservice
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain_CognitoOptions AWS CloudFormation Resource (AWS::OpenSearchService::Domain.CognitoOptions)
diff --git a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_domainendpointoptions.go b/pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_domainendpointoptions.go
similarity index 95%
rename from goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_domainendpointoptions.go
rename to pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_domainendpointoptions.go
index c57102f35d..c0534d2303 100644
--- a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_domainendpointoptions.go
+++ b/pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_domainendpointoptions.go
@@ -1,9 +1,9 @@
 package opensearchservice
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain_DomainEndpointOptions AWS CloudFormation Resource (AWS::OpenSearchService::Domain.DomainEndpointOptions)
diff --git a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_ebsoptions.go b/pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_ebsoptions.go
similarity index 94%
rename from goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_ebsoptions.go
rename to pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_ebsoptions.go
index 85368a405b..a04e48d7b5 100644
--- a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_ebsoptions.go
+++ b/pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_ebsoptions.go
@@ -1,9 +1,9 @@
 package opensearchservice
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain_EBSOptions AWS CloudFormation Resource (AWS::OpenSearchService::Domain.EBSOptions)
diff --git a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_encryptionatrestoptions.go b/pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_encryptionatrestoptions.go
similarity index 93%
rename from goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_encryptionatrestoptions.go
rename to pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_encryptionatrestoptions.go
index 8837f8e8d8..56afb35d39 100644
--- a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_encryptionatrestoptions.go
+++ b/pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_encryptionatrestoptions.go
@@ -1,9 +1,9 @@
 package opensearchservice
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain_EncryptionAtRestOptions AWS CloudFormation Resource (AWS::OpenSearchService::Domain.EncryptionAtRestOptions)
diff --git a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_logpublishingoption.go b/pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_logpublishingoption.go
similarity index 93%
rename from goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_logpublishingoption.go
rename to pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_logpublishingoption.go
index a706971b3f..19ba98603f 100644
--- a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_logpublishingoption.go
+++ b/pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_logpublishingoption.go
@@ -1,9 +1,9 @@
 package opensearchservice
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain_LogPublishingOption AWS CloudFormation Resource (AWS::OpenSearchService::Domain.LogPublishingOption)
diff --git a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_masteruseroptions.go b/pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_masteruseroptions.go
similarity index 94%
rename from goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_masteruseroptions.go
rename to pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_masteruseroptions.go
index 4541179a2a..0914c758eb 100644
--- a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_masteruseroptions.go
+++ b/pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_masteruseroptions.go
@@ -1,9 +1,9 @@
 package opensearchservice
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain_MasterUserOptions AWS CloudFormation Resource (AWS::OpenSearchService::Domain.MasterUserOptions)
diff --git a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_nodetonodeencryptionoptions.go b/pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_nodetonodeencryptionoptions.go
similarity index 92%
rename from goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_nodetonodeencryptionoptions.go
rename to pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_nodetonodeencryptionoptions.go
index 3056db6242..7b65935c0a 100644
--- a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_nodetonodeencryptionoptions.go
+++ b/pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_nodetonodeencryptionoptions.go
@@ -1,9 +1,9 @@
 package opensearchservice
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain_NodeToNodeEncryptionOptions AWS CloudFormation Resource (AWS::OpenSearchService::Domain.NodeToNodeEncryptionOptions)
diff --git a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_snapshotoptions.go b/pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_snapshotoptions.go
similarity index 92%
rename from goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_snapshotoptions.go
rename to pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_snapshotoptions.go
index f28dbf1236..9a984681a8 100644
--- a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_snapshotoptions.go
+++ b/pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_snapshotoptions.go
@@ -1,9 +1,9 @@
 package opensearchservice
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain_SnapshotOptions AWS CloudFormation Resource (AWS::OpenSearchService::Domain.SnapshotOptions)
diff --git a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_vpcoptions.go b/pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_vpcoptions.go
similarity index 93%
rename from goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_vpcoptions.go
rename to pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_vpcoptions.go
index 8886c52315..37dc448cbc 100644
--- a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_vpcoptions.go
+++ b/pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_vpcoptions.go
@@ -1,9 +1,9 @@
 package opensearchservice
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain_VPCOptions AWS CloudFormation Resource (AWS::OpenSearchService::Domain.VPCOptions)
diff --git a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_zoneawarenessconfig.go b/pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_zoneawarenessconfig.go
similarity index 92%
rename from goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_zoneawarenessconfig.go
rename to pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_zoneawarenessconfig.go
index c3e75fba46..c8317a3c8e 100644
--- a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_zoneawarenessconfig.go
+++ b/pkg/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_zoneawarenessconfig.go
@@ -1,9 +1,9 @@
 package opensearchservice
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain_ZoneAwarenessConfig AWS CloudFormation Resource (AWS::OpenSearchService::Domain.ZoneAwarenessConfig)
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-app.go b/pkg/goformation/cloudformation/opsworks/aws-opsworks-app.go
similarity index 97%
rename from goformation/cloudformation/opsworks/aws-opsworks-app.go
rename to pkg/goformation/cloudformation/opsworks/aws-opsworks-app.go
index c4facb7f36..332466cb84 100644
--- a/goformation/cloudformation/opsworks/aws-opsworks-app.go
+++ b/pkg/goformation/cloudformation/opsworks/aws-opsworks-app.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // App AWS CloudFormation Resource (AWS::OpsWorks::App)
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-app_datasource.go b/pkg/goformation/cloudformation/opsworks/aws-opsworks-app_datasource.go
similarity index 93%
rename from goformation/cloudformation/opsworks/aws-opsworks-app_datasource.go
rename to pkg/goformation/cloudformation/opsworks/aws-opsworks-app_datasource.go
index a011949b96..9150140db2 100644
--- a/goformation/cloudformation/opsworks/aws-opsworks-app_datasource.go
+++ b/pkg/goformation/cloudformation/opsworks/aws-opsworks-app_datasource.go
@@ -1,9 +1,9 @@
 package opsworks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // App_DataSource AWS CloudFormation Resource (AWS::OpsWorks::App.DataSource)
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-app_environmentvariable.go b/pkg/goformation/cloudformation/opsworks/aws-opsworks-app_environmentvariable.go
similarity index 93%
rename from goformation/cloudformation/opsworks/aws-opsworks-app_environmentvariable.go
rename to pkg/goformation/cloudformation/opsworks/aws-opsworks-app_environmentvariable.go
index f4106098c3..35c43904db 100644
--- a/goformation/cloudformation/opsworks/aws-opsworks-app_environmentvariable.go
+++ b/pkg/goformation/cloudformation/opsworks/aws-opsworks-app_environmentvariable.go
@@ -1,9 +1,9 @@
 package opsworks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // App_EnvironmentVariable AWS CloudFormation Resource (AWS::OpsWorks::App.EnvironmentVariable)
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-app_source.go b/pkg/goformation/cloudformation/opsworks/aws-opsworks-app_source.go
similarity index 95%
rename from goformation/cloudformation/opsworks/aws-opsworks-app_source.go
rename to pkg/goformation/cloudformation/opsworks/aws-opsworks-app_source.go
index 9fcba26193..e73f0a50b9 100644
--- a/goformation/cloudformation/opsworks/aws-opsworks-app_source.go
+++ b/pkg/goformation/cloudformation/opsworks/aws-opsworks-app_source.go
@@ -1,9 +1,9 @@
 package opsworks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // App_Source AWS CloudFormation Resource (AWS::OpsWorks::App.Source)
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-app_sslconfiguration.go b/pkg/goformation/cloudformation/opsworks/aws-opsworks-app_sslconfiguration.go
similarity index 93%
rename from goformation/cloudformation/opsworks/aws-opsworks-app_sslconfiguration.go
rename to pkg/goformation/cloudformation/opsworks/aws-opsworks-app_sslconfiguration.go
index 9fdbb7f40a..d4a0957326 100644
--- a/goformation/cloudformation/opsworks/aws-opsworks-app_sslconfiguration.go
+++ b/pkg/goformation/cloudformation/opsworks/aws-opsworks-app_sslconfiguration.go
@@ -1,9 +1,9 @@
 package opsworks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // App_SslConfiguration AWS CloudFormation Resource (AWS::OpsWorks::App.SslConfiguration)
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-elasticloadbalancerattachment.go b/pkg/goformation/cloudformation/opsworks/aws-opsworks-elasticloadbalancerattachment.go
similarity index 96%
rename from goformation/cloudformation/opsworks/aws-opsworks-elasticloadbalancerattachment.go
rename to pkg/goformation/cloudformation/opsworks/aws-opsworks-elasticloadbalancerattachment.go
index 2e64422609..1964a65203 100644
--- a/goformation/cloudformation/opsworks/aws-opsworks-elasticloadbalancerattachment.go
+++ b/pkg/goformation/cloudformation/opsworks/aws-opsworks-elasticloadbalancerattachment.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ElasticLoadBalancerAttachment AWS CloudFormation Resource (AWS::OpsWorks::ElasticLoadBalancerAttachment)
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-instance.go b/pkg/goformation/cloudformation/opsworks/aws-opsworks-instance.go
similarity index 98%
rename from goformation/cloudformation/opsworks/aws-opsworks-instance.go
rename to pkg/goformation/cloudformation/opsworks/aws-opsworks-instance.go
index c104976604..2795d65144 100644
--- a/goformation/cloudformation/opsworks/aws-opsworks-instance.go
+++ b/pkg/goformation/cloudformation/opsworks/aws-opsworks-instance.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance AWS CloudFormation Resource (AWS::OpsWorks::Instance)
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-instance_blockdevicemapping.go b/pkg/goformation/cloudformation/opsworks/aws-opsworks-instance_blockdevicemapping.go
similarity index 94%
rename from goformation/cloudformation/opsworks/aws-opsworks-instance_blockdevicemapping.go
rename to pkg/goformation/cloudformation/opsworks/aws-opsworks-instance_blockdevicemapping.go
index dc07226abf..9b35812e27 100644
--- a/goformation/cloudformation/opsworks/aws-opsworks-instance_blockdevicemapping.go
+++ b/pkg/goformation/cloudformation/opsworks/aws-opsworks-instance_blockdevicemapping.go
@@ -1,9 +1,9 @@
 package opsworks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance_BlockDeviceMapping AWS CloudFormation Resource (AWS::OpsWorks::Instance.BlockDeviceMapping)
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-instance_ebsblockdevice.go b/pkg/goformation/cloudformation/opsworks/aws-opsworks-instance_ebsblockdevice.go
similarity index 95%
rename from goformation/cloudformation/opsworks/aws-opsworks-instance_ebsblockdevice.go
rename to pkg/goformation/cloudformation/opsworks/aws-opsworks-instance_ebsblockdevice.go
index 197bef57ff..004f5bcee8 100644
--- a/goformation/cloudformation/opsworks/aws-opsworks-instance_ebsblockdevice.go
+++ b/pkg/goformation/cloudformation/opsworks/aws-opsworks-instance_ebsblockdevice.go
@@ -1,9 +1,9 @@
 package opsworks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance_EbsBlockDevice AWS CloudFormation Resource (AWS::OpsWorks::Instance.EbsBlockDevice)
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-instance_timebasedautoscaling.go b/pkg/goformation/cloudformation/opsworks/aws-opsworks-instance_timebasedautoscaling.go
similarity index 96%
rename from goformation/cloudformation/opsworks/aws-opsworks-instance_timebasedautoscaling.go
rename to pkg/goformation/cloudformation/opsworks/aws-opsworks-instance_timebasedautoscaling.go
index 003db9b6ca..e05056081d 100644
--- a/goformation/cloudformation/opsworks/aws-opsworks-instance_timebasedautoscaling.go
+++ b/pkg/goformation/cloudformation/opsworks/aws-opsworks-instance_timebasedautoscaling.go
@@ -1,9 +1,9 @@
 package opsworks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance_TimeBasedAutoScaling AWS CloudFormation Resource (AWS::OpsWorks::Instance.TimeBasedAutoScaling)
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-layer.go b/pkg/goformation/cloudformation/opsworks/aws-opsworks-layer.go
similarity index 97%
rename from goformation/cloudformation/opsworks/aws-opsworks-layer.go
rename to pkg/goformation/cloudformation/opsworks/aws-opsworks-layer.go
index 0db72d5c68..4f2bf3bc25 100644
--- a/goformation/cloudformation/opsworks/aws-opsworks-layer.go
+++ b/pkg/goformation/cloudformation/opsworks/aws-opsworks-layer.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Layer AWS CloudFormation Resource (AWS::OpsWorks::Layer)
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-layer_autoscalingthresholds.go b/pkg/goformation/cloudformation/opsworks/aws-opsworks-layer_autoscalingthresholds.go
similarity index 96%
rename from goformation/cloudformation/opsworks/aws-opsworks-layer_autoscalingthresholds.go
rename to pkg/goformation/cloudformation/opsworks/aws-opsworks-layer_autoscalingthresholds.go
index c82bd4266e..4ea1050a1f 100644
--- a/goformation/cloudformation/opsworks/aws-opsworks-layer_autoscalingthresholds.go
+++ b/pkg/goformation/cloudformation/opsworks/aws-opsworks-layer_autoscalingthresholds.go
@@ -1,9 +1,9 @@
 package opsworks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Layer_AutoScalingThresholds AWS CloudFormation Resource (AWS::OpsWorks::Layer.AutoScalingThresholds)
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-layer_lifecycleeventconfiguration.go b/pkg/goformation/cloudformation/opsworks/aws-opsworks-layer_lifecycleeventconfiguration.go
similarity index 95%
rename from goformation/cloudformation/opsworks/aws-opsworks-layer_lifecycleeventconfiguration.go
rename to pkg/goformation/cloudformation/opsworks/aws-opsworks-layer_lifecycleeventconfiguration.go
index 94209058ba..2933127721 100644
--- a/goformation/cloudformation/opsworks/aws-opsworks-layer_lifecycleeventconfiguration.go
+++ b/pkg/goformation/cloudformation/opsworks/aws-opsworks-layer_lifecycleeventconfiguration.go
@@ -1,7 +1,7 @@
 package opsworks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Layer_LifecycleEventConfiguration AWS CloudFormation Resource (AWS::OpsWorks::Layer.LifecycleEventConfiguration)
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-layer_loadbasedautoscaling.go b/pkg/goformation/cloudformation/opsworks/aws-opsworks-layer_loadbasedautoscaling.go
similarity index 93%
rename from goformation/cloudformation/opsworks/aws-opsworks-layer_loadbasedautoscaling.go
rename to pkg/goformation/cloudformation/opsworks/aws-opsworks-layer_loadbasedautoscaling.go
index 30bcc9f861..19b52c7023 100644
--- a/goformation/cloudformation/opsworks/aws-opsworks-layer_loadbasedautoscaling.go
+++ b/pkg/goformation/cloudformation/opsworks/aws-opsworks-layer_loadbasedautoscaling.go
@@ -1,9 +1,9 @@
 package opsworks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Layer_LoadBasedAutoScaling AWS CloudFormation Resource (AWS::OpsWorks::Layer.LoadBasedAutoScaling)
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-layer_recipes.go b/pkg/goformation/cloudformation/opsworks/aws-opsworks-layer_recipes.go
similarity index 94%
rename from goformation/cloudformation/opsworks/aws-opsworks-layer_recipes.go
rename to pkg/goformation/cloudformation/opsworks/aws-opsworks-layer_recipes.go
index dfec9d3150..8a5f95442a 100644
--- a/goformation/cloudformation/opsworks/aws-opsworks-layer_recipes.go
+++ b/pkg/goformation/cloudformation/opsworks/aws-opsworks-layer_recipes.go
@@ -1,9 +1,9 @@
 package opsworks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Layer_Recipes AWS CloudFormation Resource (AWS::OpsWorks::Layer.Recipes)
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-layer_shutdowneventconfiguration.go b/pkg/goformation/cloudformation/opsworks/aws-opsworks-layer_shutdowneventconfiguration.go
similarity index 93%
rename from goformation/cloudformation/opsworks/aws-opsworks-layer_shutdowneventconfiguration.go
rename to pkg/goformation/cloudformation/opsworks/aws-opsworks-layer_shutdowneventconfiguration.go
index b7c0ceee23..4b3c5e9617 100644
--- a/goformation/cloudformation/opsworks/aws-opsworks-layer_shutdowneventconfiguration.go
+++ b/pkg/goformation/cloudformation/opsworks/aws-opsworks-layer_shutdowneventconfiguration.go
@@ -1,9 +1,9 @@
 package opsworks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Layer_ShutdownEventConfiguration AWS CloudFormation Resource (AWS::OpsWorks::Layer.ShutdownEventConfiguration)
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-layer_volumeconfiguration.go b/pkg/goformation/cloudformation/opsworks/aws-opsworks-layer_volumeconfiguration.go
similarity index 95%
rename from goformation/cloudformation/opsworks/aws-opsworks-layer_volumeconfiguration.go
rename to pkg/goformation/cloudformation/opsworks/aws-opsworks-layer_volumeconfiguration.go
index b514bc3d06..77d3f92c66 100644
--- a/goformation/cloudformation/opsworks/aws-opsworks-layer_volumeconfiguration.go
+++ b/pkg/goformation/cloudformation/opsworks/aws-opsworks-layer_volumeconfiguration.go
@@ -1,9 +1,9 @@
 package opsworks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Layer_VolumeConfiguration AWS CloudFormation Resource (AWS::OpsWorks::Layer.VolumeConfiguration)
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-stack.go b/pkg/goformation/cloudformation/opsworks/aws-opsworks-stack.go
similarity index 97%
rename from goformation/cloudformation/opsworks/aws-opsworks-stack.go
rename to pkg/goformation/cloudformation/opsworks/aws-opsworks-stack.go
index 8fe8226b2b..7dd73f540a 100644
--- a/goformation/cloudformation/opsworks/aws-opsworks-stack.go
+++ b/pkg/goformation/cloudformation/opsworks/aws-opsworks-stack.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Stack AWS CloudFormation Resource (AWS::OpsWorks::Stack)
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-stack_chefconfiguration.go b/pkg/goformation/cloudformation/opsworks/aws-opsworks-stack_chefconfiguration.go
similarity index 93%
rename from goformation/cloudformation/opsworks/aws-opsworks-stack_chefconfiguration.go
rename to pkg/goformation/cloudformation/opsworks/aws-opsworks-stack_chefconfiguration.go
index 3baa1d0be9..8be9fab02c 100644
--- a/goformation/cloudformation/opsworks/aws-opsworks-stack_chefconfiguration.go
+++ b/pkg/goformation/cloudformation/opsworks/aws-opsworks-stack_chefconfiguration.go
@@ -1,9 +1,9 @@
 package opsworks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Stack_ChefConfiguration AWS CloudFormation Resource (AWS::OpsWorks::Stack.ChefConfiguration)
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-stack_elasticip.go b/pkg/goformation/cloudformation/opsworks/aws-opsworks-stack_elasticip.go
similarity index 92%
rename from goformation/cloudformation/opsworks/aws-opsworks-stack_elasticip.go
rename to pkg/goformation/cloudformation/opsworks/aws-opsworks-stack_elasticip.go
index 3e06e79035..a9789040b5 100644
--- a/goformation/cloudformation/opsworks/aws-opsworks-stack_elasticip.go
+++ b/pkg/goformation/cloudformation/opsworks/aws-opsworks-stack_elasticip.go
@@ -1,9 +1,9 @@
 package opsworks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Stack_ElasticIp AWS CloudFormation Resource (AWS::OpsWorks::Stack.ElasticIp)
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-stack_rdsdbinstance.go b/pkg/goformation/cloudformation/opsworks/aws-opsworks-stack_rdsdbinstance.go
similarity index 93%
rename from goformation/cloudformation/opsworks/aws-opsworks-stack_rdsdbinstance.go
rename to pkg/goformation/cloudformation/opsworks/aws-opsworks-stack_rdsdbinstance.go
index 1f0d61dfd6..8380d45ae9 100644
--- a/goformation/cloudformation/opsworks/aws-opsworks-stack_rdsdbinstance.go
+++ b/pkg/goformation/cloudformation/opsworks/aws-opsworks-stack_rdsdbinstance.go
@@ -1,9 +1,9 @@
 package opsworks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Stack_RdsDbInstance AWS CloudFormation Resource (AWS::OpsWorks::Stack.RdsDbInstance)
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-stack_source.go b/pkg/goformation/cloudformation/opsworks/aws-opsworks-stack_source.go
similarity index 95%
rename from goformation/cloudformation/opsworks/aws-opsworks-stack_source.go
rename to pkg/goformation/cloudformation/opsworks/aws-opsworks-stack_source.go
index 2a6137342e..ff8f265a92 100644
--- a/goformation/cloudformation/opsworks/aws-opsworks-stack_source.go
+++ b/pkg/goformation/cloudformation/opsworks/aws-opsworks-stack_source.go
@@ -1,9 +1,9 @@
 package opsworks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Stack_Source AWS CloudFormation Resource (AWS::OpsWorks::Stack.Source)
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-stack_stackconfigurationmanager.go b/pkg/goformation/cloudformation/opsworks/aws-opsworks-stack_stackconfigurationmanager.go
similarity index 92%
rename from goformation/cloudformation/opsworks/aws-opsworks-stack_stackconfigurationmanager.go
rename to pkg/goformation/cloudformation/opsworks/aws-opsworks-stack_stackconfigurationmanager.go
index 7c4198782e..b319545a36 100644
--- a/goformation/cloudformation/opsworks/aws-opsworks-stack_stackconfigurationmanager.go
+++ b/pkg/goformation/cloudformation/opsworks/aws-opsworks-stack_stackconfigurationmanager.go
@@ -1,9 +1,9 @@
 package opsworks
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Stack_StackConfigurationManager AWS CloudFormation Resource (AWS::OpsWorks::Stack.StackConfigurationManager)
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-userprofile.go b/pkg/goformation/cloudformation/opsworks/aws-opsworks-userprofile.go
similarity index 97%
rename from goformation/cloudformation/opsworks/aws-opsworks-userprofile.go
rename to pkg/goformation/cloudformation/opsworks/aws-opsworks-userprofile.go
index 88b78430a0..b5447192f1 100644
--- a/goformation/cloudformation/opsworks/aws-opsworks-userprofile.go
+++ b/pkg/goformation/cloudformation/opsworks/aws-opsworks-userprofile.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserProfile AWS CloudFormation Resource (AWS::OpsWorks::UserProfile)
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-volume.go b/pkg/goformation/cloudformation/opsworks/aws-opsworks-volume.go
similarity index 97%
rename from goformation/cloudformation/opsworks/aws-opsworks-volume.go
rename to pkg/goformation/cloudformation/opsworks/aws-opsworks-volume.go
index 07b6eb530b..4b2b5f2fc6 100644
--- a/goformation/cloudformation/opsworks/aws-opsworks-volume.go
+++ b/pkg/goformation/cloudformation/opsworks/aws-opsworks-volume.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Volume AWS CloudFormation Resource (AWS::OpsWorks::Volume)
diff --git a/goformation/cloudformation/opsworkscm/aws-opsworkscm-server.go b/pkg/goformation/cloudformation/opsworkscm/aws-opsworkscm-server.go
similarity index 97%
rename from goformation/cloudformation/opsworkscm/aws-opsworkscm-server.go
rename to pkg/goformation/cloudformation/opsworkscm/aws-opsworkscm-server.go
index ae1b7e4a1f..09f8ff725b 100644
--- a/goformation/cloudformation/opsworkscm/aws-opsworkscm-server.go
+++ b/pkg/goformation/cloudformation/opsworkscm/aws-opsworkscm-server.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Server AWS CloudFormation Resource (AWS::OpsWorksCM::Server)
diff --git a/goformation/cloudformation/opsworkscm/aws-opsworkscm-server_engineattribute.go b/pkg/goformation/cloudformation/opsworkscm/aws-opsworkscm-server_engineattribute.go
similarity index 92%
rename from goformation/cloudformation/opsworkscm/aws-opsworkscm-server_engineattribute.go
rename to pkg/goformation/cloudformation/opsworkscm/aws-opsworkscm-server_engineattribute.go
index 4f3e11133d..2b6a361fb5 100644
--- a/goformation/cloudformation/opsworkscm/aws-opsworkscm-server_engineattribute.go
+++ b/pkg/goformation/cloudformation/opsworkscm/aws-opsworkscm-server_engineattribute.go
@@ -1,9 +1,9 @@
 package opsworkscm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Server_EngineAttribute AWS CloudFormation Resource (AWS::OpsWorksCM::Server.EngineAttribute)
diff --git a/goformation/cloudformation/panorama/aws-panorama-applicationinstance.go b/pkg/goformation/cloudformation/panorama/aws-panorama-applicationinstance.go
similarity index 96%
rename from goformation/cloudformation/panorama/aws-panorama-applicationinstance.go
rename to pkg/goformation/cloudformation/panorama/aws-panorama-applicationinstance.go
index 35424b7ff7..d28fd5d6d2 100644
--- a/goformation/cloudformation/panorama/aws-panorama-applicationinstance.go
+++ b/pkg/goformation/cloudformation/panorama/aws-panorama-applicationinstance.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationInstance AWS CloudFormation Resource (AWS::Panorama::ApplicationInstance)
diff --git a/goformation/cloudformation/panorama/aws-panorama-applicationinstance_manifestoverridespayload.go b/pkg/goformation/cloudformation/panorama/aws-panorama-applicationinstance_manifestoverridespayload.go
similarity index 92%
rename from goformation/cloudformation/panorama/aws-panorama-applicationinstance_manifestoverridespayload.go
rename to pkg/goformation/cloudformation/panorama/aws-panorama-applicationinstance_manifestoverridespayload.go
index d1de25cf67..46d605309a 100644
--- a/goformation/cloudformation/panorama/aws-panorama-applicationinstance_manifestoverridespayload.go
+++ b/pkg/goformation/cloudformation/panorama/aws-panorama-applicationinstance_manifestoverridespayload.go
@@ -1,9 +1,9 @@
 package panorama
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationInstance_ManifestOverridesPayload AWS CloudFormation Resource (AWS::Panorama::ApplicationInstance.ManifestOverridesPayload)
diff --git a/goformation/cloudformation/panorama/aws-panorama-applicationinstance_manifestpayload.go b/pkg/goformation/cloudformation/panorama/aws-panorama-applicationinstance_manifestpayload.go
similarity index 92%
rename from goformation/cloudformation/panorama/aws-panorama-applicationinstance_manifestpayload.go
rename to pkg/goformation/cloudformation/panorama/aws-panorama-applicationinstance_manifestpayload.go
index 9405550c09..6ecf9208bb 100644
--- a/goformation/cloudformation/panorama/aws-panorama-applicationinstance_manifestpayload.go
+++ b/pkg/goformation/cloudformation/panorama/aws-panorama-applicationinstance_manifestpayload.go
@@ -1,9 +1,9 @@
 package panorama
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationInstance_ManifestPayload AWS CloudFormation Resource (AWS::Panorama::ApplicationInstance.ManifestPayload)
diff --git a/goformation/cloudformation/panorama/aws-panorama-package.go b/pkg/goformation/cloudformation/panorama/aws-panorama-package.go
similarity index 94%
rename from goformation/cloudformation/panorama/aws-panorama-package.go
rename to pkg/goformation/cloudformation/panorama/aws-panorama-package.go
index 7bd95690bd..a9b2c1dbb3 100644
--- a/goformation/cloudformation/panorama/aws-panorama-package.go
+++ b/pkg/goformation/cloudformation/panorama/aws-panorama-package.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Package AWS CloudFormation Resource (AWS::Panorama::Package)
diff --git a/goformation/cloudformation/panorama/aws-panorama-packageversion.go b/pkg/goformation/cloudformation/panorama/aws-panorama-packageversion.go
similarity index 97%
rename from goformation/cloudformation/panorama/aws-panorama-packageversion.go
rename to pkg/goformation/cloudformation/panorama/aws-panorama-packageversion.go
index 29edae80fe..355092054e 100644
--- a/goformation/cloudformation/panorama/aws-panorama-packageversion.go
+++ b/pkg/goformation/cloudformation/panorama/aws-panorama-packageversion.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PackageVersion AWS CloudFormation Resource (AWS::Panorama::PackageVersion)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-admchannel.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-admchannel.go
similarity index 97%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-admchannel.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-admchannel.go
index 1842b5582f..e7fd7d15fc 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-admchannel.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-admchannel.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ADMChannel AWS CloudFormation Resource (AWS::Pinpoint::ADMChannel)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-apnschannel.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-apnschannel.go
similarity index 97%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-apnschannel.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-apnschannel.go
index 916fc4c826..bacf43dbf7 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-apnschannel.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-apnschannel.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // APNSChannel AWS CloudFormation Resource (AWS::Pinpoint::APNSChannel)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-apnssandboxchannel.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-apnssandboxchannel.go
similarity index 97%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-apnssandboxchannel.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-apnssandboxchannel.go
index 092d8d8568..c80f6e53ab 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-apnssandboxchannel.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-apnssandboxchannel.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // APNSSandboxChannel AWS CloudFormation Resource (AWS::Pinpoint::APNSSandboxChannel)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-apnsvoipchannel.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-apnsvoipchannel.go
similarity index 97%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-apnsvoipchannel.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-apnsvoipchannel.go
index 23dc9ced8f..37153aaa58 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-apnsvoipchannel.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-apnsvoipchannel.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // APNSVoipChannel AWS CloudFormation Resource (AWS::Pinpoint::APNSVoipChannel)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-apnsvoipsandboxchannel.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-apnsvoipsandboxchannel.go
similarity index 97%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-apnsvoipsandboxchannel.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-apnsvoipsandboxchannel.go
index e43ad132a7..1a5694ea29 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-apnsvoipsandboxchannel.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-apnsvoipsandboxchannel.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // APNSVoipSandboxChannel AWS CloudFormation Resource (AWS::Pinpoint::APNSVoipSandboxChannel)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-app.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-app.go
similarity index 96%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-app.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-app.go
index 6b421e2a32..c3d87c00f4 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-app.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-app.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // App AWS CloudFormation Resource (AWS::Pinpoint::App)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings.go
similarity index 97%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings.go
index 6877eb1db9..d82c8c6131 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationSettings AWS CloudFormation Resource (AWS::Pinpoint::ApplicationSettings)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings_campaignhook.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings_campaignhook.go
similarity index 94%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings_campaignhook.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings_campaignhook.go
index 898fa1aa5b..94f6c23d5c 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings_campaignhook.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings_campaignhook.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationSettings_CampaignHook AWS CloudFormation Resource (AWS::Pinpoint::ApplicationSettings.CampaignHook)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings_limits.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings_limits.go
similarity index 94%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings_limits.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings_limits.go
index 0f1e432f63..daac90c9bd 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings_limits.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings_limits.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationSettings_Limits AWS CloudFormation Resource (AWS::Pinpoint::ApplicationSettings.Limits)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings_quiettime.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings_quiettime.go
similarity index 92%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings_quiettime.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings_quiettime.go
index 6846ad2a07..03bb87b548 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings_quiettime.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings_quiettime.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ApplicationSettings_QuietTime AWS CloudFormation Resource (AWS::Pinpoint::ApplicationSettings.QuietTime)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-baiduchannel.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-baiduchannel.go
similarity index 97%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-baiduchannel.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-baiduchannel.go
index 5991442547..a7e474c8a4 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-baiduchannel.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-baiduchannel.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // BaiduChannel AWS CloudFormation Resource (AWS::Pinpoint::BaiduChannel)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign.go
similarity index 98%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-campaign.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign.go
index c7d606817a..0882634b2a 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Campaign AWS CloudFormation Resource (AWS::Pinpoint::Campaign)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_attributedimension.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_attributedimension.go
similarity index 93%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-campaign_attributedimension.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_attributedimension.go
index 1e7a37eefa..712d0475cc 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_attributedimension.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_attributedimension.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Campaign_AttributeDimension AWS CloudFormation Resource (AWS::Pinpoint::Campaign.AttributeDimension)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaignemailmessage.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaignemailmessage.go
similarity index 94%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaignemailmessage.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaignemailmessage.go
index 8e9113986c..8957e14fda 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaignemailmessage.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaignemailmessage.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Campaign_CampaignEmailMessage AWS CloudFormation Resource (AWS::Pinpoint::Campaign.CampaignEmailMessage)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaigneventfilter.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaigneventfilter.go
similarity index 93%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaigneventfilter.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaigneventfilter.go
index 5d77f069b1..b204858961 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaigneventfilter.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaigneventfilter.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Campaign_CampaignEventFilter AWS CloudFormation Resource (AWS::Pinpoint::Campaign.CampaignEventFilter)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaignhook.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaignhook.go
similarity index 93%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaignhook.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaignhook.go
index e40cc26cbe..d908ab9e8f 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaignhook.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaignhook.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Campaign_CampaignHook AWS CloudFormation Resource (AWS::Pinpoint::Campaign.CampaignHook)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaigninappmessage.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaigninappmessage.go
similarity index 93%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaigninappmessage.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaigninappmessage.go
index 3c80dabc6a..dfd01e4a42 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaigninappmessage.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaigninappmessage.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Campaign_CampaignInAppMessage AWS CloudFormation Resource (AWS::Pinpoint::Campaign.CampaignInAppMessage)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaignsmsmessage.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaignsmsmessage.go
similarity index 95%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaignsmsmessage.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaignsmsmessage.go
index b014bb71e3..d6df7a43da 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaignsmsmessage.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaignsmsmessage.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Campaign_CampaignSmsMessage AWS CloudFormation Resource (AWS::Pinpoint::Campaign.CampaignSmsMessage)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_defaultbuttonconfiguration.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_defaultbuttonconfiguration.go
similarity index 95%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-campaign_defaultbuttonconfiguration.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_defaultbuttonconfiguration.go
index e94c18d2f3..8c130aa5cc 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_defaultbuttonconfiguration.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_defaultbuttonconfiguration.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Campaign_DefaultButtonConfiguration AWS CloudFormation Resource (AWS::Pinpoint::Campaign.DefaultButtonConfiguration)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_eventdimensions.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_eventdimensions.go
similarity index 96%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-campaign_eventdimensions.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_eventdimensions.go
index b3ce626911..61c1a28daa 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_eventdimensions.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_eventdimensions.go
@@ -1,7 +1,7 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Campaign_EventDimensions AWS CloudFormation Resource (AWS::Pinpoint::Campaign.EventDimensions)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagebodyconfig.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagebodyconfig.go
similarity index 93%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagebodyconfig.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagebodyconfig.go
index e3f30ab02e..23f7e33234 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagebodyconfig.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagebodyconfig.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Campaign_InAppMessageBodyConfig AWS CloudFormation Resource (AWS::Pinpoint::Campaign.InAppMessageBodyConfig)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagebutton.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagebutton.go
similarity index 97%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagebutton.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagebutton.go
index eb0c29ac6f..bbcb1a5d18 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagebutton.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagebutton.go
@@ -1,7 +1,7 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Campaign_InAppMessageButton AWS CloudFormation Resource (AWS::Pinpoint::Campaign.InAppMessageButton)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagecontent.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagecontent.go
similarity index 95%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagecontent.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagecontent.go
index 05efb8a09b..8396457220 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagecontent.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagecontent.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Campaign_InAppMessageContent AWS CloudFormation Resource (AWS::Pinpoint::Campaign.InAppMessageContent)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessageheaderconfig.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessageheaderconfig.go
similarity index 94%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessageheaderconfig.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessageheaderconfig.go
index 0c834cbceb..5d2fb55398 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessageheaderconfig.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessageheaderconfig.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Campaign_InAppMessageHeaderConfig AWS CloudFormation Resource (AWS::Pinpoint::Campaign.InAppMessageHeaderConfig)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_limits.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_limits.go
similarity index 94%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-campaign_limits.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_limits.go
index 21f025cf52..5f84a11c69 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_limits.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_limits.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Campaign_Limits AWS CloudFormation Resource (AWS::Pinpoint::Campaign.Limits)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_message.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_message.go
similarity index 96%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-campaign_message.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_message.go
index 3bf260b3a6..aeac4ea37d 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_message.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_message.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Campaign_Message AWS CloudFormation Resource (AWS::Pinpoint::Campaign.Message)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_messageconfiguration.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_messageconfiguration.go
similarity index 98%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-campaign_messageconfiguration.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_messageconfiguration.go
index 45628ad76b..cb96eb4df4 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_messageconfiguration.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_messageconfiguration.go
@@ -1,7 +1,7 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Campaign_MessageConfiguration AWS CloudFormation Resource (AWS::Pinpoint::Campaign.MessageConfiguration)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_metricdimension.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_metricdimension.go
similarity index 92%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-campaign_metricdimension.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_metricdimension.go
index ab98fa3f63..d9f5f3c23c 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_metricdimension.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_metricdimension.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Campaign_MetricDimension AWS CloudFormation Resource (AWS::Pinpoint::Campaign.MetricDimension)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_overridebuttonconfiguration.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_overridebuttonconfiguration.go
similarity index 93%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-campaign_overridebuttonconfiguration.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_overridebuttonconfiguration.go
index 4aa0288d75..4c4b780153 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_overridebuttonconfiguration.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_overridebuttonconfiguration.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Campaign_OverrideButtonConfiguration AWS CloudFormation Resource (AWS::Pinpoint::Campaign.OverrideButtonConfiguration)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_quiettime.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_quiettime.go
similarity index 92%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-campaign_quiettime.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_quiettime.go
index 0ab3b96275..d2e73b9734 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_quiettime.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_quiettime.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Campaign_QuietTime AWS CloudFormation Resource (AWS::Pinpoint::Campaign.QuietTime)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_schedule.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_schedule.go
similarity index 95%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-campaign_schedule.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_schedule.go
index 666d48e969..51ac2e32d2 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_schedule.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_schedule.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Campaign_Schedule AWS CloudFormation Resource (AWS::Pinpoint::Campaign.Schedule)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_setdimension.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_setdimension.go
similarity index 92%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-campaign_setdimension.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_setdimension.go
index ea081ac665..88423c6255 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_setdimension.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_setdimension.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Campaign_SetDimension AWS CloudFormation Resource (AWS::Pinpoint::Campaign.SetDimension)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_writetreatmentresource.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_writetreatmentresource.go
similarity index 95%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-campaign_writetreatmentresource.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_writetreatmentresource.go
index 3ba6d2e744..13c064a060 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_writetreatmentresource.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_writetreatmentresource.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Campaign_WriteTreatmentResource AWS CloudFormation Resource (AWS::Pinpoint::Campaign.WriteTreatmentResource)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-emailchannel.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-emailchannel.go
similarity index 97%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-emailchannel.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-emailchannel.go
index 011b42fd14..de2e47f7b2 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-emailchannel.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-emailchannel.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EmailChannel AWS CloudFormation Resource (AWS::Pinpoint::EmailChannel)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-emailtemplate.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-emailtemplate.go
similarity index 97%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-emailtemplate.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-emailtemplate.go
index 1360ce5362..615670431b 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-emailtemplate.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-emailtemplate.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EmailTemplate AWS CloudFormation Resource (AWS::Pinpoint::EmailTemplate)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-eventstream.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-eventstream.go
similarity index 96%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-eventstream.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-eventstream.go
index 4f7df0b5d4..22e2f90b9b 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-eventstream.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-eventstream.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EventStream AWS CloudFormation Resource (AWS::Pinpoint::EventStream)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-gcmchannel.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-gcmchannel.go
similarity index 96%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-gcmchannel.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-gcmchannel.go
index eafe43c992..37ec0e3c67 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-gcmchannel.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-gcmchannel.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GCMChannel AWS CloudFormation Resource (AWS::Pinpoint::GCMChannel)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate.go
similarity index 97%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate.go
index 420f1e5a4f..ab121d3e65 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InAppTemplate AWS CloudFormation Resource (AWS::Pinpoint::InAppTemplate)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_bodyconfig.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_bodyconfig.go
similarity index 93%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_bodyconfig.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_bodyconfig.go
index 9d2cc69a17..e1b432d50e 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_bodyconfig.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_bodyconfig.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InAppTemplate_BodyConfig AWS CloudFormation Resource (AWS::Pinpoint::InAppTemplate.BodyConfig)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_buttonconfig.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_buttonconfig.go
similarity index 97%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_buttonconfig.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_buttonconfig.go
index 8ca8e7de69..d733eac51b 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_buttonconfig.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_buttonconfig.go
@@ -1,7 +1,7 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InAppTemplate_ButtonConfig AWS CloudFormation Resource (AWS::Pinpoint::InAppTemplate.ButtonConfig)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_defaultbuttonconfiguration.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_defaultbuttonconfiguration.go
similarity index 95%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_defaultbuttonconfiguration.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_defaultbuttonconfiguration.go
index 55f1768c5b..0957578a3b 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_defaultbuttonconfiguration.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_defaultbuttonconfiguration.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InAppTemplate_DefaultButtonConfiguration AWS CloudFormation Resource (AWS::Pinpoint::InAppTemplate.DefaultButtonConfiguration)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_headerconfig.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_headerconfig.go
similarity index 93%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_headerconfig.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_headerconfig.go
index d9e591cad5..5696e494b4 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_headerconfig.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_headerconfig.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InAppTemplate_HeaderConfig AWS CloudFormation Resource (AWS::Pinpoint::InAppTemplate.HeaderConfig)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_inappmessagecontent.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_inappmessagecontent.go
similarity index 95%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_inappmessagecontent.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_inappmessagecontent.go
index 895a2984a3..31524a9010 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_inappmessagecontent.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_inappmessagecontent.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InAppTemplate_InAppMessageContent AWS CloudFormation Resource (AWS::Pinpoint::InAppTemplate.InAppMessageContent)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_overridebuttonconfiguration.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_overridebuttonconfiguration.go
similarity index 93%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_overridebuttonconfiguration.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_overridebuttonconfiguration.go
index 83aec7dab4..ac13df35ec 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_overridebuttonconfiguration.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_overridebuttonconfiguration.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InAppTemplate_OverrideButtonConfiguration AWS CloudFormation Resource (AWS::Pinpoint::InAppTemplate.OverrideButtonConfiguration)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate.go
similarity index 97%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate.go
index ad9d3072a0..e1dc77a7bd 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PushTemplate AWS CloudFormation Resource (AWS::Pinpoint::PushTemplate)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate_androidpushnotificationtemplate.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate_androidpushnotificationtemplate.go
similarity index 96%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate_androidpushnotificationtemplate.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate_androidpushnotificationtemplate.go
index f93c45e05f..7ec5f81132 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate_androidpushnotificationtemplate.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate_androidpushnotificationtemplate.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PushTemplate_AndroidPushNotificationTemplate AWS CloudFormation Resource (AWS::Pinpoint::PushTemplate.AndroidPushNotificationTemplate)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate_apnspushnotificationtemplate.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate_apnspushnotificationtemplate.go
similarity index 95%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate_apnspushnotificationtemplate.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate_apnspushnotificationtemplate.go
index 0924e4ed59..55fe2ee079 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate_apnspushnotificationtemplate.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate_apnspushnotificationtemplate.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PushTemplate_APNSPushNotificationTemplate AWS CloudFormation Resource (AWS::Pinpoint::PushTemplate.APNSPushNotificationTemplate)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate_defaultpushnotificationtemplate.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate_defaultpushnotificationtemplate.go
similarity index 95%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate_defaultpushnotificationtemplate.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate_defaultpushnotificationtemplate.go
index 31beb2fe29..34544c0319 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate_defaultpushnotificationtemplate.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate_defaultpushnotificationtemplate.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PushTemplate_DefaultPushNotificationTemplate AWS CloudFormation Resource (AWS::Pinpoint::PushTemplate.DefaultPushNotificationTemplate)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-segment.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment.go
similarity index 97%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-segment.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment.go
index e07c3f42c3..55ac5ca96a 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-segment.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Segment AWS CloudFormation Resource (AWS::Pinpoint::Segment)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_attributedimension.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_attributedimension.go
similarity index 93%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-segment_attributedimension.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_attributedimension.go
index def30e8c04..6d7643912a 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_attributedimension.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_attributedimension.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Segment_AttributeDimension AWS CloudFormation Resource (AWS::Pinpoint::Segment.AttributeDimension)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_behavior.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_behavior.go
similarity index 95%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-segment_behavior.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_behavior.go
index bfcd0fe02a..a67ec4d400 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_behavior.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_behavior.go
@@ -1,7 +1,7 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Segment_Behavior AWS CloudFormation Resource (AWS::Pinpoint::Segment.Behavior)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_coordinates.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_coordinates.go
similarity index 93%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-segment_coordinates.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_coordinates.go
index b2f2df4dd3..1345340d9f 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_coordinates.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_coordinates.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Segment_Coordinates AWS CloudFormation Resource (AWS::Pinpoint::Segment.Coordinates)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_demographic.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_demographic.go
similarity index 97%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-segment_demographic.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_demographic.go
index d8f0928fa0..a280ae9141 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_demographic.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_demographic.go
@@ -1,7 +1,7 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Segment_Demographic AWS CloudFormation Resource (AWS::Pinpoint::Segment.Demographic)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_gpspoint.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_gpspoint.go
similarity index 93%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-segment_gpspoint.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_gpspoint.go
index d014419a38..a040f015be 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_gpspoint.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_gpspoint.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Segment_GPSPoint AWS CloudFormation Resource (AWS::Pinpoint::Segment.GPSPoint)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_groups.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_groups.go
similarity index 94%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-segment_groups.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_groups.go
index 71aed429e1..7bb3a4c41a 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_groups.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_groups.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Segment_Groups AWS CloudFormation Resource (AWS::Pinpoint::Segment.Groups)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_location.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_location.go
similarity index 96%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-segment_location.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_location.go
index 3632e1a2d2..a00abde617 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_location.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_location.go
@@ -1,7 +1,7 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Segment_Location AWS CloudFormation Resource (AWS::Pinpoint::Segment.Location)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_recency.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_recency.go
similarity index 93%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-segment_recency.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_recency.go
index 6044d96c5d..132d5df1e0 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_recency.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_recency.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Segment_Recency AWS CloudFormation Resource (AWS::Pinpoint::Segment.Recency)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_segmentdimensions.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_segmentdimensions.go
similarity index 97%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-segment_segmentdimensions.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_segmentdimensions.go
index 1a8bee8c3e..246d5d3cf1 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_segmentdimensions.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_segmentdimensions.go
@@ -1,7 +1,7 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Segment_SegmentDimensions AWS CloudFormation Resource (AWS::Pinpoint::Segment.SegmentDimensions)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_segmentgroups.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_segmentgroups.go
similarity index 92%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-segment_segmentgroups.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_segmentgroups.go
index 170ee2d4d1..50c6ecf8f6 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_segmentgroups.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_segmentgroups.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Segment_SegmentGroups AWS CloudFormation Resource (AWS::Pinpoint::Segment.SegmentGroups)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_setdimension.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_setdimension.go
similarity index 92%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-segment_setdimension.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_setdimension.go
index 05af33eb01..bbae7d1fb1 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_setdimension.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_setdimension.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Segment_SetDimension AWS CloudFormation Resource (AWS::Pinpoint::Segment.SetDimension)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_sourcesegments.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_sourcesegments.go
similarity index 93%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-segment_sourcesegments.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_sourcesegments.go
index 42abf2b501..0af03f52af 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_sourcesegments.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-segment_sourcesegments.go
@@ -1,9 +1,9 @@
 package pinpoint
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Segment_SourceSegments AWS CloudFormation Resource (AWS::Pinpoint::Segment.SourceSegments)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-smschannel.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-smschannel.go
similarity index 97%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-smschannel.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-smschannel.go
index 73b1e9b7be..080a362b4c 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-smschannel.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-smschannel.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SMSChannel AWS CloudFormation Resource (AWS::Pinpoint::SMSChannel)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-smstemplate.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-smstemplate.go
similarity index 97%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-smstemplate.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-smstemplate.go
index 888112c78e..423dcd30c3 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-smstemplate.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-smstemplate.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SmsTemplate AWS CloudFormation Resource (AWS::Pinpoint::SmsTemplate)
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-voicechannel.go b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-voicechannel.go
similarity index 96%
rename from goformation/cloudformation/pinpoint/aws-pinpoint-voicechannel.go
rename to pkg/goformation/cloudformation/pinpoint/aws-pinpoint-voicechannel.go
index 567ab7d4cd..1afc2b1caf 100644
--- a/goformation/cloudformation/pinpoint/aws-pinpoint-voicechannel.go
+++ b/pkg/goformation/cloudformation/pinpoint/aws-pinpoint-voicechannel.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // VoiceChannel AWS CloudFormation Resource (AWS::Pinpoint::VoiceChannel)
diff --git a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset.go b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset.go
similarity index 97%
rename from goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset.go
rename to pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset.go
index 832bc5999d..8339ad81f0 100644
--- a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset.go
+++ b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigurationSet AWS CloudFormation Resource (AWS::PinpointEmail::ConfigurationSet)
diff --git a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_deliveryoptions.go b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_deliveryoptions.go
similarity index 92%
rename from goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_deliveryoptions.go
rename to pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_deliveryoptions.go
index 4c92c38dff..16301e8f93 100644
--- a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_deliveryoptions.go
+++ b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_deliveryoptions.go
@@ -1,9 +1,9 @@
 package pinpointemail
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigurationSet_DeliveryOptions AWS CloudFormation Resource (AWS::PinpointEmail::ConfigurationSet.DeliveryOptions)
diff --git a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_reputationoptions.go b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_reputationoptions.go
similarity index 92%
rename from goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_reputationoptions.go
rename to pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_reputationoptions.go
index adf1f6f23a..a1f94bbf6d 100644
--- a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_reputationoptions.go
+++ b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_reputationoptions.go
@@ -1,9 +1,9 @@
 package pinpointemail
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigurationSet_ReputationOptions AWS CloudFormation Resource (AWS::PinpointEmail::ConfigurationSet.ReputationOptions)
diff --git a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_sendingoptions.go b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_sendingoptions.go
similarity index 92%
rename from goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_sendingoptions.go
rename to pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_sendingoptions.go
index 5c1e2bd594..0149fc7459 100644
--- a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_sendingoptions.go
+++ b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_sendingoptions.go
@@ -1,9 +1,9 @@
 package pinpointemail
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigurationSet_SendingOptions AWS CloudFormation Resource (AWS::PinpointEmail::ConfigurationSet.SendingOptions)
diff --git a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_tags.go b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_tags.go
similarity index 92%
rename from goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_tags.go
rename to pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_tags.go
index 956b7fe061..a19a2add5d 100644
--- a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_tags.go
+++ b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_tags.go
@@ -1,9 +1,9 @@
 package pinpointemail
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigurationSet_Tags AWS CloudFormation Resource (AWS::PinpointEmail::ConfigurationSet.Tags)
diff --git a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_trackingoptions.go b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_trackingoptions.go
similarity index 92%
rename from goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_trackingoptions.go
rename to pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_trackingoptions.go
index 80c34eed7c..54debf7ce4 100644
--- a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_trackingoptions.go
+++ b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_trackingoptions.go
@@ -1,9 +1,9 @@
 package pinpointemail
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigurationSet_TrackingOptions AWS CloudFormation Resource (AWS::PinpointEmail::ConfigurationSet.TrackingOptions)
diff --git a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination.go b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination.go
similarity index 97%
rename from goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination.go
rename to pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination.go
index 79006f11e5..7dc4a32812 100644
--- a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination.go
+++ b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigurationSetEventDestination AWS CloudFormation Resource (AWS::PinpointEmail::ConfigurationSetEventDestination)
diff --git a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_cloudwatchdestination.go b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_cloudwatchdestination.go
similarity index 96%
rename from goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_cloudwatchdestination.go
rename to pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_cloudwatchdestination.go
index 522b7c3322..d1b01244f5 100644
--- a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_cloudwatchdestination.go
+++ b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_cloudwatchdestination.go
@@ -1,7 +1,7 @@
 package pinpointemail
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigurationSetEventDestination_CloudWatchDestination AWS CloudFormation Resource (AWS::PinpointEmail::ConfigurationSetEventDestination.CloudWatchDestination)
diff --git a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_dimensionconfiguration.go b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_dimensionconfiguration.go
similarity index 94%
rename from goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_dimensionconfiguration.go
rename to pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_dimensionconfiguration.go
index 3ee824f78d..50b87743a6 100644
--- a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_dimensionconfiguration.go
+++ b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_dimensionconfiguration.go
@@ -1,9 +1,9 @@
 package pinpointemail
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigurationSetEventDestination_DimensionConfiguration AWS CloudFormation Resource (AWS::PinpointEmail::ConfigurationSetEventDestination.DimensionConfiguration)
diff --git a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_eventdestination.go b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_eventdestination.go
similarity index 96%
rename from goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_eventdestination.go
rename to pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_eventdestination.go
index 88682cf3e3..8c9f0b49a2 100644
--- a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_eventdestination.go
+++ b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_eventdestination.go
@@ -1,9 +1,9 @@
 package pinpointemail
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigurationSetEventDestination_EventDestination AWS CloudFormation Resource (AWS::PinpointEmail::ConfigurationSetEventDestination.EventDestination)
diff --git a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_kinesisfirehosedestination.go b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_kinesisfirehosedestination.go
similarity index 94%
rename from goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_kinesisfirehosedestination.go
rename to pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_kinesisfirehosedestination.go
index bef3261675..eb90aa71b0 100644
--- a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_kinesisfirehosedestination.go
+++ b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_kinesisfirehosedestination.go
@@ -1,9 +1,9 @@
 package pinpointemail
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigurationSetEventDestination_KinesisFirehoseDestination AWS CloudFormation Resource (AWS::PinpointEmail::ConfigurationSetEventDestination.KinesisFirehoseDestination)
diff --git a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_pinpointdestination.go b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_pinpointdestination.go
similarity index 92%
rename from goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_pinpointdestination.go
rename to pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_pinpointdestination.go
index 865bb20a3b..7bb199b802 100644
--- a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_pinpointdestination.go
+++ b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_pinpointdestination.go
@@ -1,9 +1,9 @@
 package pinpointemail
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigurationSetEventDestination_PinpointDestination AWS CloudFormation Resource (AWS::PinpointEmail::ConfigurationSetEventDestination.PinpointDestination)
diff --git a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_snsdestination.go b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_snsdestination.go
similarity index 92%
rename from goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_snsdestination.go
rename to pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_snsdestination.go
index 6e49d3e9e5..61c4c34090 100644
--- a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_snsdestination.go
+++ b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_snsdestination.go
@@ -1,9 +1,9 @@
 package pinpointemail
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigurationSetEventDestination_SnsDestination AWS CloudFormation Resource (AWS::PinpointEmail::ConfigurationSetEventDestination.SnsDestination)
diff --git a/goformation/cloudformation/pinpointemail/aws-pinpointemail-dedicatedippool.go b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-dedicatedippool.go
similarity index 96%
rename from goformation/cloudformation/pinpointemail/aws-pinpointemail-dedicatedippool.go
rename to pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-dedicatedippool.go
index 7e9f065844..df2f0b67aa 100644
--- a/goformation/cloudformation/pinpointemail/aws-pinpointemail-dedicatedippool.go
+++ b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-dedicatedippool.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DedicatedIpPool AWS CloudFormation Resource (AWS::PinpointEmail::DedicatedIpPool)
diff --git a/goformation/cloudformation/pinpointemail/aws-pinpointemail-dedicatedippool_tags.go b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-dedicatedippool_tags.go
similarity index 92%
rename from goformation/cloudformation/pinpointemail/aws-pinpointemail-dedicatedippool_tags.go
rename to pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-dedicatedippool_tags.go
index f3dd8c7035..f69142420c 100644
--- a/goformation/cloudformation/pinpointemail/aws-pinpointemail-dedicatedippool_tags.go
+++ b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-dedicatedippool_tags.go
@@ -1,9 +1,9 @@
 package pinpointemail
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DedicatedIpPool_Tags AWS CloudFormation Resource (AWS::PinpointEmail::DedicatedIpPool.Tags)
diff --git a/goformation/cloudformation/pinpointemail/aws-pinpointemail-identity.go b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-identity.go
similarity index 97%
rename from goformation/cloudformation/pinpointemail/aws-pinpointemail-identity.go
rename to pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-identity.go
index e757d55395..972d5c9157 100644
--- a/goformation/cloudformation/pinpointemail/aws-pinpointemail-identity.go
+++ b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-identity.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Identity AWS CloudFormation Resource (AWS::PinpointEmail::Identity)
diff --git a/goformation/cloudformation/pinpointemail/aws-pinpointemail-identity_mailfromattributes.go b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-identity_mailfromattributes.go
similarity index 93%
rename from goformation/cloudformation/pinpointemail/aws-pinpointemail-identity_mailfromattributes.go
rename to pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-identity_mailfromattributes.go
index 166796e306..368bddf751 100644
--- a/goformation/cloudformation/pinpointemail/aws-pinpointemail-identity_mailfromattributes.go
+++ b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-identity_mailfromattributes.go
@@ -1,9 +1,9 @@
 package pinpointemail
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Identity_MailFromAttributes AWS CloudFormation Resource (AWS::PinpointEmail::Identity.MailFromAttributes)
diff --git a/goformation/cloudformation/pinpointemail/aws-pinpointemail-identity_tags.go b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-identity_tags.go
similarity index 92%
rename from goformation/cloudformation/pinpointemail/aws-pinpointemail-identity_tags.go
rename to pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-identity_tags.go
index 36d042d370..99bda859b5 100644
--- a/goformation/cloudformation/pinpointemail/aws-pinpointemail-identity_tags.go
+++ b/pkg/goformation/cloudformation/pinpointemail/aws-pinpointemail-identity_tags.go
@@ -1,9 +1,9 @@
 package pinpointemail
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Identity_Tags AWS CloudFormation Resource (AWS::PinpointEmail::Identity.Tags)
diff --git a/goformation/cloudformation/policies/policies.go b/pkg/goformation/cloudformation/policies/policies.go
similarity index 99%
rename from goformation/cloudformation/policies/policies.go
rename to pkg/goformation/cloudformation/policies/policies.go
index 5e5823be9d..e5c792212c 100644
--- a/goformation/cloudformation/policies/policies.go
+++ b/pkg/goformation/cloudformation/policies/policies.go
@@ -1,6 +1,6 @@
 package policies
 
-import "github.com/awslabs/goformation/v4/cloudformation/types"
+import "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 // CreationPolicy prevents a resource status from reaching create complete until AWS CloudFormation receives a specified number of success signals or the timeout period is exceeded. To signal a resource, you can use the cfn-signal helper script or SignalResource API. AWS CloudFormation publishes valid signals to the stack events so that you track the number of signals sent.
 type CreationPolicy struct {
diff --git a/goformation/cloudformation/policies_test.go b/pkg/goformation/cloudformation/policies_test.go
similarity index 95%
rename from goformation/cloudformation/policies_test.go
rename to pkg/goformation/cloudformation/policies_test.go
index 91e620b070..83598d4e61 100644
--- a/goformation/cloudformation/policies_test.go
+++ b/pkg/goformation/cloudformation/policies_test.go
@@ -1,13 +1,13 @@
 package cloudformation_test
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	"github.com/sanathkr/yaml"
 
-	"github.com/awslabs/goformation/v4/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/autoscaling"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/autoscaling"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/goformation/cloudformation/qldb/aws-qldb-ledger.go b/pkg/goformation/cloudformation/qldb/aws-qldb-ledger.go
similarity index 95%
rename from goformation/cloudformation/qldb/aws-qldb-ledger.go
rename to pkg/goformation/cloudformation/qldb/aws-qldb-ledger.go
index eb0a918c7b..d900446174 100644
--- a/goformation/cloudformation/qldb/aws-qldb-ledger.go
+++ b/pkg/goformation/cloudformation/qldb/aws-qldb-ledger.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Ledger AWS CloudFormation Resource (AWS::QLDB::Ledger)
diff --git a/goformation/cloudformation/qldb/aws-qldb-stream.go b/pkg/goformation/cloudformation/qldb/aws-qldb-stream.go
similarity index 96%
rename from goformation/cloudformation/qldb/aws-qldb-stream.go
rename to pkg/goformation/cloudformation/qldb/aws-qldb-stream.go
index eeb3116c68..8b9024f8a7 100644
--- a/goformation/cloudformation/qldb/aws-qldb-stream.go
+++ b/pkg/goformation/cloudformation/qldb/aws-qldb-stream.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Stream AWS CloudFormation Resource (AWS::QLDB::Stream)
diff --git a/goformation/cloudformation/qldb/aws-qldb-stream_kinesisconfiguration.go b/pkg/goformation/cloudformation/qldb/aws-qldb-stream_kinesisconfiguration.go
similarity index 93%
rename from goformation/cloudformation/qldb/aws-qldb-stream_kinesisconfiguration.go
rename to pkg/goformation/cloudformation/qldb/aws-qldb-stream_kinesisconfiguration.go
index 14af187fc9..82b0285f64 100644
--- a/goformation/cloudformation/qldb/aws-qldb-stream_kinesisconfiguration.go
+++ b/pkg/goformation/cloudformation/qldb/aws-qldb-stream_kinesisconfiguration.go
@@ -1,9 +1,9 @@
 package qldb
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Stream_KinesisConfiguration AWS CloudFormation Resource (AWS::QLDB::Stream.KinesisConfiguration)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-analysis.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis.go
similarity index 96%
rename from goformation/cloudformation/quicksight/aws-quicksight-analysis.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis.go
index 0b4ade34d7..a4cb5cac5e 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-analysis.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Analysis AWS CloudFormation Resource (AWS::QuickSight::Analysis)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-analysis_analysiserror.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_analysiserror.go
similarity index 92%
rename from goformation/cloudformation/quicksight/aws-quicksight-analysis_analysiserror.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_analysiserror.go
index 3d03adb777..39fe73f7fd 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-analysis_analysiserror.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_analysiserror.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Analysis_AnalysisError AWS CloudFormation Resource (AWS::QuickSight::Analysis.AnalysisError)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-analysis_analysissourceentity.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_analysissourceentity.go
similarity index 95%
rename from goformation/cloudformation/quicksight/aws-quicksight-analysis_analysissourceentity.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_analysissourceentity.go
index e5d2298f4f..163a312756 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-analysis_analysissourceentity.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_analysissourceentity.go
@@ -1,7 +1,7 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Analysis_AnalysisSourceEntity AWS CloudFormation Resource (AWS::QuickSight::Analysis.AnalysisSourceEntity)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-analysis_analysissourcetemplate.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_analysissourcetemplate.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-analysis_analysissourcetemplate.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_analysissourcetemplate.go
index faf14c0c53..c91b67c3bf 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-analysis_analysissourcetemplate.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_analysissourcetemplate.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Analysis_AnalysisSourceTemplate AWS CloudFormation Resource (AWS::QuickSight::Analysis.AnalysisSourceTemplate)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-analysis_datasetreference.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_datasetreference.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-analysis_datasetreference.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_datasetreference.go
index 14f0a684ad..ce02b39b53 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-analysis_datasetreference.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_datasetreference.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Analysis_DataSetReference AWS CloudFormation Resource (AWS::QuickSight::Analysis.DataSetReference)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-analysis_datetimeparameter.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_datetimeparameter.go
similarity index 92%
rename from goformation/cloudformation/quicksight/aws-quicksight-analysis_datetimeparameter.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_datetimeparameter.go
index d9e88d9c73..944dde5bef 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-analysis_datetimeparameter.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_datetimeparameter.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Analysis_DateTimeParameter AWS CloudFormation Resource (AWS::QuickSight::Analysis.DateTimeParameter)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-analysis_decimalparameter.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_decimalparameter.go
similarity index 92%
rename from goformation/cloudformation/quicksight/aws-quicksight-analysis_decimalparameter.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_decimalparameter.go
index d05e909c0f..77153f2c2f 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-analysis_decimalparameter.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_decimalparameter.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Analysis_DecimalParameter AWS CloudFormation Resource (AWS::QuickSight::Analysis.DecimalParameter)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-analysis_integerparameter.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_integerparameter.go
similarity index 92%
rename from goformation/cloudformation/quicksight/aws-quicksight-analysis_integerparameter.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_integerparameter.go
index 60c55c27b7..157cbb69a1 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-analysis_integerparameter.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_integerparameter.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Analysis_IntegerParameter AWS CloudFormation Resource (AWS::QuickSight::Analysis.IntegerParameter)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-analysis_parameters.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_parameters.go
similarity index 97%
rename from goformation/cloudformation/quicksight/aws-quicksight-analysis_parameters.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_parameters.go
index 5e8a7e877b..dbb512b7d7 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-analysis_parameters.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_parameters.go
@@ -1,7 +1,7 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Analysis_Parameters AWS CloudFormation Resource (AWS::QuickSight::Analysis.Parameters)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-analysis_resourcepermission.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_resourcepermission.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-analysis_resourcepermission.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_resourcepermission.go
index 66a701a9a6..4b1b693c8e 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-analysis_resourcepermission.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_resourcepermission.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Analysis_ResourcePermission AWS CloudFormation Resource (AWS::QuickSight::Analysis.ResourcePermission)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-analysis_sheet.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_sheet.go
similarity index 92%
rename from goformation/cloudformation/quicksight/aws-quicksight-analysis_sheet.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_sheet.go
index d457c1b50c..3fbba8c113 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-analysis_sheet.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_sheet.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Analysis_Sheet AWS CloudFormation Resource (AWS::QuickSight::Analysis.Sheet)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-analysis_stringparameter.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_stringparameter.go
similarity index 92%
rename from goformation/cloudformation/quicksight/aws-quicksight-analysis_stringparameter.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_stringparameter.go
index b53792e1c0..6e0eba486b 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-analysis_stringparameter.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-analysis_stringparameter.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Analysis_StringParameter AWS CloudFormation Resource (AWS::QuickSight::Analysis.StringParameter)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dashboard.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard.go
similarity index 96%
rename from goformation/cloudformation/quicksight/aws-quicksight-dashboard.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard.go
index a6a6b52ea5..89f2739221 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dashboard.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dashboard AWS CloudFormation Resource (AWS::QuickSight::Dashboard)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_adhocfilteringoption.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_adhocfilteringoption.go
similarity index 92%
rename from goformation/cloudformation/quicksight/aws-quicksight-dashboard_adhocfilteringoption.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_adhocfilteringoption.go
index f4e6a4df90..5ab823b3db 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_adhocfilteringoption.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_adhocfilteringoption.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dashboard_AdHocFilteringOption AWS CloudFormation Resource (AWS::QuickSight::Dashboard.AdHocFilteringOption)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_dashboardpublishoptions.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_dashboardpublishoptions.go
similarity index 97%
rename from goformation/cloudformation/quicksight/aws-quicksight-dashboard_dashboardpublishoptions.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_dashboardpublishoptions.go
index 2582451c9f..fc09531b2c 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_dashboardpublishoptions.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_dashboardpublishoptions.go
@@ -1,7 +1,7 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dashboard_DashboardPublishOptions AWS CloudFormation Resource (AWS::QuickSight::Dashboard.DashboardPublishOptions)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_dashboardsourceentity.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_dashboardsourceentity.go
similarity index 95%
rename from goformation/cloudformation/quicksight/aws-quicksight-dashboard_dashboardsourceentity.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_dashboardsourceentity.go
index 1d4dfec547..2cedc57776 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_dashboardsourceentity.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_dashboardsourceentity.go
@@ -1,7 +1,7 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dashboard_DashboardSourceEntity AWS CloudFormation Resource (AWS::QuickSight::Dashboard.DashboardSourceEntity)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_dashboardsourcetemplate.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_dashboardsourcetemplate.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-dashboard_dashboardsourcetemplate.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_dashboardsourcetemplate.go
index 5045c17da2..4dd75cbd42 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_dashboardsourcetemplate.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_dashboardsourcetemplate.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dashboard_DashboardSourceTemplate AWS CloudFormation Resource (AWS::QuickSight::Dashboard.DashboardSourceTemplate)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_datasetreference.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_datasetreference.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-dashboard_datasetreference.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_datasetreference.go
index 6a0fe6cc83..90576fbd26 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_datasetreference.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_datasetreference.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dashboard_DataSetReference AWS CloudFormation Resource (AWS::QuickSight::Dashboard.DataSetReference)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_datetimeparameter.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_datetimeparameter.go
similarity index 92%
rename from goformation/cloudformation/quicksight/aws-quicksight-dashboard_datetimeparameter.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_datetimeparameter.go
index 98ef8a96ca..4d89439ff6 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_datetimeparameter.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_datetimeparameter.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dashboard_DateTimeParameter AWS CloudFormation Resource (AWS::QuickSight::Dashboard.DateTimeParameter)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_decimalparameter.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_decimalparameter.go
similarity index 92%
rename from goformation/cloudformation/quicksight/aws-quicksight-dashboard_decimalparameter.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_decimalparameter.go
index 96ed5b7180..296d5abe18 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_decimalparameter.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_decimalparameter.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dashboard_DecimalParameter AWS CloudFormation Resource (AWS::QuickSight::Dashboard.DecimalParameter)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_exporttocsvoption.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_exporttocsvoption.go
similarity index 92%
rename from goformation/cloudformation/quicksight/aws-quicksight-dashboard_exporttocsvoption.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_exporttocsvoption.go
index 5756bcb445..529160fae4 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_exporttocsvoption.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_exporttocsvoption.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dashboard_ExportToCSVOption AWS CloudFormation Resource (AWS::QuickSight::Dashboard.ExportToCSVOption)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_integerparameter.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_integerparameter.go
similarity index 92%
rename from goformation/cloudformation/quicksight/aws-quicksight-dashboard_integerparameter.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_integerparameter.go
index 4f28531bc6..24b74e4fb4 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_integerparameter.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_integerparameter.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dashboard_IntegerParameter AWS CloudFormation Resource (AWS::QuickSight::Dashboard.IntegerParameter)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_parameters.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_parameters.go
similarity index 97%
rename from goformation/cloudformation/quicksight/aws-quicksight-dashboard_parameters.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_parameters.go
index 51afd262dd..c77e27956a 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_parameters.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_parameters.go
@@ -1,7 +1,7 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dashboard_Parameters AWS CloudFormation Resource (AWS::QuickSight::Dashboard.Parameters)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_resourcepermission.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_resourcepermission.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-dashboard_resourcepermission.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_resourcepermission.go
index 02d893bdc1..6b434cfb82 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_resourcepermission.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_resourcepermission.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dashboard_ResourcePermission AWS CloudFormation Resource (AWS::QuickSight::Dashboard.ResourcePermission)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_sheetcontrolsoption.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_sheetcontrolsoption.go
similarity index 92%
rename from goformation/cloudformation/quicksight/aws-quicksight-dashboard_sheetcontrolsoption.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_sheetcontrolsoption.go
index 22543a8f19..b37545fd9b 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_sheetcontrolsoption.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_sheetcontrolsoption.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dashboard_SheetControlsOption AWS CloudFormation Resource (AWS::QuickSight::Dashboard.SheetControlsOption)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_stringparameter.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_stringparameter.go
similarity index 92%
rename from goformation/cloudformation/quicksight/aws-quicksight-dashboard_stringparameter.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_stringparameter.go
index 182f930ff3..9117835aad 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_stringparameter.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dashboard_stringparameter.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Dashboard_StringParameter AWS CloudFormation Resource (AWS::QuickSight::Dashboard.StringParameter)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset.go
similarity index 97%
rename from goformation/cloudformation/quicksight/aws-quicksight-dataset.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset.go
index 2f617b2334..737109b8db 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dataset.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSet AWS CloudFormation Resource (AWS::QuickSight::DataSet)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_calculatedcolumn.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_calculatedcolumn.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-dataset_calculatedcolumn.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_calculatedcolumn.go
index 21c3a3d84a..f42a067f3a 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dataset_calculatedcolumn.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_calculatedcolumn.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSet_CalculatedColumn AWS CloudFormation Resource (AWS::QuickSight::DataSet.CalculatedColumn)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_castcolumntypeoperation.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_castcolumntypeoperation.go
similarity index 94%
rename from goformation/cloudformation/quicksight/aws-quicksight-dataset_castcolumntypeoperation.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_castcolumntypeoperation.go
index abab98895f..4ac03b9485 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dataset_castcolumntypeoperation.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_castcolumntypeoperation.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSet_CastColumnTypeOperation AWS CloudFormation Resource (AWS::QuickSight::DataSet.CastColumnTypeOperation)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_columndescription.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_columndescription.go
similarity index 91%
rename from goformation/cloudformation/quicksight/aws-quicksight-dataset_columndescription.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_columndescription.go
index 0ca3ed4d59..6db8778ab6 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dataset_columndescription.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_columndescription.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSet_ColumnDescription AWS CloudFormation Resource (AWS::QuickSight::DataSet.ColumnDescription)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_columngroup.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_columngroup.go
similarity index 95%
rename from goformation/cloudformation/quicksight/aws-quicksight-dataset_columngroup.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_columngroup.go
index 00933a062d..974c6483a7 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dataset_columngroup.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_columngroup.go
@@ -1,7 +1,7 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSet_ColumnGroup AWS CloudFormation Resource (AWS::QuickSight::DataSet.ColumnGroup)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_columnlevelpermissionrule.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_columnlevelpermissionrule.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-dataset_columnlevelpermissionrule.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_columnlevelpermissionrule.go
index 9cc849577c..1ce961893a 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dataset_columnlevelpermissionrule.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_columnlevelpermissionrule.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSet_ColumnLevelPermissionRule AWS CloudFormation Resource (AWS::QuickSight::DataSet.ColumnLevelPermissionRule)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_columntag.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_columntag.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-dataset_columntag.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_columntag.go
index 2286b7c79a..e161a43709 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dataset_columntag.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_columntag.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSet_ColumnTag AWS CloudFormation Resource (AWS::QuickSight::DataSet.ColumnTag)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_createcolumnsoperation.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_createcolumnsoperation.go
similarity index 95%
rename from goformation/cloudformation/quicksight/aws-quicksight-dataset_createcolumnsoperation.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_createcolumnsoperation.go
index f98479d38d..fdb8147bf0 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dataset_createcolumnsoperation.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_createcolumnsoperation.go
@@ -1,7 +1,7 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSet_CreateColumnsOperation AWS CloudFormation Resource (AWS::QuickSight::DataSet.CreateColumnsOperation)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_customsql.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_customsql.go
similarity index 94%
rename from goformation/cloudformation/quicksight/aws-quicksight-dataset_customsql.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_customsql.go
index deefc21d38..f9a20fac7c 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dataset_customsql.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_customsql.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSet_CustomSql AWS CloudFormation Resource (AWS::QuickSight::DataSet.CustomSql)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_fieldfolder.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_fieldfolder.go
similarity index 92%
rename from goformation/cloudformation/quicksight/aws-quicksight-dataset_fieldfolder.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_fieldfolder.go
index c66848c49c..8c5c1d1580 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dataset_fieldfolder.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_fieldfolder.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSet_FieldFolder AWS CloudFormation Resource (AWS::QuickSight::DataSet.FieldFolder)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_filteroperation.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_filteroperation.go
similarity index 91%
rename from goformation/cloudformation/quicksight/aws-quicksight-dataset_filteroperation.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_filteroperation.go
index 6b6b8fb1f3..40fb7bfa7c 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dataset_filteroperation.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_filteroperation.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSet_FilterOperation AWS CloudFormation Resource (AWS::QuickSight::DataSet.FilterOperation)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_geospatialcolumngroup.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_geospatialcolumngroup.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-dataset_geospatialcolumngroup.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_geospatialcolumngroup.go
index 16de65874f..d5a9b5fc83 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dataset_geospatialcolumngroup.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_geospatialcolumngroup.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSet_GeoSpatialColumnGroup AWS CloudFormation Resource (AWS::QuickSight::DataSet.GeoSpatialColumnGroup)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_ingestionwaitpolicy.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_ingestionwaitpolicy.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-dataset_ingestionwaitpolicy.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_ingestionwaitpolicy.go
index 2fb4461734..94e758ba78 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dataset_ingestionwaitpolicy.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_ingestionwaitpolicy.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSet_IngestionWaitPolicy AWS CloudFormation Resource (AWS::QuickSight::DataSet.IngestionWaitPolicy)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_inputcolumn.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_inputcolumn.go
similarity index 92%
rename from goformation/cloudformation/quicksight/aws-quicksight-dataset_inputcolumn.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_inputcolumn.go
index dd9c850def..e9a7e1d3c9 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dataset_inputcolumn.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_inputcolumn.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSet_InputColumn AWS CloudFormation Resource (AWS::QuickSight::DataSet.InputColumn)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_joininstruction.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_joininstruction.go
similarity index 95%
rename from goformation/cloudformation/quicksight/aws-quicksight-dataset_joininstruction.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_joininstruction.go
index 74b1a22ea7..21c102ff71 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dataset_joininstruction.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_joininstruction.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSet_JoinInstruction AWS CloudFormation Resource (AWS::QuickSight::DataSet.JoinInstruction)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_joinkeyproperties.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_joinkeyproperties.go
similarity index 91%
rename from goformation/cloudformation/quicksight/aws-quicksight-dataset_joinkeyproperties.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_joinkeyproperties.go
index 79375be2cd..946a4dc935 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dataset_joinkeyproperties.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_joinkeyproperties.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSet_JoinKeyProperties AWS CloudFormation Resource (AWS::QuickSight::DataSet.JoinKeyProperties)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_logicaltable.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_logicaltable.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-dataset_logicaltable.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_logicaltable.go
index 26a35ee6fe..b90ea62385 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dataset_logicaltable.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_logicaltable.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSet_LogicalTable AWS CloudFormation Resource (AWS::QuickSight::DataSet.LogicalTable)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_logicaltablesource.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_logicaltablesource.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-dataset_logicaltablesource.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_logicaltablesource.go
index f0f7fd3bf3..0fd6d7b0a3 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dataset_logicaltablesource.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_logicaltablesource.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSet_LogicalTableSource AWS CloudFormation Resource (AWS::QuickSight::DataSet.LogicalTableSource)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_outputcolumn.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_outputcolumn.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-dataset_outputcolumn.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_outputcolumn.go
index fef6c0e7bf..656ace44b0 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dataset_outputcolumn.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_outputcolumn.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSet_OutputColumn AWS CloudFormation Resource (AWS::QuickSight::DataSet.OutputColumn)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_physicaltable.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_physicaltable.go
similarity index 96%
rename from goformation/cloudformation/quicksight/aws-quicksight-dataset_physicaltable.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_physicaltable.go
index cbb02a42a2..ba84a57033 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dataset_physicaltable.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_physicaltable.go
@@ -1,7 +1,7 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSet_PhysicalTable AWS CloudFormation Resource (AWS::QuickSight::DataSet.PhysicalTable)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_projectoperation.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_projectoperation.go
similarity index 91%
rename from goformation/cloudformation/quicksight/aws-quicksight-dataset_projectoperation.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_projectoperation.go
index 630d28e0bd..1e39b61dcb 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dataset_projectoperation.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_projectoperation.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSet_ProjectOperation AWS CloudFormation Resource (AWS::QuickSight::DataSet.ProjectOperation)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_relationaltable.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_relationaltable.go
similarity index 95%
rename from goformation/cloudformation/quicksight/aws-quicksight-dataset_relationaltable.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_relationaltable.go
index e1a7bea05b..c432cb0d09 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dataset_relationaltable.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_relationaltable.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSet_RelationalTable AWS CloudFormation Resource (AWS::QuickSight::DataSet.RelationalTable)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_renamecolumnoperation.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_renamecolumnoperation.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-dataset_renamecolumnoperation.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_renamecolumnoperation.go
index f32db49998..4252d6b24c 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dataset_renamecolumnoperation.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_renamecolumnoperation.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSet_RenameColumnOperation AWS CloudFormation Resource (AWS::QuickSight::DataSet.RenameColumnOperation)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_resourcepermission.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_resourcepermission.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-dataset_resourcepermission.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_resourcepermission.go
index c1cdfa2fd4..ac6646a13a 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dataset_resourcepermission.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_resourcepermission.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSet_ResourcePermission AWS CloudFormation Resource (AWS::QuickSight::DataSet.ResourcePermission)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_rowlevelpermissiondataset.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_rowlevelpermissiondataset.go
similarity index 94%
rename from goformation/cloudformation/quicksight/aws-quicksight-dataset_rowlevelpermissiondataset.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_rowlevelpermissiondataset.go
index 5908bde824..ee5df8bad9 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dataset_rowlevelpermissiondataset.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_rowlevelpermissiondataset.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSet_RowLevelPermissionDataSet AWS CloudFormation Resource (AWS::QuickSight::DataSet.RowLevelPermissionDataSet)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_s3source.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_s3source.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-dataset_s3source.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_s3source.go
index d1d245b481..b1b3e07086 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dataset_s3source.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_s3source.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSet_S3Source AWS CloudFormation Resource (AWS::QuickSight::DataSet.S3Source)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_tagcolumnoperation.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_tagcolumnoperation.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-dataset_tagcolumnoperation.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_tagcolumnoperation.go
index 8ac68c483f..04868495f9 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dataset_tagcolumnoperation.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_tagcolumnoperation.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSet_TagColumnOperation AWS CloudFormation Resource (AWS::QuickSight::DataSet.TagColumnOperation)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_transformoperation.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_transformoperation.go
similarity index 97%
rename from goformation/cloudformation/quicksight/aws-quicksight-dataset_transformoperation.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_transformoperation.go
index 0d08d79c94..a4f15a2802 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dataset_transformoperation.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_transformoperation.go
@@ -1,7 +1,7 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSet_TransformOperation AWS CloudFormation Resource (AWS::QuickSight::DataSet.TransformOperation)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_uploadsettings.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_uploadsettings.go
similarity index 95%
rename from goformation/cloudformation/quicksight/aws-quicksight-dataset_uploadsettings.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_uploadsettings.go
index ab3d843afa..f1b48db6b7 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-dataset_uploadsettings.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-dataset_uploadsettings.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSet_UploadSettings AWS CloudFormation Resource (AWS::QuickSight::DataSet.UploadSettings)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource.go
similarity index 97%
rename from goformation/cloudformation/quicksight/aws-quicksight-datasource.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource.go
index 65a5c08841..4f6c68a175 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-datasource.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource AWS CloudFormation Resource (AWS::QuickSight::DataSource)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_amazonelasticsearchparameters.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_amazonelasticsearchparameters.go
similarity index 92%
rename from goformation/cloudformation/quicksight/aws-quicksight-datasource_amazonelasticsearchparameters.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_amazonelasticsearchparameters.go
index 189cc86ed3..ab122a57df 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-datasource_amazonelasticsearchparameters.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_amazonelasticsearchparameters.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_AmazonElasticsearchParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.AmazonElasticsearchParameters)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_amazonopensearchparameters.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_amazonopensearchparameters.go
similarity index 92%
rename from goformation/cloudformation/quicksight/aws-quicksight-datasource_amazonopensearchparameters.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_amazonopensearchparameters.go
index 1ad15672a7..c4e0577fb7 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-datasource_amazonopensearchparameters.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_amazonopensearchparameters.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_AmazonOpenSearchParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.AmazonOpenSearchParameters)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_athenaparameters.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_athenaparameters.go
similarity index 91%
rename from goformation/cloudformation/quicksight/aws-quicksight-datasource_athenaparameters.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_athenaparameters.go
index cf73570ad1..2f62f825b7 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-datasource_athenaparameters.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_athenaparameters.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_AthenaParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.AthenaParameters)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_auroraparameters.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_auroraparameters.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-datasource_auroraparameters.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_auroraparameters.go
index 59ddac5819..f7422658b8 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-datasource_auroraparameters.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_auroraparameters.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_AuroraParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.AuroraParameters)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_aurorapostgresqlparameters.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_aurorapostgresqlparameters.go
similarity index 94%
rename from goformation/cloudformation/quicksight/aws-quicksight-datasource_aurorapostgresqlparameters.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_aurorapostgresqlparameters.go
index e8951b229e..71bbec3d94 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-datasource_aurorapostgresqlparameters.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_aurorapostgresqlparameters.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_AuroraPostgreSqlParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.AuroraPostgreSqlParameters)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_credentialpair.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_credentialpair.go
similarity index 94%
rename from goformation/cloudformation/quicksight/aws-quicksight-datasource_credentialpair.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_credentialpair.go
index f336ba84fd..77b7151918 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-datasource_credentialpair.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_credentialpair.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_CredentialPair AWS CloudFormation Resource (AWS::QuickSight::DataSource.CredentialPair)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_datasourcecredentials.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_datasourcecredentials.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-datasource_datasourcecredentials.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_datasourcecredentials.go
index 9f24db217e..9531cd2ebb 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-datasource_datasourcecredentials.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_datasourcecredentials.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_DataSourceCredentials AWS CloudFormation Resource (AWS::QuickSight::DataSource.DataSourceCredentials)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_datasourceerrorinfo.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_datasourceerrorinfo.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-datasource_datasourceerrorinfo.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_datasourceerrorinfo.go
index fdc6bdd3ad..eb7649c46a 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-datasource_datasourceerrorinfo.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_datasourceerrorinfo.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_DataSourceErrorInfo AWS CloudFormation Resource (AWS::QuickSight::DataSource.DataSourceErrorInfo)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_datasourceparameters.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_datasourceparameters.go
similarity index 99%
rename from goformation/cloudformation/quicksight/aws-quicksight-datasource_datasourceparameters.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_datasourceparameters.go
index 91ec756223..9ab7547d88 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-datasource_datasourceparameters.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_datasourceparameters.go
@@ -1,7 +1,7 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_DataSourceParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.DataSourceParameters)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_manifestfilelocation.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_manifestfilelocation.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-datasource_manifestfilelocation.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_manifestfilelocation.go
index d80b128adc..eb7ff269c3 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-datasource_manifestfilelocation.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_manifestfilelocation.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_ManifestFileLocation AWS CloudFormation Resource (AWS::QuickSight::DataSource.ManifestFileLocation)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_mariadbparameters.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_mariadbparameters.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-datasource_mariadbparameters.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_mariadbparameters.go
index 579c2fb46c..87e93aaef8 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-datasource_mariadbparameters.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_mariadbparameters.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_MariaDbParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.MariaDbParameters)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_mysqlparameters.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_mysqlparameters.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-datasource_mysqlparameters.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_mysqlparameters.go
index e7d5dc6edd..04b501d821 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-datasource_mysqlparameters.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_mysqlparameters.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_MySqlParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.MySqlParameters)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_oracleparameters.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_oracleparameters.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-datasource_oracleparameters.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_oracleparameters.go
index 73e7ac8be6..a951eda85f 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-datasource_oracleparameters.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_oracleparameters.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_OracleParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.OracleParameters)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_postgresqlparameters.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_postgresqlparameters.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-datasource_postgresqlparameters.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_postgresqlparameters.go
index 00e1da9cc6..067007fbc1 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-datasource_postgresqlparameters.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_postgresqlparameters.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_PostgreSqlParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.PostgreSqlParameters)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_prestoparameters.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_prestoparameters.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-datasource_prestoparameters.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_prestoparameters.go
index ee94c47c3f..27b50d7f9d 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-datasource_prestoparameters.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_prestoparameters.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_PrestoParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.PrestoParameters)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_rdsparameters.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_rdsparameters.go
similarity index 92%
rename from goformation/cloudformation/quicksight/aws-quicksight-datasource_rdsparameters.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_rdsparameters.go
index 9306daa456..cbc0726e44 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-datasource_rdsparameters.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_rdsparameters.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_RdsParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.RdsParameters)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_redshiftparameters.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_redshiftparameters.go
similarity index 94%
rename from goformation/cloudformation/quicksight/aws-quicksight-datasource_redshiftparameters.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_redshiftparameters.go
index 68f7d79ead..af41ef94f2 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-datasource_redshiftparameters.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_redshiftparameters.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_RedshiftParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.RedshiftParameters)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_resourcepermission.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_resourcepermission.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-datasource_resourcepermission.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_resourcepermission.go
index eaed40f567..e430e32987 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-datasource_resourcepermission.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_resourcepermission.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_ResourcePermission AWS CloudFormation Resource (AWS::QuickSight::DataSource.ResourcePermission)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_s3parameters.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_s3parameters.go
similarity index 95%
rename from goformation/cloudformation/quicksight/aws-quicksight-datasource_s3parameters.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_s3parameters.go
index 6c0579c2c8..46d32dc3bf 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-datasource_s3parameters.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_s3parameters.go
@@ -1,7 +1,7 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_S3Parameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.S3Parameters)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_snowflakeparameters.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_snowflakeparameters.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-datasource_snowflakeparameters.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_snowflakeparameters.go
index 0542a8339e..d3b0c2b091 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-datasource_snowflakeparameters.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_snowflakeparameters.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_SnowflakeParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.SnowflakeParameters)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_sparkparameters.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_sparkparameters.go
similarity index 92%
rename from goformation/cloudformation/quicksight/aws-quicksight-datasource_sparkparameters.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_sparkparameters.go
index 15766cbc3f..6aee2358d1 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-datasource_sparkparameters.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_sparkparameters.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_SparkParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.SparkParameters)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_sqlserverparameters.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_sqlserverparameters.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-datasource_sqlserverparameters.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_sqlserverparameters.go
index f23de1feff..11ed462e4e 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-datasource_sqlserverparameters.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_sqlserverparameters.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_SqlServerParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.SqlServerParameters)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_sslproperties.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_sslproperties.go
similarity index 91%
rename from goformation/cloudformation/quicksight/aws-quicksight-datasource_sslproperties.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_sslproperties.go
index 5b3fdd8b8e..61539070c7 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-datasource_sslproperties.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_sslproperties.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_SslProperties AWS CloudFormation Resource (AWS::QuickSight::DataSource.SslProperties)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_teradataparameters.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_teradataparameters.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-datasource_teradataparameters.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_teradataparameters.go
index 2acc5a6f6c..68c61e5b24 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-datasource_teradataparameters.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_teradataparameters.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_TeradataParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.TeradataParameters)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_vpcconnectionproperties.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_vpcconnectionproperties.go
similarity index 92%
rename from goformation/cloudformation/quicksight/aws-quicksight-datasource_vpcconnectionproperties.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_vpcconnectionproperties.go
index 6f2fd42816..a119b9ed72 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-datasource_vpcconnectionproperties.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-datasource_vpcconnectionproperties.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataSource_VpcConnectionProperties AWS CloudFormation Resource (AWS::QuickSight::DataSource.VpcConnectionProperties)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-template.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-template.go
similarity index 96%
rename from goformation/cloudformation/quicksight/aws-quicksight-template.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-template.go
index ccfdb3165d..f5a0941ca3 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-template.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-template.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Template AWS CloudFormation Resource (AWS::QuickSight::Template)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-template_datasetreference.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-template_datasetreference.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-template_datasetreference.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-template_datasetreference.go
index 712e8eb5ba..bda2476bae 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-template_datasetreference.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-template_datasetreference.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Template_DataSetReference AWS CloudFormation Resource (AWS::QuickSight::Template.DataSetReference)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-template_resourcepermission.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-template_resourcepermission.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-template_resourcepermission.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-template_resourcepermission.go
index 69971405fe..e58a4715c4 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-template_resourcepermission.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-template_resourcepermission.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Template_ResourcePermission AWS CloudFormation Resource (AWS::QuickSight::Template.ResourcePermission)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-template_templatesourceanalysis.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-template_templatesourceanalysis.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-template_templatesourceanalysis.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-template_templatesourceanalysis.go
index 4bce72605b..699e964413 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-template_templatesourceanalysis.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-template_templatesourceanalysis.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Template_TemplateSourceAnalysis AWS CloudFormation Resource (AWS::QuickSight::Template.TemplateSourceAnalysis)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-template_templatesourceentity.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-template_templatesourceentity.go
similarity index 96%
rename from goformation/cloudformation/quicksight/aws-quicksight-template_templatesourceentity.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-template_templatesourceentity.go
index 93bb94073c..656ca53480 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-template_templatesourceentity.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-template_templatesourceentity.go
@@ -1,7 +1,7 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Template_TemplateSourceEntity AWS CloudFormation Resource (AWS::QuickSight::Template.TemplateSourceEntity)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-template_templatesourcetemplate.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-template_templatesourcetemplate.go
similarity index 91%
rename from goformation/cloudformation/quicksight/aws-quicksight-template_templatesourcetemplate.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-template_templatesourcetemplate.go
index 1829fec99b..abb47e65e1 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-template_templatesourcetemplate.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-template_templatesourcetemplate.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Template_TemplateSourceTemplate AWS CloudFormation Resource (AWS::QuickSight::Template.TemplateSourceTemplate)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-theme.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-theme.go
similarity index 96%
rename from goformation/cloudformation/quicksight/aws-quicksight-theme.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-theme.go
index 8f2defbe78..fe24895482 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-theme.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-theme.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Theme AWS CloudFormation Resource (AWS::QuickSight::Theme)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-theme_borderstyle.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_borderstyle.go
similarity index 91%
rename from goformation/cloudformation/quicksight/aws-quicksight-theme_borderstyle.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_borderstyle.go
index b46d3df31e..47f8e0afb2 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-theme_borderstyle.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_borderstyle.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Theme_BorderStyle AWS CloudFormation Resource (AWS::QuickSight::Theme.BorderStyle)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-theme_datacolorpalette.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_datacolorpalette.go
similarity index 93%
rename from goformation/cloudformation/quicksight/aws-quicksight-theme_datacolorpalette.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_datacolorpalette.go
index bc06bd36a2..b68d75f7bc 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-theme_datacolorpalette.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_datacolorpalette.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Theme_DataColorPalette AWS CloudFormation Resource (AWS::QuickSight::Theme.DataColorPalette)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-theme_font.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_font.go
similarity index 91%
rename from goformation/cloudformation/quicksight/aws-quicksight-theme_font.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_font.go
index 7e16d4263a..02ba10bb2b 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-theme_font.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_font.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Theme_Font AWS CloudFormation Resource (AWS::QuickSight::Theme.Font)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-theme_gutterstyle.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_gutterstyle.go
similarity index 91%
rename from goformation/cloudformation/quicksight/aws-quicksight-theme_gutterstyle.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_gutterstyle.go
index 01804fb241..fa48da31a4 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-theme_gutterstyle.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_gutterstyle.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Theme_GutterStyle AWS CloudFormation Resource (AWS::QuickSight::Theme.GutterStyle)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-theme_marginstyle.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_marginstyle.go
similarity index 91%
rename from goformation/cloudformation/quicksight/aws-quicksight-theme_marginstyle.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_marginstyle.go
index 63b7a4a715..fe3990e005 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-theme_marginstyle.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_marginstyle.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Theme_MarginStyle AWS CloudFormation Resource (AWS::QuickSight::Theme.MarginStyle)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-theme_resourcepermission.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_resourcepermission.go
similarity index 92%
rename from goformation/cloudformation/quicksight/aws-quicksight-theme_resourcepermission.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_resourcepermission.go
index 8f7ac3c125..18b3631f2d 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-theme_resourcepermission.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_resourcepermission.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Theme_ResourcePermission AWS CloudFormation Resource (AWS::QuickSight::Theme.ResourcePermission)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-theme_sheetstyle.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_sheetstyle.go
similarity index 96%
rename from goformation/cloudformation/quicksight/aws-quicksight-theme_sheetstyle.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_sheetstyle.go
index da3ae6a180..5cf77d96cf 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-theme_sheetstyle.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_sheetstyle.go
@@ -1,7 +1,7 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Theme_SheetStyle AWS CloudFormation Resource (AWS::QuickSight::Theme.SheetStyle)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-theme_themeconfiguration.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_themeconfiguration.go
similarity index 97%
rename from goformation/cloudformation/quicksight/aws-quicksight-theme_themeconfiguration.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_themeconfiguration.go
index 787491d57c..3fc35f1138 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-theme_themeconfiguration.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_themeconfiguration.go
@@ -1,7 +1,7 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Theme_ThemeConfiguration AWS CloudFormation Resource (AWS::QuickSight::Theme.ThemeConfiguration)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-theme_tilelayoutstyle.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_tilelayoutstyle.go
similarity index 96%
rename from goformation/cloudformation/quicksight/aws-quicksight-theme_tilelayoutstyle.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_tilelayoutstyle.go
index 4588b720a8..0f081bd3fb 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-theme_tilelayoutstyle.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_tilelayoutstyle.go
@@ -1,7 +1,7 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Theme_TileLayoutStyle AWS CloudFormation Resource (AWS::QuickSight::Theme.TileLayoutStyle)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-theme_tilestyle.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_tilestyle.go
similarity index 95%
rename from goformation/cloudformation/quicksight/aws-quicksight-theme_tilestyle.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_tilestyle.go
index 1cd907345b..d5fdd2c332 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-theme_tilestyle.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_tilestyle.go
@@ -1,7 +1,7 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Theme_TileStyle AWS CloudFormation Resource (AWS::QuickSight::Theme.TileStyle)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-theme_typography.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_typography.go
similarity index 95%
rename from goformation/cloudformation/quicksight/aws-quicksight-theme_typography.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_typography.go
index 69f85584a1..c68f26a4aa 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-theme_typography.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_typography.go
@@ -1,7 +1,7 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Theme_Typography AWS CloudFormation Resource (AWS::QuickSight::Theme.Typography)
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-theme_uicolorpalette.go b/pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_uicolorpalette.go
similarity index 97%
rename from goformation/cloudformation/quicksight/aws-quicksight-theme_uicolorpalette.go
rename to pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_uicolorpalette.go
index e9a17f1ff7..9a55880305 100644
--- a/goformation/cloudformation/quicksight/aws-quicksight-theme_uicolorpalette.go
+++ b/pkg/goformation/cloudformation/quicksight/aws-quicksight-theme_uicolorpalette.go
@@ -1,9 +1,9 @@
 package quicksight
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Theme_UIColorPalette AWS CloudFormation Resource (AWS::QuickSight::Theme.UIColorPalette)
diff --git a/goformation/cloudformation/ram/aws-ram-resourceshare.go b/pkg/goformation/cloudformation/ram/aws-ram-resourceshare.go
similarity index 96%
rename from goformation/cloudformation/ram/aws-ram-resourceshare.go
rename to pkg/goformation/cloudformation/ram/aws-ram-resourceshare.go
index 733c9dab53..f26acb27c3 100644
--- a/goformation/cloudformation/ram/aws-ram-resourceshare.go
+++ b/pkg/goformation/cloudformation/ram/aws-ram-resourceshare.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceShare AWS CloudFormation Resource (AWS::RAM::ResourceShare)
diff --git a/goformation/cloudformation/rds/aws-rds-dbcluster.go b/pkg/goformation/cloudformation/rds/aws-rds-dbcluster.go
similarity index 98%
rename from goformation/cloudformation/rds/aws-rds-dbcluster.go
rename to pkg/goformation/cloudformation/rds/aws-rds-dbcluster.go
index 5046621e5e..cfcd74bc4a 100644
--- a/goformation/cloudformation/rds/aws-rds-dbcluster.go
+++ b/pkg/goformation/cloudformation/rds/aws-rds-dbcluster.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DBCluster AWS CloudFormation Resource (AWS::RDS::DBCluster)
diff --git a/goformation/cloudformation/rds/aws-rds-dbcluster_dbclusterrole.go b/pkg/goformation/cloudformation/rds/aws-rds-dbcluster_dbclusterrole.go
similarity index 92%
rename from goformation/cloudformation/rds/aws-rds-dbcluster_dbclusterrole.go
rename to pkg/goformation/cloudformation/rds/aws-rds-dbcluster_dbclusterrole.go
index 841a6596fd..d3a01c7d0f 100644
--- a/goformation/cloudformation/rds/aws-rds-dbcluster_dbclusterrole.go
+++ b/pkg/goformation/cloudformation/rds/aws-rds-dbcluster_dbclusterrole.go
@@ -1,9 +1,9 @@
 package rds
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DBCluster_DBClusterRole AWS CloudFormation Resource (AWS::RDS::DBCluster.DBClusterRole)
diff --git a/goformation/cloudformation/rds/aws-rds-dbcluster_scalingconfiguration.go b/pkg/goformation/cloudformation/rds/aws-rds-dbcluster_scalingconfiguration.go
similarity index 94%
rename from goformation/cloudformation/rds/aws-rds-dbcluster_scalingconfiguration.go
rename to pkg/goformation/cloudformation/rds/aws-rds-dbcluster_scalingconfiguration.go
index 578a7b47a2..2ac302e6a4 100644
--- a/goformation/cloudformation/rds/aws-rds-dbcluster_scalingconfiguration.go
+++ b/pkg/goformation/cloudformation/rds/aws-rds-dbcluster_scalingconfiguration.go
@@ -1,9 +1,9 @@
 package rds
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DBCluster_ScalingConfiguration AWS CloudFormation Resource (AWS::RDS::DBCluster.ScalingConfiguration)
diff --git a/goformation/cloudformation/rds/aws-rds-dbclusterparametergroup.go b/pkg/goformation/cloudformation/rds/aws-rds-dbclusterparametergroup.go
similarity index 95%
rename from goformation/cloudformation/rds/aws-rds-dbclusterparametergroup.go
rename to pkg/goformation/cloudformation/rds/aws-rds-dbclusterparametergroup.go
index 3a053d62b9..dadc59c554 100644
--- a/goformation/cloudformation/rds/aws-rds-dbclusterparametergroup.go
+++ b/pkg/goformation/cloudformation/rds/aws-rds-dbclusterparametergroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DBClusterParameterGroup AWS CloudFormation Resource (AWS::RDS::DBClusterParameterGroup)
diff --git a/goformation/cloudformation/rds/aws-rds-dbinstance.go b/pkg/goformation/cloudformation/rds/aws-rds-dbinstance.go
similarity index 98%
rename from goformation/cloudformation/rds/aws-rds-dbinstance.go
rename to pkg/goformation/cloudformation/rds/aws-rds-dbinstance.go
index 3039ce1b81..e90ee292ae 100644
--- a/goformation/cloudformation/rds/aws-rds-dbinstance.go
+++ b/pkg/goformation/cloudformation/rds/aws-rds-dbinstance.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DBInstance AWS CloudFormation Resource (AWS::RDS::DBInstance)
diff --git a/goformation/cloudformation/rds/aws-rds-dbinstance_dbinstancerole.go b/pkg/goformation/cloudformation/rds/aws-rds-dbinstance_dbinstancerole.go
similarity index 92%
rename from goformation/cloudformation/rds/aws-rds-dbinstance_dbinstancerole.go
rename to pkg/goformation/cloudformation/rds/aws-rds-dbinstance_dbinstancerole.go
index 7b7a8c0293..ca1edd1142 100644
--- a/goformation/cloudformation/rds/aws-rds-dbinstance_dbinstancerole.go
+++ b/pkg/goformation/cloudformation/rds/aws-rds-dbinstance_dbinstancerole.go
@@ -1,9 +1,9 @@
 package rds
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DBInstance_DBInstanceRole AWS CloudFormation Resource (AWS::RDS::DBInstance.DBInstanceRole)
diff --git a/goformation/cloudformation/rds/aws-rds-dbinstance_processorfeature.go b/pkg/goformation/cloudformation/rds/aws-rds-dbinstance_processorfeature.go
similarity index 92%
rename from goformation/cloudformation/rds/aws-rds-dbinstance_processorfeature.go
rename to pkg/goformation/cloudformation/rds/aws-rds-dbinstance_processorfeature.go
index 843c954908..afe97f1e3f 100644
--- a/goformation/cloudformation/rds/aws-rds-dbinstance_processorfeature.go
+++ b/pkg/goformation/cloudformation/rds/aws-rds-dbinstance_processorfeature.go
@@ -1,9 +1,9 @@
 package rds
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DBInstance_ProcessorFeature AWS CloudFormation Resource (AWS::RDS::DBInstance.ProcessorFeature)
diff --git a/goformation/cloudformation/rds/aws-rds-dbparametergroup.go b/pkg/goformation/cloudformation/rds/aws-rds-dbparametergroup.go
similarity index 95%
rename from goformation/cloudformation/rds/aws-rds-dbparametergroup.go
rename to pkg/goformation/cloudformation/rds/aws-rds-dbparametergroup.go
index 06ff8be902..b8ecaed1ff 100644
--- a/goformation/cloudformation/rds/aws-rds-dbparametergroup.go
+++ b/pkg/goformation/cloudformation/rds/aws-rds-dbparametergroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DBParameterGroup AWS CloudFormation Resource (AWS::RDS::DBParameterGroup)
diff --git a/goformation/cloudformation/rds/aws-rds-dbproxy.go b/pkg/goformation/cloudformation/rds/aws-rds-dbproxy.go
similarity index 97%
rename from goformation/cloudformation/rds/aws-rds-dbproxy.go
rename to pkg/goformation/cloudformation/rds/aws-rds-dbproxy.go
index cbaf8c7fc3..b0fd8661ba 100644
--- a/goformation/cloudformation/rds/aws-rds-dbproxy.go
+++ b/pkg/goformation/cloudformation/rds/aws-rds-dbproxy.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DBProxy AWS CloudFormation Resource (AWS::RDS::DBProxy)
diff --git a/goformation/cloudformation/rds/aws-rds-dbproxy_authformat.go b/pkg/goformation/cloudformation/rds/aws-rds-dbproxy_authformat.go
similarity index 94%
rename from goformation/cloudformation/rds/aws-rds-dbproxy_authformat.go
rename to pkg/goformation/cloudformation/rds/aws-rds-dbproxy_authformat.go
index de0ca33d0d..30e5479a40 100644
--- a/goformation/cloudformation/rds/aws-rds-dbproxy_authformat.go
+++ b/pkg/goformation/cloudformation/rds/aws-rds-dbproxy_authformat.go
@@ -1,9 +1,9 @@
 package rds
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DBProxy_AuthFormat AWS CloudFormation Resource (AWS::RDS::DBProxy.AuthFormat)
diff --git a/goformation/cloudformation/rds/aws-rds-dbproxy_tagformat.go b/pkg/goformation/cloudformation/rds/aws-rds-dbproxy_tagformat.go
similarity index 92%
rename from goformation/cloudformation/rds/aws-rds-dbproxy_tagformat.go
rename to pkg/goformation/cloudformation/rds/aws-rds-dbproxy_tagformat.go
index f7f7573975..a7c991e1fe 100644
--- a/goformation/cloudformation/rds/aws-rds-dbproxy_tagformat.go
+++ b/pkg/goformation/cloudformation/rds/aws-rds-dbproxy_tagformat.go
@@ -1,9 +1,9 @@
 package rds
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DBProxy_TagFormat AWS CloudFormation Resource (AWS::RDS::DBProxy.TagFormat)
diff --git a/goformation/cloudformation/rds/aws-rds-dbproxyendpoint.go b/pkg/goformation/cloudformation/rds/aws-rds-dbproxyendpoint.go
similarity index 97%
rename from goformation/cloudformation/rds/aws-rds-dbproxyendpoint.go
rename to pkg/goformation/cloudformation/rds/aws-rds-dbproxyendpoint.go
index 816277f236..96cf827efa 100644
--- a/goformation/cloudformation/rds/aws-rds-dbproxyendpoint.go
+++ b/pkg/goformation/cloudformation/rds/aws-rds-dbproxyendpoint.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DBProxyEndpoint AWS CloudFormation Resource (AWS::RDS::DBProxyEndpoint)
diff --git a/goformation/cloudformation/rds/aws-rds-dbproxyendpoint_tagformat.go b/pkg/goformation/cloudformation/rds/aws-rds-dbproxyendpoint_tagformat.go
similarity index 92%
rename from goformation/cloudformation/rds/aws-rds-dbproxyendpoint_tagformat.go
rename to pkg/goformation/cloudformation/rds/aws-rds-dbproxyendpoint_tagformat.go
index 13827c4a35..db199f1b45 100644
--- a/goformation/cloudformation/rds/aws-rds-dbproxyendpoint_tagformat.go
+++ b/pkg/goformation/cloudformation/rds/aws-rds-dbproxyendpoint_tagformat.go
@@ -1,9 +1,9 @@
 package rds
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DBProxyEndpoint_TagFormat AWS CloudFormation Resource (AWS::RDS::DBProxyEndpoint.TagFormat)
diff --git a/goformation/cloudformation/rds/aws-rds-dbproxytargetgroup.go b/pkg/goformation/cloudformation/rds/aws-rds-dbproxytargetgroup.go
similarity index 97%
rename from goformation/cloudformation/rds/aws-rds-dbproxytargetgroup.go
rename to pkg/goformation/cloudformation/rds/aws-rds-dbproxytargetgroup.go
index 55abf42f8b..4c7a5aa55a 100644
--- a/goformation/cloudformation/rds/aws-rds-dbproxytargetgroup.go
+++ b/pkg/goformation/cloudformation/rds/aws-rds-dbproxytargetgroup.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DBProxyTargetGroup AWS CloudFormation Resource (AWS::RDS::DBProxyTargetGroup)
diff --git a/goformation/cloudformation/rds/aws-rds-dbproxytargetgroup_connectionpoolconfigurationinfoformat.go b/pkg/goformation/cloudformation/rds/aws-rds-dbproxytargetgroup_connectionpoolconfigurationinfoformat.go
similarity index 95%
rename from goformation/cloudformation/rds/aws-rds-dbproxytargetgroup_connectionpoolconfigurationinfoformat.go
rename to pkg/goformation/cloudformation/rds/aws-rds-dbproxytargetgroup_connectionpoolconfigurationinfoformat.go
index 1e12137e21..131cf7edf2 100644
--- a/goformation/cloudformation/rds/aws-rds-dbproxytargetgroup_connectionpoolconfigurationinfoformat.go
+++ b/pkg/goformation/cloudformation/rds/aws-rds-dbproxytargetgroup_connectionpoolconfigurationinfoformat.go
@@ -1,9 +1,9 @@
 package rds
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DBProxyTargetGroup_ConnectionPoolConfigurationInfoFormat AWS CloudFormation Resource (AWS::RDS::DBProxyTargetGroup.ConnectionPoolConfigurationInfoFormat)
diff --git a/goformation/cloudformation/rds/aws-rds-dbsecuritygroup.go b/pkg/goformation/cloudformation/rds/aws-rds-dbsecuritygroup.go
similarity index 95%
rename from goformation/cloudformation/rds/aws-rds-dbsecuritygroup.go
rename to pkg/goformation/cloudformation/rds/aws-rds-dbsecuritygroup.go
index c6471d8f10..05cf210ad5 100644
--- a/goformation/cloudformation/rds/aws-rds-dbsecuritygroup.go
+++ b/pkg/goformation/cloudformation/rds/aws-rds-dbsecuritygroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DBSecurityGroup AWS CloudFormation Resource (AWS::RDS::DBSecurityGroup)
diff --git a/goformation/cloudformation/rds/aws-rds-dbsecuritygroup_ingress.go b/pkg/goformation/cloudformation/rds/aws-rds-dbsecuritygroup_ingress.go
similarity index 94%
rename from goformation/cloudformation/rds/aws-rds-dbsecuritygroup_ingress.go
rename to pkg/goformation/cloudformation/rds/aws-rds-dbsecuritygroup_ingress.go
index 06a4541c0e..9efeaaa54d 100644
--- a/goformation/cloudformation/rds/aws-rds-dbsecuritygroup_ingress.go
+++ b/pkg/goformation/cloudformation/rds/aws-rds-dbsecuritygroup_ingress.go
@@ -1,9 +1,9 @@
 package rds
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DBSecurityGroup_Ingress AWS CloudFormation Resource (AWS::RDS::DBSecurityGroup.Ingress)
diff --git a/goformation/cloudformation/rds/aws-rds-dbsecuritygroupingress.go b/pkg/goformation/cloudformation/rds/aws-rds-dbsecuritygroupingress.go
similarity index 97%
rename from goformation/cloudformation/rds/aws-rds-dbsecuritygroupingress.go
rename to pkg/goformation/cloudformation/rds/aws-rds-dbsecuritygroupingress.go
index 803021e3ad..9d591a93ca 100644
--- a/goformation/cloudformation/rds/aws-rds-dbsecuritygroupingress.go
+++ b/pkg/goformation/cloudformation/rds/aws-rds-dbsecuritygroupingress.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DBSecurityGroupIngress AWS CloudFormation Resource (AWS::RDS::DBSecurityGroupIngress)
diff --git a/goformation/cloudformation/rds/aws-rds-dbsubnetgroup.go b/pkg/goformation/cloudformation/rds/aws-rds-dbsubnetgroup.go
similarity index 95%
rename from goformation/cloudformation/rds/aws-rds-dbsubnetgroup.go
rename to pkg/goformation/cloudformation/rds/aws-rds-dbsubnetgroup.go
index a52f5ac298..7a86656a42 100644
--- a/goformation/cloudformation/rds/aws-rds-dbsubnetgroup.go
+++ b/pkg/goformation/cloudformation/rds/aws-rds-dbsubnetgroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DBSubnetGroup AWS CloudFormation Resource (AWS::RDS::DBSubnetGroup)
diff --git a/goformation/cloudformation/rds/aws-rds-eventsubscription.go b/pkg/goformation/cloudformation/rds/aws-rds-eventsubscription.go
similarity index 97%
rename from goformation/cloudformation/rds/aws-rds-eventsubscription.go
rename to pkg/goformation/cloudformation/rds/aws-rds-eventsubscription.go
index 776e30d594..bf81c7b59e 100644
--- a/goformation/cloudformation/rds/aws-rds-eventsubscription.go
+++ b/pkg/goformation/cloudformation/rds/aws-rds-eventsubscription.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EventSubscription AWS CloudFormation Resource (AWS::RDS::EventSubscription)
diff --git a/goformation/cloudformation/rds/aws-rds-globalcluster.go b/pkg/goformation/cloudformation/rds/aws-rds-globalcluster.go
similarity index 97%
rename from goformation/cloudformation/rds/aws-rds-globalcluster.go
rename to pkg/goformation/cloudformation/rds/aws-rds-globalcluster.go
index b7cb93208b..4736290221 100644
--- a/goformation/cloudformation/rds/aws-rds-globalcluster.go
+++ b/pkg/goformation/cloudformation/rds/aws-rds-globalcluster.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GlobalCluster AWS CloudFormation Resource (AWS::RDS::GlobalCluster)
diff --git a/goformation/cloudformation/rds/aws-rds-optiongroup.go b/pkg/goformation/cloudformation/rds/aws-rds-optiongroup.go
similarity index 95%
rename from goformation/cloudformation/rds/aws-rds-optiongroup.go
rename to pkg/goformation/cloudformation/rds/aws-rds-optiongroup.go
index 3c698fb3e4..d75965a61d 100644
--- a/goformation/cloudformation/rds/aws-rds-optiongroup.go
+++ b/pkg/goformation/cloudformation/rds/aws-rds-optiongroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // OptionGroup AWS CloudFormation Resource (AWS::RDS::OptionGroup)
diff --git a/goformation/cloudformation/rds/aws-rds-optiongroup_optionconfiguration.go b/pkg/goformation/cloudformation/rds/aws-rds-optiongroup_optionconfiguration.go
similarity index 95%
rename from goformation/cloudformation/rds/aws-rds-optiongroup_optionconfiguration.go
rename to pkg/goformation/cloudformation/rds/aws-rds-optiongroup_optionconfiguration.go
index e64d8b5b6e..1406cb27f0 100644
--- a/goformation/cloudformation/rds/aws-rds-optiongroup_optionconfiguration.go
+++ b/pkg/goformation/cloudformation/rds/aws-rds-optiongroup_optionconfiguration.go
@@ -1,9 +1,9 @@
 package rds
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // OptionGroup_OptionConfiguration AWS CloudFormation Resource (AWS::RDS::OptionGroup.OptionConfiguration)
diff --git a/goformation/cloudformation/rds/aws-rds-optiongroup_optionsetting.go b/pkg/goformation/cloudformation/rds/aws-rds-optiongroup_optionsetting.go
similarity index 93%
rename from goformation/cloudformation/rds/aws-rds-optiongroup_optionsetting.go
rename to pkg/goformation/cloudformation/rds/aws-rds-optiongroup_optionsetting.go
index d4a9e0e3f4..5686d9d708 100644
--- a/goformation/cloudformation/rds/aws-rds-optiongroup_optionsetting.go
+++ b/pkg/goformation/cloudformation/rds/aws-rds-optiongroup_optionsetting.go
@@ -1,9 +1,9 @@
 package rds
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // OptionGroup_OptionSetting AWS CloudFormation Resource (AWS::RDS::OptionGroup.OptionSetting)
diff --git a/goformation/cloudformation/redshift/aws-redshift-cluster.go b/pkg/goformation/cloudformation/redshift/aws-redshift-cluster.go
similarity index 98%
rename from goformation/cloudformation/redshift/aws-redshift-cluster.go
rename to pkg/goformation/cloudformation/redshift/aws-redshift-cluster.go
index 83fb1879d8..76b7237940 100644
--- a/goformation/cloudformation/redshift/aws-redshift-cluster.go
+++ b/pkg/goformation/cloudformation/redshift/aws-redshift-cluster.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster AWS CloudFormation Resource (AWS::Redshift::Cluster)
diff --git a/goformation/cloudformation/redshift/aws-redshift-cluster_endpoint.go b/pkg/goformation/cloudformation/redshift/aws-redshift-cluster_endpoint.go
similarity index 92%
rename from goformation/cloudformation/redshift/aws-redshift-cluster_endpoint.go
rename to pkg/goformation/cloudformation/redshift/aws-redshift-cluster_endpoint.go
index e362fd0bf3..32fb0e3015 100644
--- a/goformation/cloudformation/redshift/aws-redshift-cluster_endpoint.go
+++ b/pkg/goformation/cloudformation/redshift/aws-redshift-cluster_endpoint.go
@@ -1,9 +1,9 @@
 package redshift
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_Endpoint AWS CloudFormation Resource (AWS::Redshift::Cluster.Endpoint)
diff --git a/goformation/cloudformation/redshift/aws-redshift-cluster_loggingproperties.go b/pkg/goformation/cloudformation/redshift/aws-redshift-cluster_loggingproperties.go
similarity index 92%
rename from goformation/cloudformation/redshift/aws-redshift-cluster_loggingproperties.go
rename to pkg/goformation/cloudformation/redshift/aws-redshift-cluster_loggingproperties.go
index d3990eb460..36e1784724 100644
--- a/goformation/cloudformation/redshift/aws-redshift-cluster_loggingproperties.go
+++ b/pkg/goformation/cloudformation/redshift/aws-redshift-cluster_loggingproperties.go
@@ -1,9 +1,9 @@
 package redshift
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_LoggingProperties AWS CloudFormation Resource (AWS::Redshift::Cluster.LoggingProperties)
diff --git a/goformation/cloudformation/redshift/aws-redshift-clusterparametergroup.go b/pkg/goformation/cloudformation/redshift/aws-redshift-clusterparametergroup.go
similarity index 95%
rename from goformation/cloudformation/redshift/aws-redshift-clusterparametergroup.go
rename to pkg/goformation/cloudformation/redshift/aws-redshift-clusterparametergroup.go
index 5a2ba1ee02..d51c020c43 100644
--- a/goformation/cloudformation/redshift/aws-redshift-clusterparametergroup.go
+++ b/pkg/goformation/cloudformation/redshift/aws-redshift-clusterparametergroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ClusterParameterGroup AWS CloudFormation Resource (AWS::Redshift::ClusterParameterGroup)
diff --git a/goformation/cloudformation/redshift/aws-redshift-clusterparametergroup_parameter.go b/pkg/goformation/cloudformation/redshift/aws-redshift-clusterparametergroup_parameter.go
similarity index 93%
rename from goformation/cloudformation/redshift/aws-redshift-clusterparametergroup_parameter.go
rename to pkg/goformation/cloudformation/redshift/aws-redshift-clusterparametergroup_parameter.go
index 6df1f90171..a0aab4695c 100644
--- a/goformation/cloudformation/redshift/aws-redshift-clusterparametergroup_parameter.go
+++ b/pkg/goformation/cloudformation/redshift/aws-redshift-clusterparametergroup_parameter.go
@@ -1,9 +1,9 @@
 package redshift
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ClusterParameterGroup_Parameter AWS CloudFormation Resource (AWS::Redshift::ClusterParameterGroup.Parameter)
diff --git a/goformation/cloudformation/redshift/aws-redshift-clustersecuritygroup.go b/pkg/goformation/cloudformation/redshift/aws-redshift-clustersecuritygroup.go
similarity index 95%
rename from goformation/cloudformation/redshift/aws-redshift-clustersecuritygroup.go
rename to pkg/goformation/cloudformation/redshift/aws-redshift-clustersecuritygroup.go
index b4b0c52a23..efc84f488f 100644
--- a/goformation/cloudformation/redshift/aws-redshift-clustersecuritygroup.go
+++ b/pkg/goformation/cloudformation/redshift/aws-redshift-clustersecuritygroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ClusterSecurityGroup AWS CloudFormation Resource (AWS::Redshift::ClusterSecurityGroup)
diff --git a/goformation/cloudformation/redshift/aws-redshift-clustersecuritygroupingress.go b/pkg/goformation/cloudformation/redshift/aws-redshift-clustersecuritygroupingress.go
similarity index 97%
rename from goformation/cloudformation/redshift/aws-redshift-clustersecuritygroupingress.go
rename to pkg/goformation/cloudformation/redshift/aws-redshift-clustersecuritygroupingress.go
index 7ca0391a91..5b16adf811 100644
--- a/goformation/cloudformation/redshift/aws-redshift-clustersecuritygroupingress.go
+++ b/pkg/goformation/cloudformation/redshift/aws-redshift-clustersecuritygroupingress.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ClusterSecurityGroupIngress AWS CloudFormation Resource (AWS::Redshift::ClusterSecurityGroupIngress)
diff --git a/goformation/cloudformation/redshift/aws-redshift-clustersubnetgroup.go b/pkg/goformation/cloudformation/redshift/aws-redshift-clustersubnetgroup.go
similarity index 95%
rename from goformation/cloudformation/redshift/aws-redshift-clustersubnetgroup.go
rename to pkg/goformation/cloudformation/redshift/aws-redshift-clustersubnetgroup.go
index 68dc941488..0dd21196f1 100644
--- a/goformation/cloudformation/redshift/aws-redshift-clustersubnetgroup.go
+++ b/pkg/goformation/cloudformation/redshift/aws-redshift-clustersubnetgroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ClusterSubnetGroup AWS CloudFormation Resource (AWS::Redshift::ClusterSubnetGroup)
diff --git a/goformation/cloudformation/redshift/aws-redshift-endpointaccess.go b/pkg/goformation/cloudformation/redshift/aws-redshift-endpointaccess.go
similarity index 97%
rename from goformation/cloudformation/redshift/aws-redshift-endpointaccess.go
rename to pkg/goformation/cloudformation/redshift/aws-redshift-endpointaccess.go
index ae4cf5bc04..07be4553ad 100644
--- a/goformation/cloudformation/redshift/aws-redshift-endpointaccess.go
+++ b/pkg/goformation/cloudformation/redshift/aws-redshift-endpointaccess.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EndpointAccess AWS CloudFormation Resource (AWS::Redshift::EndpointAccess)
diff --git a/goformation/cloudformation/redshift/aws-redshift-endpointaccess_vpcsecuritygroup.go b/pkg/goformation/cloudformation/redshift/aws-redshift-endpointaccess_vpcsecuritygroup.go
similarity index 93%
rename from goformation/cloudformation/redshift/aws-redshift-endpointaccess_vpcsecuritygroup.go
rename to pkg/goformation/cloudformation/redshift/aws-redshift-endpointaccess_vpcsecuritygroup.go
index 022dc47ef8..68db25c64f 100644
--- a/goformation/cloudformation/redshift/aws-redshift-endpointaccess_vpcsecuritygroup.go
+++ b/pkg/goformation/cloudformation/redshift/aws-redshift-endpointaccess_vpcsecuritygroup.go
@@ -1,9 +1,9 @@
 package redshift
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EndpointAccess_VpcSecurityGroup AWS CloudFormation Resource (AWS::Redshift::EndpointAccess.VpcSecurityGroup)
diff --git a/goformation/cloudformation/redshift/aws-redshift-endpointauthorization.go b/pkg/goformation/cloudformation/redshift/aws-redshift-endpointauthorization.go
similarity index 97%
rename from goformation/cloudformation/redshift/aws-redshift-endpointauthorization.go
rename to pkg/goformation/cloudformation/redshift/aws-redshift-endpointauthorization.go
index 7dfb72b628..6d444f5f68 100644
--- a/goformation/cloudformation/redshift/aws-redshift-endpointauthorization.go
+++ b/pkg/goformation/cloudformation/redshift/aws-redshift-endpointauthorization.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EndpointAuthorization AWS CloudFormation Resource (AWS::Redshift::EndpointAuthorization)
diff --git a/goformation/cloudformation/redshift/aws-redshift-eventsubscription.go b/pkg/goformation/cloudformation/redshift/aws-redshift-eventsubscription.go
similarity index 96%
rename from goformation/cloudformation/redshift/aws-redshift-eventsubscription.go
rename to pkg/goformation/cloudformation/redshift/aws-redshift-eventsubscription.go
index ed08666003..166b3298c9 100644
--- a/goformation/cloudformation/redshift/aws-redshift-eventsubscription.go
+++ b/pkg/goformation/cloudformation/redshift/aws-redshift-eventsubscription.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EventSubscription AWS CloudFormation Resource (AWS::Redshift::EventSubscription)
diff --git a/goformation/cloudformation/redshift/aws-redshift-scheduledaction.go b/pkg/goformation/cloudformation/redshift/aws-redshift-scheduledaction.go
similarity index 97%
rename from goformation/cloudformation/redshift/aws-redshift-scheduledaction.go
rename to pkg/goformation/cloudformation/redshift/aws-redshift-scheduledaction.go
index f0e245965c..ace01286e7 100644
--- a/goformation/cloudformation/redshift/aws-redshift-scheduledaction.go
+++ b/pkg/goformation/cloudformation/redshift/aws-redshift-scheduledaction.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScheduledAction AWS CloudFormation Resource (AWS::Redshift::ScheduledAction)
diff --git a/goformation/cloudformation/redshift/aws-redshift-scheduledaction_pauseclustermessage.go b/pkg/goformation/cloudformation/redshift/aws-redshift-scheduledaction_pauseclustermessage.go
similarity index 92%
rename from goformation/cloudformation/redshift/aws-redshift-scheduledaction_pauseclustermessage.go
rename to pkg/goformation/cloudformation/redshift/aws-redshift-scheduledaction_pauseclustermessage.go
index a936a48c96..5cdc60775b 100644
--- a/goformation/cloudformation/redshift/aws-redshift-scheduledaction_pauseclustermessage.go
+++ b/pkg/goformation/cloudformation/redshift/aws-redshift-scheduledaction_pauseclustermessage.go
@@ -1,9 +1,9 @@
 package redshift
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScheduledAction_PauseClusterMessage AWS CloudFormation Resource (AWS::Redshift::ScheduledAction.PauseClusterMessage)
diff --git a/goformation/cloudformation/redshift/aws-redshift-scheduledaction_resizeclustermessage.go b/pkg/goformation/cloudformation/redshift/aws-redshift-scheduledaction_resizeclustermessage.go
similarity index 95%
rename from goformation/cloudformation/redshift/aws-redshift-scheduledaction_resizeclustermessage.go
rename to pkg/goformation/cloudformation/redshift/aws-redshift-scheduledaction_resizeclustermessage.go
index a047fce54b..d46c164ef5 100644
--- a/goformation/cloudformation/redshift/aws-redshift-scheduledaction_resizeclustermessage.go
+++ b/pkg/goformation/cloudformation/redshift/aws-redshift-scheduledaction_resizeclustermessage.go
@@ -1,9 +1,9 @@
 package redshift
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScheduledAction_ResizeClusterMessage AWS CloudFormation Resource (AWS::Redshift::ScheduledAction.ResizeClusterMessage)
diff --git a/goformation/cloudformation/redshift/aws-redshift-scheduledaction_resumeclustermessage.go b/pkg/goformation/cloudformation/redshift/aws-redshift-scheduledaction_resumeclustermessage.go
similarity index 92%
rename from goformation/cloudformation/redshift/aws-redshift-scheduledaction_resumeclustermessage.go
rename to pkg/goformation/cloudformation/redshift/aws-redshift-scheduledaction_resumeclustermessage.go
index 3930bfdcbc..c0cd83d474 100644
--- a/goformation/cloudformation/redshift/aws-redshift-scheduledaction_resumeclustermessage.go
+++ b/pkg/goformation/cloudformation/redshift/aws-redshift-scheduledaction_resumeclustermessage.go
@@ -1,9 +1,9 @@
 package redshift
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScheduledAction_ResumeClusterMessage AWS CloudFormation Resource (AWS::Redshift::ScheduledAction.ResumeClusterMessage)
diff --git a/goformation/cloudformation/redshift/aws-redshift-scheduledaction_scheduledactiontype.go b/pkg/goformation/cloudformation/redshift/aws-redshift-scheduledaction_scheduledactiontype.go
similarity index 97%
rename from goformation/cloudformation/redshift/aws-redshift-scheduledaction_scheduledactiontype.go
rename to pkg/goformation/cloudformation/redshift/aws-redshift-scheduledaction_scheduledactiontype.go
index 7eec3b0dce..58ad49fafe 100644
--- a/goformation/cloudformation/redshift/aws-redshift-scheduledaction_scheduledactiontype.go
+++ b/pkg/goformation/cloudformation/redshift/aws-redshift-scheduledaction_scheduledactiontype.go
@@ -1,7 +1,7 @@
 package redshift
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScheduledAction_ScheduledActionType AWS CloudFormation Resource (AWS::Redshift::ScheduledAction.ScheduledActionType)
diff --git a/goformation/cloudformation/refactorspaces/aws-refactorspaces-application.go b/pkg/goformation/cloudformation/refactorspaces/aws-refactorspaces-application.go
similarity index 96%
rename from goformation/cloudformation/refactorspaces/aws-refactorspaces-application.go
rename to pkg/goformation/cloudformation/refactorspaces/aws-refactorspaces-application.go
index cf51309d54..5732b87e25 100644
--- a/goformation/cloudformation/refactorspaces/aws-refactorspaces-application.go
+++ b/pkg/goformation/cloudformation/refactorspaces/aws-refactorspaces-application.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application AWS CloudFormation Resource (AWS::RefactorSpaces::Application)
diff --git a/goformation/cloudformation/refactorspaces/aws-refactorspaces-application_apigatewayproxyinput.go b/pkg/goformation/cloudformation/refactorspaces/aws-refactorspaces-application_apigatewayproxyinput.go
similarity index 93%
rename from goformation/cloudformation/refactorspaces/aws-refactorspaces-application_apigatewayproxyinput.go
rename to pkg/goformation/cloudformation/refactorspaces/aws-refactorspaces-application_apigatewayproxyinput.go
index f6fcc25fa5..ce88b641d2 100644
--- a/goformation/cloudformation/refactorspaces/aws-refactorspaces-application_apigatewayproxyinput.go
+++ b/pkg/goformation/cloudformation/refactorspaces/aws-refactorspaces-application_apigatewayproxyinput.go
@@ -1,9 +1,9 @@
 package refactorspaces
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_ApiGatewayProxyInput AWS CloudFormation Resource (AWS::RefactorSpaces::Application.ApiGatewayProxyInput)
diff --git a/goformation/cloudformation/refactorspaces/aws-refactorspaces-environment.go b/pkg/goformation/cloudformation/refactorspaces/aws-refactorspaces-environment.go
similarity index 95%
rename from goformation/cloudformation/refactorspaces/aws-refactorspaces-environment.go
rename to pkg/goformation/cloudformation/refactorspaces/aws-refactorspaces-environment.go
index 3841534038..1a8f0b7631 100644
--- a/goformation/cloudformation/refactorspaces/aws-refactorspaces-environment.go
+++ b/pkg/goformation/cloudformation/refactorspaces/aws-refactorspaces-environment.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Environment AWS CloudFormation Resource (AWS::RefactorSpaces::Environment)
diff --git a/goformation/cloudformation/refactorspaces/aws-refactorspaces-route.go b/pkg/goformation/cloudformation/refactorspaces/aws-refactorspaces-route.go
similarity index 96%
rename from goformation/cloudformation/refactorspaces/aws-refactorspaces-route.go
rename to pkg/goformation/cloudformation/refactorspaces/aws-refactorspaces-route.go
index 8aaedb13e0..2ad47fd00d 100644
--- a/goformation/cloudformation/refactorspaces/aws-refactorspaces-route.go
+++ b/pkg/goformation/cloudformation/refactorspaces/aws-refactorspaces-route.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Route AWS CloudFormation Resource (AWS::RefactorSpaces::Route)
diff --git a/goformation/cloudformation/refactorspaces/aws-refactorspaces-route_uripathrouteinput.go b/pkg/goformation/cloudformation/refactorspaces/aws-refactorspaces-route_uripathrouteinput.go
similarity index 94%
rename from goformation/cloudformation/refactorspaces/aws-refactorspaces-route_uripathrouteinput.go
rename to pkg/goformation/cloudformation/refactorspaces/aws-refactorspaces-route_uripathrouteinput.go
index 62777d59bf..9244f4363b 100644
--- a/goformation/cloudformation/refactorspaces/aws-refactorspaces-route_uripathrouteinput.go
+++ b/pkg/goformation/cloudformation/refactorspaces/aws-refactorspaces-route_uripathrouteinput.go
@@ -1,9 +1,9 @@
 package refactorspaces
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Route_UriPathRouteInput AWS CloudFormation Resource (AWS::RefactorSpaces::Route.UriPathRouteInput)
diff --git a/goformation/cloudformation/refactorspaces/aws-refactorspaces-service.go b/pkg/goformation/cloudformation/refactorspaces/aws-refactorspaces-service.go
similarity index 96%
rename from goformation/cloudformation/refactorspaces/aws-refactorspaces-service.go
rename to pkg/goformation/cloudformation/refactorspaces/aws-refactorspaces-service.go
index e5a2018bc3..f7a85f9c34 100644
--- a/goformation/cloudformation/refactorspaces/aws-refactorspaces-service.go
+++ b/pkg/goformation/cloudformation/refactorspaces/aws-refactorspaces-service.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Service AWS CloudFormation Resource (AWS::RefactorSpaces::Service)
diff --git a/goformation/cloudformation/refactorspaces/aws-refactorspaces-service_lambdaendpointinput.go b/pkg/goformation/cloudformation/refactorspaces/aws-refactorspaces-service_lambdaendpointinput.go
similarity index 91%
rename from goformation/cloudformation/refactorspaces/aws-refactorspaces-service_lambdaendpointinput.go
rename to pkg/goformation/cloudformation/refactorspaces/aws-refactorspaces-service_lambdaendpointinput.go
index d509f91add..89f871ee7f 100644
--- a/goformation/cloudformation/refactorspaces/aws-refactorspaces-service_lambdaendpointinput.go
+++ b/pkg/goformation/cloudformation/refactorspaces/aws-refactorspaces-service_lambdaendpointinput.go
@@ -1,9 +1,9 @@
 package refactorspaces
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Service_LambdaEndpointInput AWS CloudFormation Resource (AWS::RefactorSpaces::Service.LambdaEndpointInput)
diff --git a/goformation/cloudformation/refactorspaces/aws-refactorspaces-service_urlendpointinput.go b/pkg/goformation/cloudformation/refactorspaces/aws-refactorspaces-service_urlendpointinput.go
similarity index 92%
rename from goformation/cloudformation/refactorspaces/aws-refactorspaces-service_urlendpointinput.go
rename to pkg/goformation/cloudformation/refactorspaces/aws-refactorspaces-service_urlendpointinput.go
index 7bdf18fade..eaf71cbe46 100644
--- a/goformation/cloudformation/refactorspaces/aws-refactorspaces-service_urlendpointinput.go
+++ b/pkg/goformation/cloudformation/refactorspaces/aws-refactorspaces-service_urlendpointinput.go
@@ -1,9 +1,9 @@
 package refactorspaces
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Service_UrlEndpointInput AWS CloudFormation Resource (AWS::RefactorSpaces::Service.UrlEndpointInput)
diff --git a/goformation/cloudformation/rekognition/aws-rekognition-project.go b/pkg/goformation/cloudformation/rekognition/aws-rekognition-project.go
similarity index 96%
rename from goformation/cloudformation/rekognition/aws-rekognition-project.go
rename to pkg/goformation/cloudformation/rekognition/aws-rekognition-project.go
index 75e5c4e498..4bb07ed5f2 100644
--- a/goformation/cloudformation/rekognition/aws-rekognition-project.go
+++ b/pkg/goformation/cloudformation/rekognition/aws-rekognition-project.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project AWS CloudFormation Resource (AWS::Rekognition::Project)
diff --git a/goformation/cloudformation/resiliencehub/aws-resiliencehub-app.go b/pkg/goformation/cloudformation/resiliencehub/aws-resiliencehub-app.go
similarity index 97%
rename from goformation/cloudformation/resiliencehub/aws-resiliencehub-app.go
rename to pkg/goformation/cloudformation/resiliencehub/aws-resiliencehub-app.go
index 38b2573dfd..6d84f5241d 100644
--- a/goformation/cloudformation/resiliencehub/aws-resiliencehub-app.go
+++ b/pkg/goformation/cloudformation/resiliencehub/aws-resiliencehub-app.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // App AWS CloudFormation Resource (AWS::ResilienceHub::App)
diff --git a/goformation/cloudformation/resiliencehub/aws-resiliencehub-app_physicalresourceid.go b/pkg/goformation/cloudformation/resiliencehub/aws-resiliencehub-app_physicalresourceid.go
similarity index 94%
rename from goformation/cloudformation/resiliencehub/aws-resiliencehub-app_physicalresourceid.go
rename to pkg/goformation/cloudformation/resiliencehub/aws-resiliencehub-app_physicalresourceid.go
index 53e9b3f411..58649dd735 100644
--- a/goformation/cloudformation/resiliencehub/aws-resiliencehub-app_physicalresourceid.go
+++ b/pkg/goformation/cloudformation/resiliencehub/aws-resiliencehub-app_physicalresourceid.go
@@ -1,9 +1,9 @@
 package resiliencehub
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // App_PhysicalResourceId AWS CloudFormation Resource (AWS::ResilienceHub::App.PhysicalResourceId)
diff --git a/goformation/cloudformation/resiliencehub/aws-resiliencehub-app_resourcemapping.go b/pkg/goformation/cloudformation/resiliencehub/aws-resiliencehub-app_resourcemapping.go
similarity index 94%
rename from goformation/cloudformation/resiliencehub/aws-resiliencehub-app_resourcemapping.go
rename to pkg/goformation/cloudformation/resiliencehub/aws-resiliencehub-app_resourcemapping.go
index da15620721..4086f591ad 100644
--- a/goformation/cloudformation/resiliencehub/aws-resiliencehub-app_resourcemapping.go
+++ b/pkg/goformation/cloudformation/resiliencehub/aws-resiliencehub-app_resourcemapping.go
@@ -1,9 +1,9 @@
 package resiliencehub
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // App_ResourceMapping AWS CloudFormation Resource (AWS::ResilienceHub::App.ResourceMapping)
diff --git a/goformation/cloudformation/resiliencehub/aws-resiliencehub-resiliencypolicy.go b/pkg/goformation/cloudformation/resiliencehub/aws-resiliencehub-resiliencypolicy.go
similarity index 97%
rename from goformation/cloudformation/resiliencehub/aws-resiliencehub-resiliencypolicy.go
rename to pkg/goformation/cloudformation/resiliencehub/aws-resiliencehub-resiliencypolicy.go
index 1858c14ae8..ba589d109f 100644
--- a/goformation/cloudformation/resiliencehub/aws-resiliencehub-resiliencypolicy.go
+++ b/pkg/goformation/cloudformation/resiliencehub/aws-resiliencehub-resiliencypolicy.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResiliencyPolicy AWS CloudFormation Resource (AWS::ResilienceHub::ResiliencyPolicy)
diff --git a/goformation/cloudformation/resiliencehub/aws-resiliencehub-resiliencypolicy_failurepolicy.go b/pkg/goformation/cloudformation/resiliencehub/aws-resiliencehub-resiliencypolicy_failurepolicy.go
similarity index 93%
rename from goformation/cloudformation/resiliencehub/aws-resiliencehub-resiliencypolicy_failurepolicy.go
rename to pkg/goformation/cloudformation/resiliencehub/aws-resiliencehub-resiliencypolicy_failurepolicy.go
index 87c0ec21f1..e3194ac2b9 100644
--- a/goformation/cloudformation/resiliencehub/aws-resiliencehub-resiliencypolicy_failurepolicy.go
+++ b/pkg/goformation/cloudformation/resiliencehub/aws-resiliencehub-resiliencypolicy_failurepolicy.go
@@ -1,9 +1,9 @@
 package resiliencehub
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResiliencyPolicy_FailurePolicy AWS CloudFormation Resource (AWS::ResilienceHub::ResiliencyPolicy.FailurePolicy)
diff --git a/goformation/cloudformation/resourcegroups/aws-resourcegroups-group.go b/pkg/goformation/cloudformation/resourcegroups/aws-resourcegroups-group.go
similarity index 95%
rename from goformation/cloudformation/resourcegroups/aws-resourcegroups-group.go
rename to pkg/goformation/cloudformation/resourcegroups/aws-resourcegroups-group.go
index dac7935a99..fff7f15bc6 100644
--- a/goformation/cloudformation/resourcegroups/aws-resourcegroups-group.go
+++ b/pkg/goformation/cloudformation/resourcegroups/aws-resourcegroups-group.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Group AWS CloudFormation Resource (AWS::ResourceGroups::Group)
diff --git a/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_configurationitem.go b/pkg/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_configurationitem.go
similarity index 93%
rename from goformation/cloudformation/resourcegroups/aws-resourcegroups-group_configurationitem.go
rename to pkg/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_configurationitem.go
index cb28ade42b..bea4a36e45 100644
--- a/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_configurationitem.go
+++ b/pkg/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_configurationitem.go
@@ -1,9 +1,9 @@
 package resourcegroups
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Group_ConfigurationItem AWS CloudFormation Resource (AWS::ResourceGroups::Group.ConfigurationItem)
diff --git a/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_configurationparameter.go b/pkg/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_configurationparameter.go
similarity index 93%
rename from goformation/cloudformation/resourcegroups/aws-resourcegroups-group_configurationparameter.go
rename to pkg/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_configurationparameter.go
index 705bf13acf..52f38ba2b8 100644
--- a/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_configurationparameter.go
+++ b/pkg/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_configurationparameter.go
@@ -1,9 +1,9 @@
 package resourcegroups
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Group_ConfigurationParameter AWS CloudFormation Resource (AWS::ResourceGroups::Group.ConfigurationParameter)
diff --git a/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_query.go b/pkg/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_query.go
similarity index 93%
rename from goformation/cloudformation/resourcegroups/aws-resourcegroups-group_query.go
rename to pkg/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_query.go
index b368480813..004bca370b 100644
--- a/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_query.go
+++ b/pkg/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_query.go
@@ -1,9 +1,9 @@
 package resourcegroups
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Group_Query AWS CloudFormation Resource (AWS::ResourceGroups::Group.Query)
diff --git a/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_resourcequery.go b/pkg/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_resourcequery.go
similarity index 92%
rename from goformation/cloudformation/resourcegroups/aws-resourcegroups-group_resourcequery.go
rename to pkg/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_resourcequery.go
index 1a996d6b23..af315d406e 100644
--- a/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_resourcequery.go
+++ b/pkg/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_resourcequery.go
@@ -1,9 +1,9 @@
 package resourcegroups
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Group_ResourceQuery AWS CloudFormation Resource (AWS::ResourceGroups::Group.ResourceQuery)
diff --git a/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_tagfilter.go b/pkg/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_tagfilter.go
similarity index 92%
rename from goformation/cloudformation/resourcegroups/aws-resourcegroups-group_tagfilter.go
rename to pkg/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_tagfilter.go
index cb9e6f21f5..0283662bbe 100644
--- a/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_tagfilter.go
+++ b/pkg/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_tagfilter.go
@@ -1,9 +1,9 @@
 package resourcegroups
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Group_TagFilter AWS CloudFormation Resource (AWS::ResourceGroups::Group.TagFilter)
diff --git a/goformation/cloudformation/robomaker/aws-robomaker-fleet.go b/pkg/goformation/cloudformation/robomaker/aws-robomaker-fleet.go
similarity index 96%
rename from goformation/cloudformation/robomaker/aws-robomaker-fleet.go
rename to pkg/goformation/cloudformation/robomaker/aws-robomaker-fleet.go
index 5e2d05c0dc..7269caa452 100644
--- a/goformation/cloudformation/robomaker/aws-robomaker-fleet.go
+++ b/pkg/goformation/cloudformation/robomaker/aws-robomaker-fleet.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Fleet AWS CloudFormation Resource (AWS::RoboMaker::Fleet)
diff --git a/goformation/cloudformation/robomaker/aws-robomaker-robot.go b/pkg/goformation/cloudformation/robomaker/aws-robomaker-robot.go
similarity index 97%
rename from goformation/cloudformation/robomaker/aws-robomaker-robot.go
rename to pkg/goformation/cloudformation/robomaker/aws-robomaker-robot.go
index 37a9334baa..d9b044ce06 100644
--- a/goformation/cloudformation/robomaker/aws-robomaker-robot.go
+++ b/pkg/goformation/cloudformation/robomaker/aws-robomaker-robot.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Robot AWS CloudFormation Resource (AWS::RoboMaker::Robot)
diff --git a/goformation/cloudformation/robomaker/aws-robomaker-robotapplication.go b/pkg/goformation/cloudformation/robomaker/aws-robomaker-robotapplication.go
similarity index 97%
rename from goformation/cloudformation/robomaker/aws-robomaker-robotapplication.go
rename to pkg/goformation/cloudformation/robomaker/aws-robomaker-robotapplication.go
index fc7819d308..47784b3f2b 100644
--- a/goformation/cloudformation/robomaker/aws-robomaker-robotapplication.go
+++ b/pkg/goformation/cloudformation/robomaker/aws-robomaker-robotapplication.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RobotApplication AWS CloudFormation Resource (AWS::RoboMaker::RobotApplication)
diff --git a/goformation/cloudformation/robomaker/aws-robomaker-robotapplication_robotsoftwaresuite.go b/pkg/goformation/cloudformation/robomaker/aws-robomaker-robotapplication_robotsoftwaresuite.go
similarity index 93%
rename from goformation/cloudformation/robomaker/aws-robomaker-robotapplication_robotsoftwaresuite.go
rename to pkg/goformation/cloudformation/robomaker/aws-robomaker-robotapplication_robotsoftwaresuite.go
index 9cc21d8040..9188dac83a 100644
--- a/goformation/cloudformation/robomaker/aws-robomaker-robotapplication_robotsoftwaresuite.go
+++ b/pkg/goformation/cloudformation/robomaker/aws-robomaker-robotapplication_robotsoftwaresuite.go
@@ -1,9 +1,9 @@
 package robomaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RobotApplication_RobotSoftwareSuite AWS CloudFormation Resource (AWS::RoboMaker::RobotApplication.RobotSoftwareSuite)
diff --git a/goformation/cloudformation/robomaker/aws-robomaker-robotapplication_sourceconfig.go b/pkg/goformation/cloudformation/robomaker/aws-robomaker-robotapplication_sourceconfig.go
similarity index 93%
rename from goformation/cloudformation/robomaker/aws-robomaker-robotapplication_sourceconfig.go
rename to pkg/goformation/cloudformation/robomaker/aws-robomaker-robotapplication_sourceconfig.go
index 2df0d94c27..7945cb661b 100644
--- a/goformation/cloudformation/robomaker/aws-robomaker-robotapplication_sourceconfig.go
+++ b/pkg/goformation/cloudformation/robomaker/aws-robomaker-robotapplication_sourceconfig.go
@@ -1,9 +1,9 @@
 package robomaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RobotApplication_SourceConfig AWS CloudFormation Resource (AWS::RoboMaker::RobotApplication.SourceConfig)
diff --git a/goformation/cloudformation/robomaker/aws-robomaker-robotapplicationversion.go b/pkg/goformation/cloudformation/robomaker/aws-robomaker-robotapplicationversion.go
similarity index 96%
rename from goformation/cloudformation/robomaker/aws-robomaker-robotapplicationversion.go
rename to pkg/goformation/cloudformation/robomaker/aws-robomaker-robotapplicationversion.go
index d9fb58db98..66f32aeb8f 100644
--- a/goformation/cloudformation/robomaker/aws-robomaker-robotapplicationversion.go
+++ b/pkg/goformation/cloudformation/robomaker/aws-robomaker-robotapplicationversion.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RobotApplicationVersion AWS CloudFormation Resource (AWS::RoboMaker::RobotApplicationVersion)
diff --git a/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication.go b/pkg/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication.go
similarity index 97%
rename from goformation/cloudformation/robomaker/aws-robomaker-simulationapplication.go
rename to pkg/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication.go
index b19ee54e3a..f39e98bd45 100644
--- a/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication.go
+++ b/pkg/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SimulationApplication AWS CloudFormation Resource (AWS::RoboMaker::SimulationApplication)
diff --git a/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_renderingengine.go b/pkg/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_renderingengine.go
similarity index 93%
rename from goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_renderingengine.go
rename to pkg/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_renderingengine.go
index 0e2e8623da..ed7216cf5e 100644
--- a/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_renderingengine.go
+++ b/pkg/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_renderingengine.go
@@ -1,9 +1,9 @@
 package robomaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SimulationApplication_RenderingEngine AWS CloudFormation Resource (AWS::RoboMaker::SimulationApplication.RenderingEngine)
diff --git a/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_robotsoftwaresuite.go b/pkg/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_robotsoftwaresuite.go
similarity index 93%
rename from goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_robotsoftwaresuite.go
rename to pkg/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_robotsoftwaresuite.go
index ea62e46bee..eb8f44db37 100644
--- a/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_robotsoftwaresuite.go
+++ b/pkg/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_robotsoftwaresuite.go
@@ -1,9 +1,9 @@
 package robomaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SimulationApplication_RobotSoftwareSuite AWS CloudFormation Resource (AWS::RoboMaker::SimulationApplication.RobotSoftwareSuite)
diff --git a/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_simulationsoftwaresuite.go b/pkg/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_simulationsoftwaresuite.go
similarity index 93%
rename from goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_simulationsoftwaresuite.go
rename to pkg/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_simulationsoftwaresuite.go
index 5195d41332..4a2e858922 100644
--- a/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_simulationsoftwaresuite.go
+++ b/pkg/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_simulationsoftwaresuite.go
@@ -1,9 +1,9 @@
 package robomaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SimulationApplication_SimulationSoftwareSuite AWS CloudFormation Resource (AWS::RoboMaker::SimulationApplication.SimulationSoftwareSuite)
diff --git a/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_sourceconfig.go b/pkg/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_sourceconfig.go
similarity index 94%
rename from goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_sourceconfig.go
rename to pkg/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_sourceconfig.go
index 9d39d6e4e9..dc14db743d 100644
--- a/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_sourceconfig.go
+++ b/pkg/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_sourceconfig.go
@@ -1,9 +1,9 @@
 package robomaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SimulationApplication_SourceConfig AWS CloudFormation Resource (AWS::RoboMaker::SimulationApplication.SourceConfig)
diff --git a/goformation/cloudformation/robomaker/aws-robomaker-simulationapplicationversion.go b/pkg/goformation/cloudformation/robomaker/aws-robomaker-simulationapplicationversion.go
similarity index 96%
rename from goformation/cloudformation/robomaker/aws-robomaker-simulationapplicationversion.go
rename to pkg/goformation/cloudformation/robomaker/aws-robomaker-simulationapplicationversion.go
index e0d2af4cc0..7440c32e71 100644
--- a/goformation/cloudformation/robomaker/aws-robomaker-simulationapplicationversion.go
+++ b/pkg/goformation/cloudformation/robomaker/aws-robomaker-simulationapplicationversion.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SimulationApplicationVersion AWS CloudFormation Resource (AWS::RoboMaker::SimulationApplicationVersion)
diff --git a/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-crl.go b/pkg/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-crl.go
similarity index 97%
rename from goformation/cloudformation/rolesanywhere/aws-rolesanywhere-crl.go
rename to pkg/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-crl.go
index 5ade327e2e..f32607c0bc 100644
--- a/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-crl.go
+++ b/pkg/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-crl.go
@@ -6,8 +6,8 @@ import (
 	"bytes"
 	"encoding/json"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
-	"github.com/awslabs/goformation/v4/cloudformation/tags"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/tags"
 )
 
 // CRL AWS CloudFormation Resource (AWS::RolesAnywhere::CRL)
diff --git a/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-profile.go b/pkg/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-profile.go
similarity index 96%
rename from goformation/cloudformation/rolesanywhere/aws-rolesanywhere-profile.go
rename to pkg/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-profile.go
index ae6a214ebe..34c22f4c8d 100644
--- a/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-profile.go
+++ b/pkg/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-profile.go
@@ -6,10 +6,10 @@ import (
 	"bytes"
 	"encoding/json"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
-	"github.com/awslabs/goformation/v4/cloudformation/tags"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/tags"
 )
 
 // Profile AWS CloudFormation Resource (AWS::RolesAnywhere::Profile)
diff --git a/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor.go b/pkg/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor.go
similarity index 96%
rename from goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor.go
rename to pkg/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor.go
index e3c7f9540a..e4f7a86291 100644
--- a/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor.go
+++ b/pkg/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor.go
@@ -6,10 +6,10 @@ import (
 	"bytes"
 	"encoding/json"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
-	"github.com/awslabs/goformation/v4/cloudformation/tags"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/tags"
 )
 
 // TrustAnchor AWS CloudFormation Resource (AWS::RolesAnywhere::TrustAnchor)
diff --git a/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_notificationsetting.go b/pkg/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_notificationsetting.go
similarity index 97%
rename from goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_notificationsetting.go
rename to pkg/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_notificationsetting.go
index 7e18a488a7..b564d896e9 100644
--- a/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_notificationsetting.go
+++ b/pkg/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_notificationsetting.go
@@ -3,7 +3,7 @@
 package rolesanywhere
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TrustAnchor_NotificationSetting AWS CloudFormation Resource (AWS::RolesAnywhere::TrustAnchor.NotificationSetting)
diff --git a/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_source.go b/pkg/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_source.go
similarity index 96%
rename from goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_source.go
rename to pkg/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_source.go
index e465492843..36636a7577 100644
--- a/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_source.go
+++ b/pkg/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_source.go
@@ -3,7 +3,7 @@
 package rolesanywhere
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TrustAnchor_Source AWS CloudFormation Resource (AWS::RolesAnywhere::TrustAnchor.Source)
diff --git a/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_sourcedata.go b/pkg/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_sourcedata.go
similarity index 96%
rename from goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_sourcedata.go
rename to pkg/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_sourcedata.go
index 24fe6dd39c..2eb888c4c6 100644
--- a/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_sourcedata.go
+++ b/pkg/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_sourcedata.go
@@ -3,7 +3,7 @@
 package rolesanywhere
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TrustAnchor_SourceData AWS CloudFormation Resource (AWS::RolesAnywhere::TrustAnchor.SourceData)
diff --git a/goformation/cloudformation/route53/aws-route53-dnssec.go b/pkg/goformation/cloudformation/route53/aws-route53-dnssec.go
similarity index 96%
rename from goformation/cloudformation/route53/aws-route53-dnssec.go
rename to pkg/goformation/cloudformation/route53/aws-route53-dnssec.go
index 8a326fc9f6..c41928ee43 100644
--- a/goformation/cloudformation/route53/aws-route53-dnssec.go
+++ b/pkg/goformation/cloudformation/route53/aws-route53-dnssec.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DNSSEC AWS CloudFormation Resource (AWS::Route53::DNSSEC)
diff --git a/goformation/cloudformation/route53/aws-route53-healthcheck.go b/pkg/goformation/cloudformation/route53/aws-route53-healthcheck.go
similarity index 98%
rename from goformation/cloudformation/route53/aws-route53-healthcheck.go
rename to pkg/goformation/cloudformation/route53/aws-route53-healthcheck.go
index 45762d3828..1261608b98 100644
--- a/goformation/cloudformation/route53/aws-route53-healthcheck.go
+++ b/pkg/goformation/cloudformation/route53/aws-route53-healthcheck.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // HealthCheck AWS CloudFormation Resource (AWS::Route53::HealthCheck)
diff --git a/goformation/cloudformation/route53/aws-route53-healthcheck_alarmidentifier.go b/pkg/goformation/cloudformation/route53/aws-route53-healthcheck_alarmidentifier.go
similarity index 92%
rename from goformation/cloudformation/route53/aws-route53-healthcheck_alarmidentifier.go
rename to pkg/goformation/cloudformation/route53/aws-route53-healthcheck_alarmidentifier.go
index a621b13165..3e40a5958a 100644
--- a/goformation/cloudformation/route53/aws-route53-healthcheck_alarmidentifier.go
+++ b/pkg/goformation/cloudformation/route53/aws-route53-healthcheck_alarmidentifier.go
@@ -1,9 +1,9 @@
 package route53
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // HealthCheck_AlarmIdentifier AWS CloudFormation Resource (AWS::Route53::HealthCheck.AlarmIdentifier)
diff --git a/goformation/cloudformation/route53/aws-route53-healthcheck_healthcheckconfig.go b/pkg/goformation/cloudformation/route53/aws-route53-healthcheck_healthcheckconfig.go
similarity index 97%
rename from goformation/cloudformation/route53/aws-route53-healthcheck_healthcheckconfig.go
rename to pkg/goformation/cloudformation/route53/aws-route53-healthcheck_healthcheckconfig.go
index b8ca22b9c8..ebc9a57745 100644
--- a/goformation/cloudformation/route53/aws-route53-healthcheck_healthcheckconfig.go
+++ b/pkg/goformation/cloudformation/route53/aws-route53-healthcheck_healthcheckconfig.go
@@ -1,9 +1,9 @@
 package route53
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // HealthCheck_HealthCheckConfig AWS CloudFormation Resource (AWS::Route53::HealthCheck.HealthCheckConfig)
diff --git a/goformation/cloudformation/route53/aws-route53-healthcheck_healthchecktag.go b/pkg/goformation/cloudformation/route53/aws-route53-healthcheck_healthchecktag.go
similarity index 92%
rename from goformation/cloudformation/route53/aws-route53-healthcheck_healthchecktag.go
rename to pkg/goformation/cloudformation/route53/aws-route53-healthcheck_healthchecktag.go
index c9dfc62567..9aef160e81 100644
--- a/goformation/cloudformation/route53/aws-route53-healthcheck_healthchecktag.go
+++ b/pkg/goformation/cloudformation/route53/aws-route53-healthcheck_healthchecktag.go
@@ -1,9 +1,9 @@
 package route53
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // HealthCheck_HealthCheckTag AWS CloudFormation Resource (AWS::Route53::HealthCheck.HealthCheckTag)
diff --git a/goformation/cloudformation/route53/aws-route53-hostedzone.go b/pkg/goformation/cloudformation/route53/aws-route53-hostedzone.go
similarity index 97%
rename from goformation/cloudformation/route53/aws-route53-hostedzone.go
rename to pkg/goformation/cloudformation/route53/aws-route53-hostedzone.go
index 3a862d4065..fa4eb30610 100644
--- a/goformation/cloudformation/route53/aws-route53-hostedzone.go
+++ b/pkg/goformation/cloudformation/route53/aws-route53-hostedzone.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // HostedZone AWS CloudFormation Resource (AWS::Route53::HostedZone)
diff --git a/goformation/cloudformation/route53/aws-route53-hostedzone_hostedzoneconfig.go b/pkg/goformation/cloudformation/route53/aws-route53-hostedzone_hostedzoneconfig.go
similarity index 91%
rename from goformation/cloudformation/route53/aws-route53-hostedzone_hostedzoneconfig.go
rename to pkg/goformation/cloudformation/route53/aws-route53-hostedzone_hostedzoneconfig.go
index b0eb66339c..419e56c937 100644
--- a/goformation/cloudformation/route53/aws-route53-hostedzone_hostedzoneconfig.go
+++ b/pkg/goformation/cloudformation/route53/aws-route53-hostedzone_hostedzoneconfig.go
@@ -1,9 +1,9 @@
 package route53
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // HostedZone_HostedZoneConfig AWS CloudFormation Resource (AWS::Route53::HostedZone.HostedZoneConfig)
diff --git a/goformation/cloudformation/route53/aws-route53-hostedzone_hostedzonetag.go b/pkg/goformation/cloudformation/route53/aws-route53-hostedzone_hostedzonetag.go
similarity index 92%
rename from goformation/cloudformation/route53/aws-route53-hostedzone_hostedzonetag.go
rename to pkg/goformation/cloudformation/route53/aws-route53-hostedzone_hostedzonetag.go
index d8670874c5..4372126ce8 100644
--- a/goformation/cloudformation/route53/aws-route53-hostedzone_hostedzonetag.go
+++ b/pkg/goformation/cloudformation/route53/aws-route53-hostedzone_hostedzonetag.go
@@ -1,9 +1,9 @@
 package route53
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // HostedZone_HostedZoneTag AWS CloudFormation Resource (AWS::Route53::HostedZone.HostedZoneTag)
diff --git a/goformation/cloudformation/route53/aws-route53-hostedzone_queryloggingconfig.go b/pkg/goformation/cloudformation/route53/aws-route53-hostedzone_queryloggingconfig.go
similarity index 92%
rename from goformation/cloudformation/route53/aws-route53-hostedzone_queryloggingconfig.go
rename to pkg/goformation/cloudformation/route53/aws-route53-hostedzone_queryloggingconfig.go
index af403c5285..0a24ff8317 100644
--- a/goformation/cloudformation/route53/aws-route53-hostedzone_queryloggingconfig.go
+++ b/pkg/goformation/cloudformation/route53/aws-route53-hostedzone_queryloggingconfig.go
@@ -1,9 +1,9 @@
 package route53
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // HostedZone_QueryLoggingConfig AWS CloudFormation Resource (AWS::Route53::HostedZone.QueryLoggingConfig)
diff --git a/goformation/cloudformation/route53/aws-route53-hostedzone_vpc.go b/pkg/goformation/cloudformation/route53/aws-route53-hostedzone_vpc.go
similarity index 92%
rename from goformation/cloudformation/route53/aws-route53-hostedzone_vpc.go
rename to pkg/goformation/cloudformation/route53/aws-route53-hostedzone_vpc.go
index 8511538b89..33e8f67356 100644
--- a/goformation/cloudformation/route53/aws-route53-hostedzone_vpc.go
+++ b/pkg/goformation/cloudformation/route53/aws-route53-hostedzone_vpc.go
@@ -1,9 +1,9 @@
 package route53
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // HostedZone_VPC AWS CloudFormation Resource (AWS::Route53::HostedZone.VPC)
diff --git a/goformation/cloudformation/route53/aws-route53-keysigningkey.go b/pkg/goformation/cloudformation/route53/aws-route53-keysigningkey.go
similarity index 97%
rename from goformation/cloudformation/route53/aws-route53-keysigningkey.go
rename to pkg/goformation/cloudformation/route53/aws-route53-keysigningkey.go
index 6f4ae6e826..02eead28d6 100644
--- a/goformation/cloudformation/route53/aws-route53-keysigningkey.go
+++ b/pkg/goformation/cloudformation/route53/aws-route53-keysigningkey.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // KeySigningKey AWS CloudFormation Resource (AWS::Route53::KeySigningKey)
diff --git a/goformation/cloudformation/route53/aws-route53-recordset.go b/pkg/goformation/cloudformation/route53/aws-route53-recordset.go
similarity index 98%
rename from goformation/cloudformation/route53/aws-route53-recordset.go
rename to pkg/goformation/cloudformation/route53/aws-route53-recordset.go
index 3958872485..32f7009990 100644
--- a/goformation/cloudformation/route53/aws-route53-recordset.go
+++ b/pkg/goformation/cloudformation/route53/aws-route53-recordset.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RecordSet AWS CloudFormation Resource (AWS::Route53::RecordSet)
diff --git a/goformation/cloudformation/route53/aws-route53-recordset_aliastarget.go b/pkg/goformation/cloudformation/route53/aws-route53-recordset_aliastarget.go
similarity index 93%
rename from goformation/cloudformation/route53/aws-route53-recordset_aliastarget.go
rename to pkg/goformation/cloudformation/route53/aws-route53-recordset_aliastarget.go
index 63940e1f00..d0975af568 100644
--- a/goformation/cloudformation/route53/aws-route53-recordset_aliastarget.go
+++ b/pkg/goformation/cloudformation/route53/aws-route53-recordset_aliastarget.go
@@ -1,9 +1,9 @@
 package route53
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RecordSet_AliasTarget AWS CloudFormation Resource (AWS::Route53::RecordSet.AliasTarget)
diff --git a/goformation/cloudformation/route53/aws-route53-recordset_geolocation.go b/pkg/goformation/cloudformation/route53/aws-route53-recordset_geolocation.go
similarity index 93%
rename from goformation/cloudformation/route53/aws-route53-recordset_geolocation.go
rename to pkg/goformation/cloudformation/route53/aws-route53-recordset_geolocation.go
index fd7198513a..dc0abf80cf 100644
--- a/goformation/cloudformation/route53/aws-route53-recordset_geolocation.go
+++ b/pkg/goformation/cloudformation/route53/aws-route53-recordset_geolocation.go
@@ -1,9 +1,9 @@
 package route53
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RecordSet_GeoLocation AWS CloudFormation Resource (AWS::Route53::RecordSet.GeoLocation)
diff --git a/goformation/cloudformation/route53/aws-route53-recordsetgroup.go b/pkg/goformation/cloudformation/route53/aws-route53-recordsetgroup.go
similarity index 97%
rename from goformation/cloudformation/route53/aws-route53-recordsetgroup.go
rename to pkg/goformation/cloudformation/route53/aws-route53-recordsetgroup.go
index 3f929533fc..7952fb01e5 100644
--- a/goformation/cloudformation/route53/aws-route53-recordsetgroup.go
+++ b/pkg/goformation/cloudformation/route53/aws-route53-recordsetgroup.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RecordSetGroup AWS CloudFormation Resource (AWS::Route53::RecordSetGroup)
diff --git a/goformation/cloudformation/route53/aws-route53-recordsetgroup_aliastarget.go b/pkg/goformation/cloudformation/route53/aws-route53-recordsetgroup_aliastarget.go
similarity index 93%
rename from goformation/cloudformation/route53/aws-route53-recordsetgroup_aliastarget.go
rename to pkg/goformation/cloudformation/route53/aws-route53-recordsetgroup_aliastarget.go
index 69424eb7ef..4f5f4370a7 100644
--- a/goformation/cloudformation/route53/aws-route53-recordsetgroup_aliastarget.go
+++ b/pkg/goformation/cloudformation/route53/aws-route53-recordsetgroup_aliastarget.go
@@ -1,9 +1,9 @@
 package route53
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RecordSetGroup_AliasTarget AWS CloudFormation Resource (AWS::Route53::RecordSetGroup.AliasTarget)
diff --git a/goformation/cloudformation/route53/aws-route53-recordsetgroup_geolocation.go b/pkg/goformation/cloudformation/route53/aws-route53-recordsetgroup_geolocation.go
similarity index 93%
rename from goformation/cloudformation/route53/aws-route53-recordsetgroup_geolocation.go
rename to pkg/goformation/cloudformation/route53/aws-route53-recordsetgroup_geolocation.go
index c0515b90cb..671612f1d4 100644
--- a/goformation/cloudformation/route53/aws-route53-recordsetgroup_geolocation.go
+++ b/pkg/goformation/cloudformation/route53/aws-route53-recordsetgroup_geolocation.go
@@ -1,9 +1,9 @@
 package route53
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RecordSetGroup_GeoLocation AWS CloudFormation Resource (AWS::Route53::RecordSetGroup.GeoLocation)
diff --git a/goformation/cloudformation/route53/aws-route53-recordsetgroup_recordset.go b/pkg/goformation/cloudformation/route53/aws-route53-recordsetgroup_recordset.go
similarity index 97%
rename from goformation/cloudformation/route53/aws-route53-recordsetgroup_recordset.go
rename to pkg/goformation/cloudformation/route53/aws-route53-recordsetgroup_recordset.go
index c081b6f10a..353ae6be6f 100644
--- a/goformation/cloudformation/route53/aws-route53-recordsetgroup_recordset.go
+++ b/pkg/goformation/cloudformation/route53/aws-route53-recordsetgroup_recordset.go
@@ -1,9 +1,9 @@
 package route53
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RecordSetGroup_RecordSet AWS CloudFormation Resource (AWS::Route53::RecordSetGroup.RecordSet)
diff --git a/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-cluster.go b/pkg/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-cluster.go
similarity index 95%
rename from goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-cluster.go
rename to pkg/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-cluster.go
index dd5f76daa3..2fcad16c51 100644
--- a/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-cluster.go
+++ b/pkg/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-cluster.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster AWS CloudFormation Resource (AWS::Route53RecoveryControl::Cluster)
diff --git a/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-cluster_clusterendpoint.go b/pkg/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-cluster_clusterendpoint.go
similarity index 93%
rename from goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-cluster_clusterendpoint.go
rename to pkg/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-cluster_clusterendpoint.go
index baba4e000d..259ef30601 100644
--- a/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-cluster_clusterendpoint.go
+++ b/pkg/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-cluster_clusterendpoint.go
@@ -1,9 +1,9 @@
 package route53recoverycontrol
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cluster_ClusterEndpoint AWS CloudFormation Resource (AWS::Route53RecoveryControl::Cluster.ClusterEndpoint)
diff --git a/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-controlpanel.go b/pkg/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-controlpanel.go
similarity index 95%
rename from goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-controlpanel.go
rename to pkg/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-controlpanel.go
index 61665cc0a8..e8a6a9f310 100644
--- a/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-controlpanel.go
+++ b/pkg/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-controlpanel.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ControlPanel AWS CloudFormation Resource (AWS::Route53RecoveryControl::ControlPanel)
diff --git a/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-routingcontrol.go b/pkg/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-routingcontrol.go
similarity index 97%
rename from goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-routingcontrol.go
rename to pkg/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-routingcontrol.go
index 929a150698..00457f14f5 100644
--- a/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-routingcontrol.go
+++ b/pkg/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-routingcontrol.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RoutingControl AWS CloudFormation Resource (AWS::Route53RecoveryControl::RoutingControl)
diff --git a/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule.go b/pkg/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule.go
similarity index 96%
rename from goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule.go
rename to pkg/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule.go
index 250d828c1b..82c173152c 100644
--- a/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule.go
+++ b/pkg/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SafetyRule AWS CloudFormation Resource (AWS::Route53RecoveryControl::SafetyRule)
diff --git a/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_assertionrule.go b/pkg/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_assertionrule.go
similarity index 93%
rename from goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_assertionrule.go
rename to pkg/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_assertionrule.go
index 1cf96318ca..034f8b8e74 100644
--- a/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_assertionrule.go
+++ b/pkg/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_assertionrule.go
@@ -1,9 +1,9 @@
 package route53recoverycontrol
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SafetyRule_AssertionRule AWS CloudFormation Resource (AWS::Route53RecoveryControl::SafetyRule.AssertionRule)
diff --git a/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_gatingrule.go b/pkg/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_gatingrule.go
similarity index 94%
rename from goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_gatingrule.go
rename to pkg/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_gatingrule.go
index 40b799bbb5..51857f8656 100644
--- a/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_gatingrule.go
+++ b/pkg/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_gatingrule.go
@@ -1,9 +1,9 @@
 package route53recoverycontrol
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SafetyRule_GatingRule AWS CloudFormation Resource (AWS::Route53RecoveryControl::SafetyRule.GatingRule)
diff --git a/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_ruleconfig.go b/pkg/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_ruleconfig.go
similarity index 93%
rename from goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_ruleconfig.go
rename to pkg/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_ruleconfig.go
index a64e7c3905..829ec8f723 100644
--- a/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_ruleconfig.go
+++ b/pkg/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_ruleconfig.go
@@ -1,9 +1,9 @@
 package route53recoverycontrol
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SafetyRule_RuleConfig AWS CloudFormation Resource (AWS::Route53RecoveryControl::SafetyRule.RuleConfig)
diff --git a/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-cell.go b/pkg/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-cell.go
similarity index 95%
rename from goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-cell.go
rename to pkg/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-cell.go
index 330557e9b2..021fa3e4c8 100644
--- a/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-cell.go
+++ b/pkg/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-cell.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Cell AWS CloudFormation Resource (AWS::Route53RecoveryReadiness::Cell)
diff --git a/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-readinesscheck.go b/pkg/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-readinesscheck.go
similarity index 95%
rename from goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-readinesscheck.go
rename to pkg/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-readinesscheck.go
index b69449a8c7..dfbbfea375 100644
--- a/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-readinesscheck.go
+++ b/pkg/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-readinesscheck.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReadinessCheck AWS CloudFormation Resource (AWS::Route53RecoveryReadiness::ReadinessCheck)
diff --git a/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-recoverygroup.go b/pkg/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-recoverygroup.go
similarity index 95%
rename from goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-recoverygroup.go
rename to pkg/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-recoverygroup.go
index 8e3f745fbb..93e4db45ab 100644
--- a/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-recoverygroup.go
+++ b/pkg/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-recoverygroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RecoveryGroup AWS CloudFormation Resource (AWS::Route53RecoveryReadiness::RecoveryGroup)
diff --git a/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset.go b/pkg/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset.go
similarity index 95%
rename from goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset.go
rename to pkg/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset.go
index ce2b80d21f..cabdb4ca4c 100644
--- a/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset.go
+++ b/pkg/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceSet AWS CloudFormation Resource (AWS::Route53RecoveryReadiness::ResourceSet)
diff --git a/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_dnstargetresource.go b/pkg/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_dnstargetresource.go
similarity index 95%
rename from goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_dnstargetresource.go
rename to pkg/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_dnstargetresource.go
index b9fa427cf1..b214b06010 100644
--- a/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_dnstargetresource.go
+++ b/pkg/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_dnstargetresource.go
@@ -1,9 +1,9 @@
 package route53recoveryreadiness
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceSet_DNSTargetResource AWS CloudFormation Resource (AWS::Route53RecoveryReadiness::ResourceSet.DNSTargetResource)
diff --git a/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_nlbresource.go b/pkg/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_nlbresource.go
similarity index 92%
rename from goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_nlbresource.go
rename to pkg/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_nlbresource.go
index 1d3438c360..299fb56c5b 100644
--- a/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_nlbresource.go
+++ b/pkg/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_nlbresource.go
@@ -1,9 +1,9 @@
 package route53recoveryreadiness
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceSet_NLBResource AWS CloudFormation Resource (AWS::Route53RecoveryReadiness::ResourceSet.NLBResource)
diff --git a/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_r53resourcerecord.go b/pkg/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_r53resourcerecord.go
similarity index 93%
rename from goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_r53resourcerecord.go
rename to pkg/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_r53resourcerecord.go
index a33f97e397..7ed5d78719 100644
--- a/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_r53resourcerecord.go
+++ b/pkg/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_r53resourcerecord.go
@@ -1,9 +1,9 @@
 package route53recoveryreadiness
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceSet_R53ResourceRecord AWS CloudFormation Resource (AWS::Route53RecoveryReadiness::ResourceSet.R53ResourceRecord)
diff --git a/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_resource.go b/pkg/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_resource.go
similarity index 94%
rename from goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_resource.go
rename to pkg/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_resource.go
index 7b9d41fb33..1019b0901b 100644
--- a/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_resource.go
+++ b/pkg/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_resource.go
@@ -1,9 +1,9 @@
 package route53recoveryreadiness
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceSet_Resource AWS CloudFormation Resource (AWS::Route53RecoveryReadiness::ResourceSet.Resource)
diff --git a/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_targetresource.go b/pkg/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_targetresource.go
similarity index 96%
rename from goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_targetresource.go
rename to pkg/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_targetresource.go
index 605c3e699b..33095f2c3a 100644
--- a/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_targetresource.go
+++ b/pkg/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_targetresource.go
@@ -1,7 +1,7 @@
 package route53recoveryreadiness
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceSet_TargetResource AWS CloudFormation Resource (AWS::Route53RecoveryReadiness::ResourceSet.TargetResource)
diff --git a/goformation/cloudformation/route53resolver/aws-route53resolver-firewalldomainlist.go b/pkg/goformation/cloudformation/route53resolver/aws-route53resolver-firewalldomainlist.go
similarity index 95%
rename from goformation/cloudformation/route53resolver/aws-route53resolver-firewalldomainlist.go
rename to pkg/goformation/cloudformation/route53resolver/aws-route53resolver-firewalldomainlist.go
index b9af800165..1d2ae8e8f0 100644
--- a/goformation/cloudformation/route53resolver/aws-route53resolver-firewalldomainlist.go
+++ b/pkg/goformation/cloudformation/route53resolver/aws-route53resolver-firewalldomainlist.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FirewallDomainList AWS CloudFormation Resource (AWS::Route53Resolver::FirewallDomainList)
diff --git a/goformation/cloudformation/route53resolver/aws-route53resolver-firewallrulegroup.go b/pkg/goformation/cloudformation/route53resolver/aws-route53resolver-firewallrulegroup.go
similarity index 95%
rename from goformation/cloudformation/route53resolver/aws-route53resolver-firewallrulegroup.go
rename to pkg/goformation/cloudformation/route53resolver/aws-route53resolver-firewallrulegroup.go
index 2d14935843..1a46729157 100644
--- a/goformation/cloudformation/route53resolver/aws-route53resolver-firewallrulegroup.go
+++ b/pkg/goformation/cloudformation/route53resolver/aws-route53resolver-firewallrulegroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FirewallRuleGroup AWS CloudFormation Resource (AWS::Route53Resolver::FirewallRuleGroup)
diff --git a/goformation/cloudformation/route53resolver/aws-route53resolver-firewallrulegroup_firewallrule.go b/pkg/goformation/cloudformation/route53resolver/aws-route53resolver-firewallrulegroup_firewallrule.go
similarity index 96%
rename from goformation/cloudformation/route53resolver/aws-route53resolver-firewallrulegroup_firewallrule.go
rename to pkg/goformation/cloudformation/route53resolver/aws-route53resolver-firewallrulegroup_firewallrule.go
index 83c1c2e8c7..d8341e00a6 100644
--- a/goformation/cloudformation/route53resolver/aws-route53resolver-firewallrulegroup_firewallrule.go
+++ b/pkg/goformation/cloudformation/route53resolver/aws-route53resolver-firewallrulegroup_firewallrule.go
@@ -1,9 +1,9 @@
 package route53resolver
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FirewallRuleGroup_FirewallRule AWS CloudFormation Resource (AWS::Route53Resolver::FirewallRuleGroup.FirewallRule)
diff --git a/goformation/cloudformation/route53resolver/aws-route53resolver-firewallrulegroupassociation.go b/pkg/goformation/cloudformation/route53resolver/aws-route53resolver-firewallrulegroupassociation.go
similarity index 96%
rename from goformation/cloudformation/route53resolver/aws-route53resolver-firewallrulegroupassociation.go
rename to pkg/goformation/cloudformation/route53resolver/aws-route53resolver-firewallrulegroupassociation.go
index 5249fbb52c..076e895a88 100644
--- a/goformation/cloudformation/route53resolver/aws-route53resolver-firewallrulegroupassociation.go
+++ b/pkg/goformation/cloudformation/route53resolver/aws-route53resolver-firewallrulegroupassociation.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FirewallRuleGroupAssociation AWS CloudFormation Resource (AWS::Route53Resolver::FirewallRuleGroupAssociation)
diff --git a/goformation/cloudformation/route53resolver/aws-route53resolver-resolverconfig.go b/pkg/goformation/cloudformation/route53resolver/aws-route53resolver-resolverconfig.go
similarity index 96%
rename from goformation/cloudformation/route53resolver/aws-route53resolver-resolverconfig.go
rename to pkg/goformation/cloudformation/route53resolver/aws-route53resolver-resolverconfig.go
index 5ca2ac7db7..f478cdea55 100644
--- a/goformation/cloudformation/route53resolver/aws-route53resolver-resolverconfig.go
+++ b/pkg/goformation/cloudformation/route53resolver/aws-route53resolver-resolverconfig.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResolverConfig AWS CloudFormation Resource (AWS::Route53Resolver::ResolverConfig)
diff --git a/goformation/cloudformation/route53resolver/aws-route53resolver-resolverdnssecconfig.go b/pkg/goformation/cloudformation/route53resolver/aws-route53resolver-resolverdnssecconfig.go
similarity index 96%
rename from goformation/cloudformation/route53resolver/aws-route53resolver-resolverdnssecconfig.go
rename to pkg/goformation/cloudformation/route53resolver/aws-route53resolver-resolverdnssecconfig.go
index fe4d481d7f..2a359355c6 100644
--- a/goformation/cloudformation/route53resolver/aws-route53resolver-resolverdnssecconfig.go
+++ b/pkg/goformation/cloudformation/route53resolver/aws-route53resolver-resolverdnssecconfig.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResolverDNSSECConfig AWS CloudFormation Resource (AWS::Route53Resolver::ResolverDNSSECConfig)
diff --git a/goformation/cloudformation/route53resolver/aws-route53resolver-resolverendpoint.go b/pkg/goformation/cloudformation/route53resolver/aws-route53resolver-resolverendpoint.go
similarity index 95%
rename from goformation/cloudformation/route53resolver/aws-route53resolver-resolverendpoint.go
rename to pkg/goformation/cloudformation/route53resolver/aws-route53resolver-resolverendpoint.go
index 4e4aaba7a4..449aee1640 100644
--- a/goformation/cloudformation/route53resolver/aws-route53resolver-resolverendpoint.go
+++ b/pkg/goformation/cloudformation/route53resolver/aws-route53resolver-resolverendpoint.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResolverEndpoint AWS CloudFormation Resource (AWS::Route53Resolver::ResolverEndpoint)
diff --git a/goformation/cloudformation/route53resolver/aws-route53resolver-resolverendpoint_ipaddressrequest.go b/pkg/goformation/cloudformation/route53resolver/aws-route53resolver-resolverendpoint_ipaddressrequest.go
similarity index 93%
rename from goformation/cloudformation/route53resolver/aws-route53resolver-resolverendpoint_ipaddressrequest.go
rename to pkg/goformation/cloudformation/route53resolver/aws-route53resolver-resolverendpoint_ipaddressrequest.go
index 58c900c182..6aec195066 100644
--- a/goformation/cloudformation/route53resolver/aws-route53resolver-resolverendpoint_ipaddressrequest.go
+++ b/pkg/goformation/cloudformation/route53resolver/aws-route53resolver-resolverendpoint_ipaddressrequest.go
@@ -1,9 +1,9 @@
 package route53resolver
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResolverEndpoint_IpAddressRequest AWS CloudFormation Resource (AWS::Route53Resolver::ResolverEndpoint.IpAddressRequest)
diff --git a/goformation/cloudformation/route53resolver/aws-route53resolver-resolverqueryloggingconfig.go b/pkg/goformation/cloudformation/route53resolver/aws-route53resolver-resolverqueryloggingconfig.go
similarity index 96%
rename from goformation/cloudformation/route53resolver/aws-route53resolver-resolverqueryloggingconfig.go
rename to pkg/goformation/cloudformation/route53resolver/aws-route53resolver-resolverqueryloggingconfig.go
index 168fd1b0c0..a45dfdc311 100644
--- a/goformation/cloudformation/route53resolver/aws-route53resolver-resolverqueryloggingconfig.go
+++ b/pkg/goformation/cloudformation/route53resolver/aws-route53resolver-resolverqueryloggingconfig.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResolverQueryLoggingConfig AWS CloudFormation Resource (AWS::Route53Resolver::ResolverQueryLoggingConfig)
diff --git a/goformation/cloudformation/route53resolver/aws-route53resolver-resolverqueryloggingconfigassociation.go b/pkg/goformation/cloudformation/route53resolver/aws-route53resolver-resolverqueryloggingconfigassociation.go
similarity index 97%
rename from goformation/cloudformation/route53resolver/aws-route53resolver-resolverqueryloggingconfigassociation.go
rename to pkg/goformation/cloudformation/route53resolver/aws-route53resolver-resolverqueryloggingconfigassociation.go
index d77b112967..c3b3c8ac45 100644
--- a/goformation/cloudformation/route53resolver/aws-route53resolver-resolverqueryloggingconfigassociation.go
+++ b/pkg/goformation/cloudformation/route53resolver/aws-route53resolver-resolverqueryloggingconfigassociation.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResolverQueryLoggingConfigAssociation AWS CloudFormation Resource (AWS::Route53Resolver::ResolverQueryLoggingConfigAssociation)
diff --git a/goformation/cloudformation/route53resolver/aws-route53resolver-resolverrule.go b/pkg/goformation/cloudformation/route53resolver/aws-route53resolver-resolverrule.go
similarity index 96%
rename from goformation/cloudformation/route53resolver/aws-route53resolver-resolverrule.go
rename to pkg/goformation/cloudformation/route53resolver/aws-route53resolver-resolverrule.go
index 7caeb936fc..8eb0a9ee17 100644
--- a/goformation/cloudformation/route53resolver/aws-route53resolver-resolverrule.go
+++ b/pkg/goformation/cloudformation/route53resolver/aws-route53resolver-resolverrule.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResolverRule AWS CloudFormation Resource (AWS::Route53Resolver::ResolverRule)
diff --git a/goformation/cloudformation/route53resolver/aws-route53resolver-resolverrule_targetaddress.go b/pkg/goformation/cloudformation/route53resolver/aws-route53resolver-resolverrule_targetaddress.go
similarity index 93%
rename from goformation/cloudformation/route53resolver/aws-route53resolver-resolverrule_targetaddress.go
rename to pkg/goformation/cloudformation/route53resolver/aws-route53resolver-resolverrule_targetaddress.go
index 0d9d75868d..4f8c40c204 100644
--- a/goformation/cloudformation/route53resolver/aws-route53resolver-resolverrule_targetaddress.go
+++ b/pkg/goformation/cloudformation/route53resolver/aws-route53resolver-resolverrule_targetaddress.go
@@ -1,9 +1,9 @@
 package route53resolver
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResolverRule_TargetAddress AWS CloudFormation Resource (AWS::Route53Resolver::ResolverRule.TargetAddress)
diff --git a/goformation/cloudformation/route53resolver/aws-route53resolver-resolverruleassociation.go b/pkg/goformation/cloudformation/route53resolver/aws-route53resolver-resolverruleassociation.go
similarity index 97%
rename from goformation/cloudformation/route53resolver/aws-route53resolver-resolverruleassociation.go
rename to pkg/goformation/cloudformation/route53resolver/aws-route53resolver-resolverruleassociation.go
index 24f31e35c7..933528cd2e 100644
--- a/goformation/cloudformation/route53resolver/aws-route53resolver-resolverruleassociation.go
+++ b/pkg/goformation/cloudformation/route53resolver/aws-route53resolver-resolverruleassociation.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResolverRuleAssociation AWS CloudFormation Resource (AWS::Route53Resolver::ResolverRuleAssociation)
diff --git a/goformation/cloudformation/rum/aws-rum-appmonitor.go b/pkg/goformation/cloudformation/rum/aws-rum-appmonitor.go
similarity index 95%
rename from goformation/cloudformation/rum/aws-rum-appmonitor.go
rename to pkg/goformation/cloudformation/rum/aws-rum-appmonitor.go
index 3532127f8d..709a8a3e20 100644
--- a/goformation/cloudformation/rum/aws-rum-appmonitor.go
+++ b/pkg/goformation/cloudformation/rum/aws-rum-appmonitor.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AppMonitor AWS CloudFormation Resource (AWS::RUM::AppMonitor)
diff --git a/goformation/cloudformation/rum/aws-rum-appmonitor_appmonitorconfiguration.go b/pkg/goformation/cloudformation/rum/aws-rum-appmonitor_appmonitorconfiguration.go
similarity index 96%
rename from goformation/cloudformation/rum/aws-rum-appmonitor_appmonitorconfiguration.go
rename to pkg/goformation/cloudformation/rum/aws-rum-appmonitor_appmonitorconfiguration.go
index 66d8116158..426cf4465e 100644
--- a/goformation/cloudformation/rum/aws-rum-appmonitor_appmonitorconfiguration.go
+++ b/pkg/goformation/cloudformation/rum/aws-rum-appmonitor_appmonitorconfiguration.go
@@ -1,9 +1,9 @@
 package rum
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AppMonitor_AppMonitorConfiguration AWS CloudFormation Resource (AWS::RUM::AppMonitor.AppMonitorConfiguration)
diff --git a/goformation/cloudformation/s3/aws-s3-accesspoint.go b/pkg/goformation/cloudformation/s3/aws-s3-accesspoint.go
similarity index 97%
rename from goformation/cloudformation/s3/aws-s3-accesspoint.go
rename to pkg/goformation/cloudformation/s3/aws-s3-accesspoint.go
index 1c68f5e78b..fab6d3e45c 100644
--- a/goformation/cloudformation/s3/aws-s3-accesspoint.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-accesspoint.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AccessPoint AWS CloudFormation Resource (AWS::S3::AccessPoint)
diff --git a/goformation/cloudformation/s3/aws-s3-accesspoint_publicaccessblockconfiguration.go b/pkg/goformation/cloudformation/s3/aws-s3-accesspoint_publicaccessblockconfiguration.go
similarity index 95%
rename from goformation/cloudformation/s3/aws-s3-accesspoint_publicaccessblockconfiguration.go
rename to pkg/goformation/cloudformation/s3/aws-s3-accesspoint_publicaccessblockconfiguration.go
index aee5e62cb1..496b8286a4 100644
--- a/goformation/cloudformation/s3/aws-s3-accesspoint_publicaccessblockconfiguration.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-accesspoint_publicaccessblockconfiguration.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AccessPoint_PublicAccessBlockConfiguration AWS CloudFormation Resource (AWS::S3::AccessPoint.PublicAccessBlockConfiguration)
diff --git a/goformation/cloudformation/s3/aws-s3-accesspoint_vpcconfiguration.go b/pkg/goformation/cloudformation/s3/aws-s3-accesspoint_vpcconfiguration.go
similarity index 91%
rename from goformation/cloudformation/s3/aws-s3-accesspoint_vpcconfiguration.go
rename to pkg/goformation/cloudformation/s3/aws-s3-accesspoint_vpcconfiguration.go
index 133a80bb56..2ec911a516 100644
--- a/goformation/cloudformation/s3/aws-s3-accesspoint_vpcconfiguration.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-accesspoint_vpcconfiguration.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AccessPoint_VpcConfiguration AWS CloudFormation Resource (AWS::S3::AccessPoint.VpcConfiguration)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket.go
similarity index 97%
rename from goformation/cloudformation/s3/aws-s3-bucket.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket.go
index 0d6af426a0..81409f9544 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket AWS CloudFormation Resource (AWS::S3::Bucket)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_abortincompletemultipartupload.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_abortincompletemultipartupload.go
similarity index 92%
rename from goformation/cloudformation/s3/aws-s3-bucket_abortincompletemultipartupload.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_abortincompletemultipartupload.go
index df6cc5320c..9fe2dee319 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_abortincompletemultipartupload.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_abortincompletemultipartupload.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_AbortIncompleteMultipartUpload AWS CloudFormation Resource (AWS::S3::Bucket.AbortIncompleteMultipartUpload)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_accelerateconfiguration.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_accelerateconfiguration.go
similarity index 91%
rename from goformation/cloudformation/s3/aws-s3-bucket_accelerateconfiguration.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_accelerateconfiguration.go
index 27c008551f..ccdd9f5bf3 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_accelerateconfiguration.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_accelerateconfiguration.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_AccelerateConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.AccelerateConfiguration)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_accesscontroltranslation.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_accesscontroltranslation.go
similarity index 91%
rename from goformation/cloudformation/s3/aws-s3-bucket_accesscontroltranslation.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_accesscontroltranslation.go
index 41ecac2788..eee93f3e4c 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_accesscontroltranslation.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_accesscontroltranslation.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_AccessControlTranslation AWS CloudFormation Resource (AWS::S3::Bucket.AccessControlTranslation)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_analyticsconfiguration.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_analyticsconfiguration.go
similarity index 94%
rename from goformation/cloudformation/s3/aws-s3-bucket_analyticsconfiguration.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_analyticsconfiguration.go
index 00d7ea27b8..2c6587c7c0 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_analyticsconfiguration.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_analyticsconfiguration.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_AnalyticsConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.AnalyticsConfiguration)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_bucketencryption.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_bucketencryption.go
similarity index 95%
rename from goformation/cloudformation/s3/aws-s3-bucket_bucketencryption.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_bucketencryption.go
index 8a478b6023..e53c188fe5 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_bucketencryption.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_bucketencryption.go
@@ -1,7 +1,7 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_BucketEncryption AWS CloudFormation Resource (AWS::S3::Bucket.BucketEncryption)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_corsconfiguration.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_corsconfiguration.go
similarity index 95%
rename from goformation/cloudformation/s3/aws-s3-bucket_corsconfiguration.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_corsconfiguration.go
index f09aab6bf5..05d3de068c 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_corsconfiguration.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_corsconfiguration.go
@@ -1,7 +1,7 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_CorsConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.CorsConfiguration)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_corsrule.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_corsrule.go
similarity index 95%
rename from goformation/cloudformation/s3/aws-s3-bucket_corsrule.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_corsrule.go
index 3ed1e0a760..e59312593a 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_corsrule.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_corsrule.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_CorsRule AWS CloudFormation Resource (AWS::S3::Bucket.CorsRule)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_dataexport.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_dataexport.go
similarity index 92%
rename from goformation/cloudformation/s3/aws-s3-bucket_dataexport.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_dataexport.go
index 5b4d17e5ab..08d803568c 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_dataexport.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_dataexport.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_DataExport AWS CloudFormation Resource (AWS::S3::Bucket.DataExport)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_defaultretention.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_defaultretention.go
similarity index 93%
rename from goformation/cloudformation/s3/aws-s3-bucket_defaultretention.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_defaultretention.go
index cb0215442e..0916c88072 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_defaultretention.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_defaultretention.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_DefaultRetention AWS CloudFormation Resource (AWS::S3::Bucket.DefaultRetention)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_deletemarkerreplication.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_deletemarkerreplication.go
similarity index 91%
rename from goformation/cloudformation/s3/aws-s3-bucket_deletemarkerreplication.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_deletemarkerreplication.go
index 38b1baaedd..74ed4784f2 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_deletemarkerreplication.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_deletemarkerreplication.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_DeleteMarkerReplication AWS CloudFormation Resource (AWS::S3::Bucket.DeleteMarkerReplication)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_destination.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_destination.go
similarity index 94%
rename from goformation/cloudformation/s3/aws-s3-bucket_destination.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_destination.go
index de815dc494..245c7681da 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_destination.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_destination.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_Destination AWS CloudFormation Resource (AWS::S3::Bucket.Destination)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_encryptionconfiguration.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_encryptionconfiguration.go
similarity index 91%
rename from goformation/cloudformation/s3/aws-s3-bucket_encryptionconfiguration.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_encryptionconfiguration.go
index 0ef826e7cc..87d30f6eb4 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_encryptionconfiguration.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_encryptionconfiguration.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_EncryptionConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.EncryptionConfiguration)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_eventbridgeconfiguration.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_eventbridgeconfiguration.go
similarity index 92%
rename from goformation/cloudformation/s3/aws-s3-bucket_eventbridgeconfiguration.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_eventbridgeconfiguration.go
index 0a8e502fc6..bd4317f8c9 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_eventbridgeconfiguration.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_eventbridgeconfiguration.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_EventBridgeConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.EventBridgeConfiguration)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_filterrule.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_filterrule.go
similarity index 93%
rename from goformation/cloudformation/s3/aws-s3-bucket_filterrule.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_filterrule.go
index b4b4cfe2ca..7cb1c28b81 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_filterrule.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_filterrule.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_FilterRule AWS CloudFormation Resource (AWS::S3::Bucket.FilterRule)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_intelligenttieringconfiguration.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_intelligenttieringconfiguration.go
similarity index 95%
rename from goformation/cloudformation/s3/aws-s3-bucket_intelligenttieringconfiguration.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_intelligenttieringconfiguration.go
index 7316bee14a..481406b362 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_intelligenttieringconfiguration.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_intelligenttieringconfiguration.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_IntelligentTieringConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.IntelligentTieringConfiguration)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_inventoryconfiguration.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_inventoryconfiguration.go
similarity index 95%
rename from goformation/cloudformation/s3/aws-s3-bucket_inventoryconfiguration.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_inventoryconfiguration.go
index 283eba45dd..0343d0347c 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_inventoryconfiguration.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_inventoryconfiguration.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_InventoryConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.InventoryConfiguration)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_lambdaconfiguration.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_lambdaconfiguration.go
similarity index 93%
rename from goformation/cloudformation/s3/aws-s3-bucket_lambdaconfiguration.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_lambdaconfiguration.go
index ee38987ebf..d84b77cea5 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_lambdaconfiguration.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_lambdaconfiguration.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_LambdaConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.LambdaConfiguration)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_lifecycleconfiguration.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_lifecycleconfiguration.go
similarity index 95%
rename from goformation/cloudformation/s3/aws-s3-bucket_lifecycleconfiguration.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_lifecycleconfiguration.go
index 0194503120..c6b6e7a936 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_lifecycleconfiguration.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_lifecycleconfiguration.go
@@ -1,7 +1,7 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_LifecycleConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.LifecycleConfiguration)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_loggingconfiguration.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_loggingconfiguration.go
similarity index 92%
rename from goformation/cloudformation/s3/aws-s3-bucket_loggingconfiguration.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_loggingconfiguration.go
index 41d193ef70..f9dea1823a 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_loggingconfiguration.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_loggingconfiguration.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_LoggingConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.LoggingConfiguration)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_metrics.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_metrics.go
similarity index 92%
rename from goformation/cloudformation/s3/aws-s3-bucket_metrics.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_metrics.go
index 75d449aaa6..7c440fae52 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_metrics.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_metrics.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_Metrics AWS CloudFormation Resource (AWS::S3::Bucket.Metrics)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_metricsconfiguration.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_metricsconfiguration.go
similarity index 94%
rename from goformation/cloudformation/s3/aws-s3-bucket_metricsconfiguration.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_metricsconfiguration.go
index 68a1212a16..a8cfe9670d 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_metricsconfiguration.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_metricsconfiguration.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_MetricsConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.MetricsConfiguration)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_noncurrentversionexpiration.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_noncurrentversionexpiration.go
similarity index 93%
rename from goformation/cloudformation/s3/aws-s3-bucket_noncurrentversionexpiration.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_noncurrentversionexpiration.go
index 5489cfe493..97a3b27a40 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_noncurrentversionexpiration.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_noncurrentversionexpiration.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_NoncurrentVersionExpiration AWS CloudFormation Resource (AWS::S3::Bucket.NoncurrentVersionExpiration)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_noncurrentversiontransition.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_noncurrentversiontransition.go
similarity index 94%
rename from goformation/cloudformation/s3/aws-s3-bucket_noncurrentversiontransition.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_noncurrentversiontransition.go
index 69d5a71287..8fbdf17484 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_noncurrentversiontransition.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_noncurrentversiontransition.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_NoncurrentVersionTransition AWS CloudFormation Resource (AWS::S3::Bucket.NoncurrentVersionTransition)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_notificationconfiguration.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_notificationconfiguration.go
similarity index 97%
rename from goformation/cloudformation/s3/aws-s3-bucket_notificationconfiguration.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_notificationconfiguration.go
index e584bdcff3..11dfcb733c 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_notificationconfiguration.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_notificationconfiguration.go
@@ -1,7 +1,7 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_NotificationConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.NotificationConfiguration)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_notificationfilter.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_notificationfilter.go
similarity index 95%
rename from goformation/cloudformation/s3/aws-s3-bucket_notificationfilter.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_notificationfilter.go
index 8de67fae0a..46dd2d3c30 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_notificationfilter.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_notificationfilter.go
@@ -1,7 +1,7 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_NotificationFilter AWS CloudFormation Resource (AWS::S3::Bucket.NotificationFilter)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_objectlockconfiguration.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_objectlockconfiguration.go
similarity index 93%
rename from goformation/cloudformation/s3/aws-s3-bucket_objectlockconfiguration.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_objectlockconfiguration.go
index 3c2a623618..a22fad6d8a 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_objectlockconfiguration.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_objectlockconfiguration.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_ObjectLockConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.ObjectLockConfiguration)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_objectlockrule.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_objectlockrule.go
similarity index 95%
rename from goformation/cloudformation/s3/aws-s3-bucket_objectlockrule.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_objectlockrule.go
index 9ced2329de..c2c207831b 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_objectlockrule.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_objectlockrule.go
@@ -1,7 +1,7 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_ObjectLockRule AWS CloudFormation Resource (AWS::S3::Bucket.ObjectLockRule)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_ownershipcontrols.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_ownershipcontrols.go
similarity index 95%
rename from goformation/cloudformation/s3/aws-s3-bucket_ownershipcontrols.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_ownershipcontrols.go
index 6317a4a326..1dd81cb7a1 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_ownershipcontrols.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_ownershipcontrols.go
@@ -1,7 +1,7 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_OwnershipControls AWS CloudFormation Resource (AWS::S3::Bucket.OwnershipControls)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_ownershipcontrolsrule.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_ownershipcontrolsrule.go
similarity index 91%
rename from goformation/cloudformation/s3/aws-s3-bucket_ownershipcontrolsrule.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_ownershipcontrolsrule.go
index 069a732a6c..adae97355e 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_ownershipcontrolsrule.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_ownershipcontrolsrule.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_OwnershipControlsRule AWS CloudFormation Resource (AWS::S3::Bucket.OwnershipControlsRule)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_publicaccessblockconfiguration.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_publicaccessblockconfiguration.go
similarity index 94%
rename from goformation/cloudformation/s3/aws-s3-bucket_publicaccessblockconfiguration.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_publicaccessblockconfiguration.go
index a908c7ac46..e7c9cedb9f 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_publicaccessblockconfiguration.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_publicaccessblockconfiguration.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_PublicAccessBlockConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.PublicAccessBlockConfiguration)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_queueconfiguration.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_queueconfiguration.go
similarity index 93%
rename from goformation/cloudformation/s3/aws-s3-bucket_queueconfiguration.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_queueconfiguration.go
index e961dc11c4..1a62cba0f9 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_queueconfiguration.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_queueconfiguration.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_QueueConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.QueueConfiguration)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_redirectallrequeststo.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_redirectallrequeststo.go
similarity index 93%
rename from goformation/cloudformation/s3/aws-s3-bucket_redirectallrequeststo.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_redirectallrequeststo.go
index efe681c822..6c004ffc64 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_redirectallrequeststo.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_redirectallrequeststo.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_RedirectAllRequestsTo AWS CloudFormation Resource (AWS::S3::Bucket.RedirectAllRequestsTo)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_redirectrule.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_redirectrule.go
similarity index 95%
rename from goformation/cloudformation/s3/aws-s3-bucket_redirectrule.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_redirectrule.go
index 161a70bfd8..2640cfc449 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_redirectrule.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_redirectrule.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_RedirectRule AWS CloudFormation Resource (AWS::S3::Bucket.RedirectRule)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_replicamodifications.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_replicamodifications.go
similarity index 91%
rename from goformation/cloudformation/s3/aws-s3-bucket_replicamodifications.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_replicamodifications.go
index c1d03d2675..550fd46226 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_replicamodifications.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_replicamodifications.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_ReplicaModifications AWS CloudFormation Resource (AWS::S3::Bucket.ReplicaModifications)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_replicationconfiguration.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_replicationconfiguration.go
similarity index 92%
rename from goformation/cloudformation/s3/aws-s3-bucket_replicationconfiguration.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_replicationconfiguration.go
index e279d8571e..46e5d98ade 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_replicationconfiguration.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_replicationconfiguration.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_ReplicationConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.ReplicationConfiguration)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_replicationdestination.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_replicationdestination.go
similarity index 96%
rename from goformation/cloudformation/s3/aws-s3-bucket_replicationdestination.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_replicationdestination.go
index 111a5bf497..ac1cddb1e2 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_replicationdestination.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_replicationdestination.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_ReplicationDestination AWS CloudFormation Resource (AWS::S3::Bucket.ReplicationDestination)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_replicationrule.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_replicationrule.go
similarity index 96%
rename from goformation/cloudformation/s3/aws-s3-bucket_replicationrule.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_replicationrule.go
index 32aa00b9cf..75dbf0ee6a 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_replicationrule.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_replicationrule.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_ReplicationRule AWS CloudFormation Resource (AWS::S3::Bucket.ReplicationRule)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_replicationruleandoperator.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_replicationruleandoperator.go
similarity index 93%
rename from goformation/cloudformation/s3/aws-s3-bucket_replicationruleandoperator.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_replicationruleandoperator.go
index 8000ac6a07..d5f7a74669 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_replicationruleandoperator.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_replicationruleandoperator.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_ReplicationRuleAndOperator AWS CloudFormation Resource (AWS::S3::Bucket.ReplicationRuleAndOperator)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_replicationrulefilter.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_replicationrulefilter.go
similarity index 93%
rename from goformation/cloudformation/s3/aws-s3-bucket_replicationrulefilter.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_replicationrulefilter.go
index b125116f87..01b2280a23 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_replicationrulefilter.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_replicationrulefilter.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_ReplicationRuleFilter AWS CloudFormation Resource (AWS::S3::Bucket.ReplicationRuleFilter)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_replicationtime.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_replicationtime.go
similarity index 92%
rename from goformation/cloudformation/s3/aws-s3-bucket_replicationtime.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_replicationtime.go
index 3c2b4c1dc0..505f654269 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_replicationtime.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_replicationtime.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_ReplicationTime AWS CloudFormation Resource (AWS::S3::Bucket.ReplicationTime)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_replicationtimevalue.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_replicationtimevalue.go
similarity index 91%
rename from goformation/cloudformation/s3/aws-s3-bucket_replicationtimevalue.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_replicationtimevalue.go
index b16a20835c..b5dceccd96 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_replicationtimevalue.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_replicationtimevalue.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_ReplicationTimeValue AWS CloudFormation Resource (AWS::S3::Bucket.ReplicationTimeValue)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_routingrule.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_routingrule.go
similarity index 96%
rename from goformation/cloudformation/s3/aws-s3-bucket_routingrule.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_routingrule.go
index 9e529340d4..5aebc3bbf3 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_routingrule.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_routingrule.go
@@ -1,7 +1,7 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_RoutingRule AWS CloudFormation Resource (AWS::S3::Bucket.RoutingRule)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_routingrulecondition.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_routingrulecondition.go
similarity index 93%
rename from goformation/cloudformation/s3/aws-s3-bucket_routingrulecondition.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_routingrulecondition.go
index 94c7b12699..b63be8e94e 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_routingrulecondition.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_routingrulecondition.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_RoutingRuleCondition AWS CloudFormation Resource (AWS::S3::Bucket.RoutingRuleCondition)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_rule.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_rule.go
similarity index 97%
rename from goformation/cloudformation/s3/aws-s3-bucket_rule.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_rule.go
index 14abdb9c96..4aa0f2b1e5 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_rule.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_rule.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_Rule AWS CloudFormation Resource (AWS::S3::Bucket.Rule)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_s3keyfilter.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_s3keyfilter.go
similarity index 95%
rename from goformation/cloudformation/s3/aws-s3-bucket_s3keyfilter.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_s3keyfilter.go
index 53bc00d79d..f4387deee9 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_s3keyfilter.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_s3keyfilter.go
@@ -1,7 +1,7 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_S3KeyFilter AWS CloudFormation Resource (AWS::S3::Bucket.S3KeyFilter)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_serversideencryptionbydefault.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_serversideencryptionbydefault.go
similarity index 93%
rename from goformation/cloudformation/s3/aws-s3-bucket_serversideencryptionbydefault.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_serversideencryptionbydefault.go
index 12024207bb..eb0fe4ce5a 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_serversideencryptionbydefault.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_serversideencryptionbydefault.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_ServerSideEncryptionByDefault AWS CloudFormation Resource (AWS::S3::Bucket.ServerSideEncryptionByDefault)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_serversideencryptionrule.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_serversideencryptionrule.go
similarity index 93%
rename from goformation/cloudformation/s3/aws-s3-bucket_serversideencryptionrule.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_serversideencryptionrule.go
index 9c2c7195b8..1bedc040a2 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_serversideencryptionrule.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_serversideencryptionrule.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_ServerSideEncryptionRule AWS CloudFormation Resource (AWS::S3::Bucket.ServerSideEncryptionRule)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_sourceselectioncriteria.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_sourceselectioncriteria.go
similarity index 96%
rename from goformation/cloudformation/s3/aws-s3-bucket_sourceselectioncriteria.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_sourceselectioncriteria.go
index 17817183b7..603108c831 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_sourceselectioncriteria.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_sourceselectioncriteria.go
@@ -1,7 +1,7 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_SourceSelectionCriteria AWS CloudFormation Resource (AWS::S3::Bucket.SourceSelectionCriteria)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_ssekmsencryptedobjects.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_ssekmsencryptedobjects.go
similarity index 91%
rename from goformation/cloudformation/s3/aws-s3-bucket_ssekmsencryptedobjects.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_ssekmsencryptedobjects.go
index b4b081867a..422e86a5b4 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_ssekmsencryptedobjects.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_ssekmsencryptedobjects.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_SseKmsEncryptedObjects AWS CloudFormation Resource (AWS::S3::Bucket.SseKmsEncryptedObjects)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_storageclassanalysis.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_storageclassanalysis.go
similarity index 95%
rename from goformation/cloudformation/s3/aws-s3-bucket_storageclassanalysis.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_storageclassanalysis.go
index 20ca84efef..8b1e521b4c 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_storageclassanalysis.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_storageclassanalysis.go
@@ -1,7 +1,7 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_StorageClassAnalysis AWS CloudFormation Resource (AWS::S3::Bucket.StorageClassAnalysis)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_tagfilter.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_tagfilter.go
similarity index 92%
rename from goformation/cloudformation/s3/aws-s3-bucket_tagfilter.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_tagfilter.go
index 937e9a8ba8..1ab1d054aa 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_tagfilter.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_tagfilter.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_TagFilter AWS CloudFormation Resource (AWS::S3::Bucket.TagFilter)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_tiering.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_tiering.go
similarity index 92%
rename from goformation/cloudformation/s3/aws-s3-bucket_tiering.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_tiering.go
index 002ebdca16..52b654e787 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_tiering.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_tiering.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_Tiering AWS CloudFormation Resource (AWS::S3::Bucket.Tiering)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_topicconfiguration.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_topicconfiguration.go
similarity index 93%
rename from goformation/cloudformation/s3/aws-s3-bucket_topicconfiguration.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_topicconfiguration.go
index cb622c7351..37a700b00b 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_topicconfiguration.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_topicconfiguration.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_TopicConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.TopicConfiguration)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_transition.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_transition.go
similarity index 93%
rename from goformation/cloudformation/s3/aws-s3-bucket_transition.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_transition.go
index 3b36040388..8a3055a59c 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_transition.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_transition.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_Transition AWS CloudFormation Resource (AWS::S3::Bucket.Transition)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_versioningconfiguration.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_versioningconfiguration.go
similarity index 91%
rename from goformation/cloudformation/s3/aws-s3-bucket_versioningconfiguration.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_versioningconfiguration.go
index 76c100502c..4a31379f68 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_versioningconfiguration.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_versioningconfiguration.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_VersioningConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.VersioningConfiguration)
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_websiteconfiguration.go b/pkg/goformation/cloudformation/s3/aws-s3-bucket_websiteconfiguration.go
similarity index 94%
rename from goformation/cloudformation/s3/aws-s3-bucket_websiteconfiguration.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucket_websiteconfiguration.go
index da3db07fad..2e54fb79ec 100644
--- a/goformation/cloudformation/s3/aws-s3-bucket_websiteconfiguration.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucket_websiteconfiguration.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_WebsiteConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.WebsiteConfiguration)
diff --git a/goformation/cloudformation/s3/aws-s3-bucketpolicy.go b/pkg/goformation/cloudformation/s3/aws-s3-bucketpolicy.go
similarity index 96%
rename from goformation/cloudformation/s3/aws-s3-bucketpolicy.go
rename to pkg/goformation/cloudformation/s3/aws-s3-bucketpolicy.go
index a12d838c5f..130d9bd429 100644
--- a/goformation/cloudformation/s3/aws-s3-bucketpolicy.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-bucketpolicy.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // BucketPolicy AWS CloudFormation Resource (AWS::S3::BucketPolicy)
diff --git a/goformation/cloudformation/s3/aws-s3-multiregionaccesspoint.go b/pkg/goformation/cloudformation/s3/aws-s3-multiregionaccesspoint.go
similarity index 97%
rename from goformation/cloudformation/s3/aws-s3-multiregionaccesspoint.go
rename to pkg/goformation/cloudformation/s3/aws-s3-multiregionaccesspoint.go
index 67e06178ae..54a2f21bba 100644
--- a/goformation/cloudformation/s3/aws-s3-multiregionaccesspoint.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-multiregionaccesspoint.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MultiRegionAccessPoint AWS CloudFormation Resource (AWS::S3::MultiRegionAccessPoint)
diff --git a/goformation/cloudformation/s3/aws-s3-multiregionaccesspoint_publicaccessblockconfiguration.go b/pkg/goformation/cloudformation/s3/aws-s3-multiregionaccesspoint_publicaccessblockconfiguration.go
similarity index 95%
rename from goformation/cloudformation/s3/aws-s3-multiregionaccesspoint_publicaccessblockconfiguration.go
rename to pkg/goformation/cloudformation/s3/aws-s3-multiregionaccesspoint_publicaccessblockconfiguration.go
index a29a35c474..65499f053f 100644
--- a/goformation/cloudformation/s3/aws-s3-multiregionaccesspoint_publicaccessblockconfiguration.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-multiregionaccesspoint_publicaccessblockconfiguration.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MultiRegionAccessPoint_PublicAccessBlockConfiguration AWS CloudFormation Resource (AWS::S3::MultiRegionAccessPoint.PublicAccessBlockConfiguration)
diff --git a/goformation/cloudformation/s3/aws-s3-multiregionaccesspoint_region.go b/pkg/goformation/cloudformation/s3/aws-s3-multiregionaccesspoint_region.go
similarity index 91%
rename from goformation/cloudformation/s3/aws-s3-multiregionaccesspoint_region.go
rename to pkg/goformation/cloudformation/s3/aws-s3-multiregionaccesspoint_region.go
index b2601c85dd..11af8d6d10 100644
--- a/goformation/cloudformation/s3/aws-s3-multiregionaccesspoint_region.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-multiregionaccesspoint_region.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MultiRegionAccessPoint_Region AWS CloudFormation Resource (AWS::S3::MultiRegionAccessPoint.Region)
diff --git a/goformation/cloudformation/s3/aws-s3-multiregionaccesspointpolicy.go b/pkg/goformation/cloudformation/s3/aws-s3-multiregionaccesspointpolicy.go
similarity index 96%
rename from goformation/cloudformation/s3/aws-s3-multiregionaccesspointpolicy.go
rename to pkg/goformation/cloudformation/s3/aws-s3-multiregionaccesspointpolicy.go
index bad2484647..e7a631a082 100644
--- a/goformation/cloudformation/s3/aws-s3-multiregionaccesspointpolicy.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-multiregionaccesspointpolicy.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MultiRegionAccessPointPolicy AWS CloudFormation Resource (AWS::S3::MultiRegionAccessPointPolicy)
diff --git a/goformation/cloudformation/s3/aws-s3-storagelens.go b/pkg/goformation/cloudformation/s3/aws-s3-storagelens.go
similarity index 96%
rename from goformation/cloudformation/s3/aws-s3-storagelens.go
rename to pkg/goformation/cloudformation/s3/aws-s3-storagelens.go
index 5f66377548..a59f4b4746 100644
--- a/goformation/cloudformation/s3/aws-s3-storagelens.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-storagelens.go
@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StorageLens AWS CloudFormation Resource (AWS::S3::StorageLens)
diff --git a/goformation/cloudformation/s3/aws-s3-storagelens_accountlevel.go b/pkg/goformation/cloudformation/s3/aws-s3-storagelens_accountlevel.go
similarity index 96%
rename from goformation/cloudformation/s3/aws-s3-storagelens_accountlevel.go
rename to pkg/goformation/cloudformation/s3/aws-s3-storagelens_accountlevel.go
index 3e8e532ebf..8964c6a027 100644
--- a/goformation/cloudformation/s3/aws-s3-storagelens_accountlevel.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-storagelens_accountlevel.go
@@ -1,7 +1,7 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StorageLens_AccountLevel AWS CloudFormation Resource (AWS::S3::StorageLens.AccountLevel)
diff --git a/goformation/cloudformation/s3/aws-s3-storagelens_activitymetrics.go b/pkg/goformation/cloudformation/s3/aws-s3-storagelens_activitymetrics.go
similarity index 91%
rename from goformation/cloudformation/s3/aws-s3-storagelens_activitymetrics.go
rename to pkg/goformation/cloudformation/s3/aws-s3-storagelens_activitymetrics.go
index c400573f97..0fd7bb250d 100644
--- a/goformation/cloudformation/s3/aws-s3-storagelens_activitymetrics.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-storagelens_activitymetrics.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StorageLens_ActivityMetrics AWS CloudFormation Resource (AWS::S3::StorageLens.ActivityMetrics)
diff --git a/goformation/cloudformation/s3/aws-s3-storagelens_awsorg.go b/pkg/goformation/cloudformation/s3/aws-s3-storagelens_awsorg.go
similarity index 91%
rename from goformation/cloudformation/s3/aws-s3-storagelens_awsorg.go
rename to pkg/goformation/cloudformation/s3/aws-s3-storagelens_awsorg.go
index 971c7cbf2c..eea0c0b2a0 100644
--- a/goformation/cloudformation/s3/aws-s3-storagelens_awsorg.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-storagelens_awsorg.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StorageLens_AwsOrg AWS CloudFormation Resource (AWS::S3::StorageLens.AwsOrg)
diff --git a/goformation/cloudformation/s3/aws-s3-storagelens_bucketlevel.go b/pkg/goformation/cloudformation/s3/aws-s3-storagelens_bucketlevel.go
similarity index 96%
rename from goformation/cloudformation/s3/aws-s3-storagelens_bucketlevel.go
rename to pkg/goformation/cloudformation/s3/aws-s3-storagelens_bucketlevel.go
index 0c60b84aab..1bfc509013 100644
--- a/goformation/cloudformation/s3/aws-s3-storagelens_bucketlevel.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-storagelens_bucketlevel.go
@@ -1,7 +1,7 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StorageLens_BucketLevel AWS CloudFormation Resource (AWS::S3::StorageLens.BucketLevel)
diff --git a/goformation/cloudformation/s3/aws-s3-storagelens_bucketsandregions.go b/pkg/goformation/cloudformation/s3/aws-s3-storagelens_bucketsandregions.go
similarity index 92%
rename from goformation/cloudformation/s3/aws-s3-storagelens_bucketsandregions.go
rename to pkg/goformation/cloudformation/s3/aws-s3-storagelens_bucketsandregions.go
index 7094e34997..a867c079c1 100644
--- a/goformation/cloudformation/s3/aws-s3-storagelens_bucketsandregions.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-storagelens_bucketsandregions.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StorageLens_BucketsAndRegions AWS CloudFormation Resource (AWS::S3::StorageLens.BucketsAndRegions)
diff --git a/goformation/cloudformation/s3/aws-s3-storagelens_cloudwatchmetrics.go b/pkg/goformation/cloudformation/s3/aws-s3-storagelens_cloudwatchmetrics.go
similarity index 91%
rename from goformation/cloudformation/s3/aws-s3-storagelens_cloudwatchmetrics.go
rename to pkg/goformation/cloudformation/s3/aws-s3-storagelens_cloudwatchmetrics.go
index e7f86b3da2..1448ac2d48 100644
--- a/goformation/cloudformation/s3/aws-s3-storagelens_cloudwatchmetrics.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-storagelens_cloudwatchmetrics.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StorageLens_CloudWatchMetrics AWS CloudFormation Resource (AWS::S3::StorageLens.CloudWatchMetrics)
diff --git a/goformation/cloudformation/s3/aws-s3-storagelens_dataexport.go b/pkg/goformation/cloudformation/s3/aws-s3-storagelens_dataexport.go
similarity index 96%
rename from goformation/cloudformation/s3/aws-s3-storagelens_dataexport.go
rename to pkg/goformation/cloudformation/s3/aws-s3-storagelens_dataexport.go
index 72572c5cdb..4d21d6940f 100644
--- a/goformation/cloudformation/s3/aws-s3-storagelens_dataexport.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-storagelens_dataexport.go
@@ -1,7 +1,7 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StorageLens_DataExport AWS CloudFormation Resource (AWS::S3::StorageLens.DataExport)
diff --git a/goformation/cloudformation/s3/aws-s3-storagelens_encryption.go b/pkg/goformation/cloudformation/s3/aws-s3-storagelens_encryption.go
similarity index 94%
rename from goformation/cloudformation/s3/aws-s3-storagelens_encryption.go
rename to pkg/goformation/cloudformation/s3/aws-s3-storagelens_encryption.go
index 84185390f9..5b7cb995a6 100644
--- a/goformation/cloudformation/s3/aws-s3-storagelens_encryption.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-storagelens_encryption.go
@@ -1,7 +1,7 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StorageLens_Encryption AWS CloudFormation Resource (AWS::S3::StorageLens.Encryption)
diff --git a/goformation/cloudformation/s3/aws-s3-storagelens_prefixlevel.go b/pkg/goformation/cloudformation/s3/aws-s3-storagelens_prefixlevel.go
similarity index 95%
rename from goformation/cloudformation/s3/aws-s3-storagelens_prefixlevel.go
rename to pkg/goformation/cloudformation/s3/aws-s3-storagelens_prefixlevel.go
index 371cbcd518..eb6eb34cac 100644
--- a/goformation/cloudformation/s3/aws-s3-storagelens_prefixlevel.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-storagelens_prefixlevel.go
@@ -1,7 +1,7 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StorageLens_PrefixLevel AWS CloudFormation Resource (AWS::S3::StorageLens.PrefixLevel)
diff --git a/goformation/cloudformation/s3/aws-s3-storagelens_prefixlevelstoragemetrics.go b/pkg/goformation/cloudformation/s3/aws-s3-storagelens_prefixlevelstoragemetrics.go
similarity index 93%
rename from goformation/cloudformation/s3/aws-s3-storagelens_prefixlevelstoragemetrics.go
rename to pkg/goformation/cloudformation/s3/aws-s3-storagelens_prefixlevelstoragemetrics.go
index 53f9660e46..0117ecb5f5 100644
--- a/goformation/cloudformation/s3/aws-s3-storagelens_prefixlevelstoragemetrics.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-storagelens_prefixlevelstoragemetrics.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StorageLens_PrefixLevelStorageMetrics AWS CloudFormation Resource (AWS::S3::StorageLens.PrefixLevelStorageMetrics)
diff --git a/goformation/cloudformation/s3/aws-s3-storagelens_s3bucketdestination.go b/pkg/goformation/cloudformation/s3/aws-s3-storagelens_s3bucketdestination.go
similarity index 95%
rename from goformation/cloudformation/s3/aws-s3-storagelens_s3bucketdestination.go
rename to pkg/goformation/cloudformation/s3/aws-s3-storagelens_s3bucketdestination.go
index 4083b650b0..a546e5ee89 100644
--- a/goformation/cloudformation/s3/aws-s3-storagelens_s3bucketdestination.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-storagelens_s3bucketdestination.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StorageLens_S3BucketDestination AWS CloudFormation Resource (AWS::S3::StorageLens.S3BucketDestination)
diff --git a/goformation/cloudformation/s3/aws-s3-storagelens_selectioncriteria.go b/pkg/goformation/cloudformation/s3/aws-s3-storagelens_selectioncriteria.go
similarity index 93%
rename from goformation/cloudformation/s3/aws-s3-storagelens_selectioncriteria.go
rename to pkg/goformation/cloudformation/s3/aws-s3-storagelens_selectioncriteria.go
index 64da9991c5..a9b7e958c2 100644
--- a/goformation/cloudformation/s3/aws-s3-storagelens_selectioncriteria.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-storagelens_selectioncriteria.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StorageLens_SelectionCriteria AWS CloudFormation Resource (AWS::S3::StorageLens.SelectionCriteria)
diff --git a/goformation/cloudformation/s3/aws-s3-storagelens_storagelensconfiguration.go b/pkg/goformation/cloudformation/s3/aws-s3-storagelens_storagelensconfiguration.go
similarity index 96%
rename from goformation/cloudformation/s3/aws-s3-storagelens_storagelensconfiguration.go
rename to pkg/goformation/cloudformation/s3/aws-s3-storagelens_storagelensconfiguration.go
index 8bf9118bbe..2360cdd57d 100644
--- a/goformation/cloudformation/s3/aws-s3-storagelens_storagelensconfiguration.go
+++ b/pkg/goformation/cloudformation/s3/aws-s3-storagelens_storagelensconfiguration.go
@@ -1,9 +1,9 @@
 package s3
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StorageLens_StorageLensConfiguration AWS CloudFormation Resource (AWS::S3::StorageLens.StorageLensConfiguration)
diff --git a/goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint.go b/pkg/goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint.go
similarity index 96%
rename from goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint.go
rename to pkg/goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint.go
index 67e3081529..9753752799 100644
--- a/goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint.go
+++ b/pkg/goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AccessPoint AWS CloudFormation Resource (AWS::S3ObjectLambda::AccessPoint)
diff --git a/goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint_objectlambdaconfiguration.go b/pkg/goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint_objectlambdaconfiguration.go
similarity index 95%
rename from goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint_objectlambdaconfiguration.go
rename to pkg/goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint_objectlambdaconfiguration.go
index 9a13359e62..0aac6d95cb 100644
--- a/goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint_objectlambdaconfiguration.go
+++ b/pkg/goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint_objectlambdaconfiguration.go
@@ -1,9 +1,9 @@
 package s3objectlambda
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AccessPoint_ObjectLambdaConfiguration AWS CloudFormation Resource (AWS::S3ObjectLambda::AccessPoint.ObjectLambdaConfiguration)
diff --git a/goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint_transformationconfiguration.go b/pkg/goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint_transformationconfiguration.go
similarity index 93%
rename from goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint_transformationconfiguration.go
rename to pkg/goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint_transformationconfiguration.go
index 044b53ea10..a8661fffce 100644
--- a/goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint_transformationconfiguration.go
+++ b/pkg/goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint_transformationconfiguration.go
@@ -1,9 +1,9 @@
 package s3objectlambda
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AccessPoint_TransformationConfiguration AWS CloudFormation Resource (AWS::S3ObjectLambda::AccessPoint.TransformationConfiguration)
diff --git a/goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspointpolicy.go b/pkg/goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspointpolicy.go
similarity index 96%
rename from goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspointpolicy.go
rename to pkg/goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspointpolicy.go
index 694a08056a..f4bbbdb0c2 100644
--- a/goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspointpolicy.go
+++ b/pkg/goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspointpolicy.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AccessPointPolicy AWS CloudFormation Resource (AWS::S3ObjectLambda::AccessPointPolicy)
diff --git a/goformation/cloudformation/s3outposts/aws-s3outposts-accesspoint.go b/pkg/goformation/cloudformation/s3outposts/aws-s3outposts-accesspoint.go
similarity index 97%
rename from goformation/cloudformation/s3outposts/aws-s3outposts-accesspoint.go
rename to pkg/goformation/cloudformation/s3outposts/aws-s3outposts-accesspoint.go
index 82cd8be20a..9f39ce4238 100644
--- a/goformation/cloudformation/s3outposts/aws-s3outposts-accesspoint.go
+++ b/pkg/goformation/cloudformation/s3outposts/aws-s3outposts-accesspoint.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AccessPoint AWS CloudFormation Resource (AWS::S3Outposts::AccessPoint)
diff --git a/goformation/cloudformation/s3outposts/aws-s3outposts-accesspoint_vpcconfiguration.go b/pkg/goformation/cloudformation/s3outposts/aws-s3outposts-accesspoint_vpcconfiguration.go
similarity index 91%
rename from goformation/cloudformation/s3outposts/aws-s3outposts-accesspoint_vpcconfiguration.go
rename to pkg/goformation/cloudformation/s3outposts/aws-s3outposts-accesspoint_vpcconfiguration.go
index 265ebb4c03..46daa931f3 100644
--- a/goformation/cloudformation/s3outposts/aws-s3outposts-accesspoint_vpcconfiguration.go
+++ b/pkg/goformation/cloudformation/s3outposts/aws-s3outposts-accesspoint_vpcconfiguration.go
@@ -1,9 +1,9 @@
 package s3outposts
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AccessPoint_VpcConfiguration AWS CloudFormation Resource (AWS::S3Outposts::AccessPoint.VpcConfiguration)
diff --git a/goformation/cloudformation/s3outposts/aws-s3outposts-bucket.go b/pkg/goformation/cloudformation/s3outposts/aws-s3outposts-bucket.go
similarity index 95%
rename from goformation/cloudformation/s3outposts/aws-s3outposts-bucket.go
rename to pkg/goformation/cloudformation/s3outposts/aws-s3outposts-bucket.go
index bb6e53bb82..59c941b4da 100644
--- a/goformation/cloudformation/s3outposts/aws-s3outposts-bucket.go
+++ b/pkg/goformation/cloudformation/s3outposts/aws-s3outposts-bucket.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket AWS CloudFormation Resource (AWS::S3Outposts::Bucket)
diff --git a/goformation/cloudformation/s3outposts/aws-s3outposts-bucket_abortincompletemultipartupload.go b/pkg/goformation/cloudformation/s3outposts/aws-s3outposts-bucket_abortincompletemultipartupload.go
similarity index 92%
rename from goformation/cloudformation/s3outposts/aws-s3outposts-bucket_abortincompletemultipartupload.go
rename to pkg/goformation/cloudformation/s3outposts/aws-s3outposts-bucket_abortincompletemultipartupload.go
index b587b02ed3..3e65300805 100644
--- a/goformation/cloudformation/s3outposts/aws-s3outposts-bucket_abortincompletemultipartupload.go
+++ b/pkg/goformation/cloudformation/s3outposts/aws-s3outposts-bucket_abortincompletemultipartupload.go
@@ -1,9 +1,9 @@
 package s3outposts
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_AbortIncompleteMultipartUpload AWS CloudFormation Resource (AWS::S3Outposts::Bucket.AbortIncompleteMultipartUpload)
diff --git a/goformation/cloudformation/s3outposts/aws-s3outposts-bucket_lifecycleconfiguration.go b/pkg/goformation/cloudformation/s3outposts/aws-s3outposts-bucket_lifecycleconfiguration.go
similarity index 95%
rename from goformation/cloudformation/s3outposts/aws-s3outposts-bucket_lifecycleconfiguration.go
rename to pkg/goformation/cloudformation/s3outposts/aws-s3outposts-bucket_lifecycleconfiguration.go
index 01db964edc..126882aae3 100644
--- a/goformation/cloudformation/s3outposts/aws-s3outposts-bucket_lifecycleconfiguration.go
+++ b/pkg/goformation/cloudformation/s3outposts/aws-s3outposts-bucket_lifecycleconfiguration.go
@@ -1,7 +1,7 @@
 package s3outposts
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_LifecycleConfiguration AWS CloudFormation Resource (AWS::S3Outposts::Bucket.LifecycleConfiguration)
diff --git a/goformation/cloudformation/s3outposts/aws-s3outposts-bucket_rule.go b/pkg/goformation/cloudformation/s3outposts/aws-s3outposts-bucket_rule.go
similarity index 95%
rename from goformation/cloudformation/s3outposts/aws-s3outposts-bucket_rule.go
rename to pkg/goformation/cloudformation/s3outposts/aws-s3outposts-bucket_rule.go
index db7ca2e894..d364fe1d62 100644
--- a/goformation/cloudformation/s3outposts/aws-s3outposts-bucket_rule.go
+++ b/pkg/goformation/cloudformation/s3outposts/aws-s3outposts-bucket_rule.go
@@ -1,9 +1,9 @@
 package s3outposts
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Bucket_Rule AWS CloudFormation Resource (AWS::S3Outposts::Bucket.Rule)
diff --git a/goformation/cloudformation/s3outposts/aws-s3outposts-bucketpolicy.go b/pkg/goformation/cloudformation/s3outposts/aws-s3outposts-bucketpolicy.go
similarity index 96%
rename from goformation/cloudformation/s3outposts/aws-s3outposts-bucketpolicy.go
rename to pkg/goformation/cloudformation/s3outposts/aws-s3outposts-bucketpolicy.go
index dbf1cfba38..cb2d56ba9c 100644
--- a/goformation/cloudformation/s3outposts/aws-s3outposts-bucketpolicy.go
+++ b/pkg/goformation/cloudformation/s3outposts/aws-s3outposts-bucketpolicy.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // BucketPolicy AWS CloudFormation Resource (AWS::S3Outposts::BucketPolicy)
diff --git a/goformation/cloudformation/s3outposts/aws-s3outposts-endpoint.go b/pkg/goformation/cloudformation/s3outposts/aws-s3outposts-endpoint.go
similarity index 97%
rename from goformation/cloudformation/s3outposts/aws-s3outposts-endpoint.go
rename to pkg/goformation/cloudformation/s3outposts/aws-s3outposts-endpoint.go
index ea9745a072..fd47b1fe28 100644
--- a/goformation/cloudformation/s3outposts/aws-s3outposts-endpoint.go
+++ b/pkg/goformation/cloudformation/s3outposts/aws-s3outposts-endpoint.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Endpoint AWS CloudFormation Resource (AWS::S3Outposts::Endpoint)
diff --git a/goformation/cloudformation/s3outposts/aws-s3outposts-endpoint_networkinterface.go b/pkg/goformation/cloudformation/s3outposts/aws-s3outposts-endpoint_networkinterface.go
similarity index 91%
rename from goformation/cloudformation/s3outposts/aws-s3outposts-endpoint_networkinterface.go
rename to pkg/goformation/cloudformation/s3outposts/aws-s3outposts-endpoint_networkinterface.go
index 5530dd8d5a..10243b68fd 100644
--- a/goformation/cloudformation/s3outposts/aws-s3outposts-endpoint_networkinterface.go
+++ b/pkg/goformation/cloudformation/s3outposts/aws-s3outposts-endpoint_networkinterface.go
@@ -1,9 +1,9 @@
 package s3outposts
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Endpoint_NetworkInterface AWS CloudFormation Resource (AWS::S3Outposts::Endpoint.NetworkInterface)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-app.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-app.go
similarity index 95%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-app.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-app.go
index 07dba6cdd7..88b374c7ee 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-app.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-app.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // App AWS CloudFormation Resource (AWS::SageMaker::App)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-app_resourcespec.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-app_resourcespec.go
similarity index 93%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-app_resourcespec.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-app_resourcespec.go
index b6e5d358ae..25c0cf877d 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-app_resourcespec.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-app_resourcespec.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // App_ResourceSpec AWS CloudFormation Resource (AWS::SageMaker::App.ResourceSpec)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig.go
similarity index 95%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig.go
index a703bee48d..81d9de48e5 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AppImageConfig AWS CloudFormation Resource (AWS::SageMaker::AppImageConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig_filesystemconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig_filesystemconfig.go
similarity index 94%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig_filesystemconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig_filesystemconfig.go
index ee87b1b767..7c922cd822 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig_filesystemconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig_filesystemconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AppImageConfig_FileSystemConfig AWS CloudFormation Resource (AWS::SageMaker::AppImageConfig.FileSystemConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig_kernelgatewayimageconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig_kernelgatewayimageconfig.go
similarity index 96%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig_kernelgatewayimageconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig_kernelgatewayimageconfig.go
index 3a7c1caf2f..c714a5f589 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig_kernelgatewayimageconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig_kernelgatewayimageconfig.go
@@ -1,7 +1,7 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AppImageConfig_KernelGatewayImageConfig AWS CloudFormation Resource (AWS::SageMaker::AppImageConfig.KernelGatewayImageConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig_kernelspec.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig_kernelspec.go
similarity index 92%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig_kernelspec.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig_kernelspec.go
index 3262c05678..0f6229ddc8 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig_kernelspec.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig_kernelspec.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AppImageConfig_KernelSpec AWS CloudFormation Resource (AWS::SageMaker::AppImageConfig.KernelSpec)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-coderepository.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-coderepository.go
similarity index 95%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-coderepository.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-coderepository.go
index 5f20c9104c..c4614e2b80 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-coderepository.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-coderepository.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CodeRepository AWS CloudFormation Resource (AWS::SageMaker::CodeRepository)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-coderepository_gitconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-coderepository_gitconfig.go
similarity index 93%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-coderepository_gitconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-coderepository_gitconfig.go
index 88832f92bc..fe8894db35 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-coderepository_gitconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-coderepository_gitconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CodeRepository_GitConfig AWS CloudFormation Resource (AWS::SageMaker::CodeRepository.GitConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition.go
similarity index 97%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition.go
index 4821516d4d..d25a7ddfb8 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataQualityJobDefinition AWS CloudFormation Resource (AWS::SageMaker::DataQualityJobDefinition)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_clusterconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_clusterconfig.go
similarity index 95%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_clusterconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_clusterconfig.go
index a96fe47d59..a3805a3498 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_clusterconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_clusterconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataQualityJobDefinition_ClusterConfig AWS CloudFormation Resource (AWS::SageMaker::DataQualityJobDefinition.ClusterConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_constraintsresource.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_constraintsresource.go
similarity index 92%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_constraintsresource.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_constraintsresource.go
index a1d0de9c3d..6befc81805 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_constraintsresource.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_constraintsresource.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataQualityJobDefinition_ConstraintsResource AWS CloudFormation Resource (AWS::SageMaker::DataQualityJobDefinition.ConstraintsResource)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualityappspecification.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualityappspecification.go
similarity index 96%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualityappspecification.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualityappspecification.go
index 047f697085..3c8f239fd5 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualityappspecification.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualityappspecification.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataQualityJobDefinition_DataQualityAppSpecification AWS CloudFormation Resource (AWS::SageMaker::DataQualityJobDefinition.DataQualityAppSpecification)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualitybaselineconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualitybaselineconfig.go
similarity index 94%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualitybaselineconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualitybaselineconfig.go
index 669e7ffb2c..8c193b865d 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualitybaselineconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualitybaselineconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataQualityJobDefinition_DataQualityBaselineConfig AWS CloudFormation Resource (AWS::SageMaker::DataQualityJobDefinition.DataQualityBaselineConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualityjobinput.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualityjobinput.go
similarity index 96%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualityjobinput.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualityjobinput.go
index f39d4c123e..23d61ec5e0 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualityjobinput.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualityjobinput.go
@@ -1,7 +1,7 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataQualityJobDefinition_DataQualityJobInput AWS CloudFormation Resource (AWS::SageMaker::DataQualityJobDefinition.DataQualityJobInput)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_endpointinput.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_endpointinput.go
similarity index 95%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_endpointinput.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_endpointinput.go
index 7af44f19d5..b4bc60c6fa 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_endpointinput.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_endpointinput.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataQualityJobDefinition_EndpointInput AWS CloudFormation Resource (AWS::SageMaker::DataQualityJobDefinition.EndpointInput)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringoutput.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringoutput.go
similarity index 95%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringoutput.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringoutput.go
index 41bb92f7a3..76f520de08 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringoutput.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringoutput.go
@@ -1,7 +1,7 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataQualityJobDefinition_MonitoringOutput AWS CloudFormation Resource (AWS::SageMaker::DataQualityJobDefinition.MonitoringOutput)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringoutputconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringoutputconfig.go
similarity index 93%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringoutputconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringoutputconfig.go
index 61bba4ba44..1f5adb58c6 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringoutputconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringoutputconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataQualityJobDefinition_MonitoringOutputConfig AWS CloudFormation Resource (AWS::SageMaker::DataQualityJobDefinition.MonitoringOutputConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringresources.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringresources.go
similarity index 96%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringresources.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringresources.go
index f6909e30ef..6fba21bf8d 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringresources.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringresources.go
@@ -1,7 +1,7 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataQualityJobDefinition_MonitoringResources AWS CloudFormation Resource (AWS::SageMaker::DataQualityJobDefinition.MonitoringResources)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_networkconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_networkconfig.go
similarity index 94%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_networkconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_networkconfig.go
index 850cc58054..0278a0b27e 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_networkconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_networkconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataQualityJobDefinition_NetworkConfig AWS CloudFormation Resource (AWS::SageMaker::DataQualityJobDefinition.NetworkConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_s3output.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_s3output.go
similarity index 94%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_s3output.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_s3output.go
index 80bc5147bc..77b43b5779 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_s3output.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_s3output.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataQualityJobDefinition_S3Output AWS CloudFormation Resource (AWS::SageMaker::DataQualityJobDefinition.S3Output)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_statisticsresource.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_statisticsresource.go
similarity index 92%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_statisticsresource.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_statisticsresource.go
index 1eb897fcc7..250141f3c6 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_statisticsresource.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_statisticsresource.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataQualityJobDefinition_StatisticsResource AWS CloudFormation Resource (AWS::SageMaker::DataQualityJobDefinition.StatisticsResource)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_stoppingcondition.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_stoppingcondition.go
similarity index 92%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_stoppingcondition.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_stoppingcondition.go
index 7b802aeaa7..e008f27e09 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_stoppingcondition.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_stoppingcondition.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataQualityJobDefinition_StoppingCondition AWS CloudFormation Resource (AWS::SageMaker::DataQualityJobDefinition.StoppingCondition)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_vpcconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_vpcconfig.go
similarity index 93%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_vpcconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_vpcconfig.go
index a610d7520c..c5576f6e84 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_vpcconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_vpcconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DataQualityJobDefinition_VpcConfig AWS CloudFormation Resource (AWS::SageMaker::DataQualityJobDefinition.VpcConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-device.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-device.go
similarity index 95%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-device.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-device.go
index 8ea9baa9a4..efda63fc9b 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-device.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-device.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Device AWS CloudFormation Resource (AWS::SageMaker::Device)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-device_device.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-device_device.go
similarity index 93%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-device_device.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-device_device.go
index e55460e6cc..f2613f2d80 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-device_device.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-device_device.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Device_Device AWS CloudFormation Resource (AWS::SageMaker::Device.Device)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-devicefleet.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-devicefleet.go
similarity index 95%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-devicefleet.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-devicefleet.go
index d76d521e2f..380c7aed5c 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-devicefleet.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-devicefleet.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeviceFleet AWS CloudFormation Resource (AWS::SageMaker::DeviceFleet)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-devicefleet_edgeoutputconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-devicefleet_edgeoutputconfig.go
similarity index 93%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-devicefleet_edgeoutputconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-devicefleet_edgeoutputconfig.go
index 7997e35152..1895b6c397 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-devicefleet_edgeoutputconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-devicefleet_edgeoutputconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // DeviceFleet_EdgeOutputConfig AWS CloudFormation Resource (AWS::SageMaker::DeviceFleet.EdgeOutputConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-domain.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-domain.go
similarity index 96%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-domain.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-domain.go
index 1f42866c0d..528ae89386 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-domain.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-domain.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain AWS CloudFormation Resource (AWS::SageMaker::Domain)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-domain_customimage.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-domain_customimage.go
similarity index 93%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-domain_customimage.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-domain_customimage.go
index 96fa313cb8..7ddd8ddd10 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-domain_customimage.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-domain_customimage.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain_CustomImage AWS CloudFormation Resource (AWS::SageMaker::Domain.CustomImage)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-domain_jupyterserverappsettings.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-domain_jupyterserverappsettings.go
similarity index 95%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-domain_jupyterserverappsettings.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-domain_jupyterserverappsettings.go
index 0f1549a27c..f7cd63051c 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-domain_jupyterserverappsettings.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-domain_jupyterserverappsettings.go
@@ -1,7 +1,7 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain_JupyterServerAppSettings AWS CloudFormation Resource (AWS::SageMaker::Domain.JupyterServerAppSettings)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-domain_kernelgatewayappsettings.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-domain_kernelgatewayappsettings.go
similarity index 96%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-domain_kernelgatewayappsettings.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-domain_kernelgatewayappsettings.go
index 9763d30352..ea8c205175 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-domain_kernelgatewayappsettings.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-domain_kernelgatewayappsettings.go
@@ -1,7 +1,7 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain_KernelGatewayAppSettings AWS CloudFormation Resource (AWS::SageMaker::Domain.KernelGatewayAppSettings)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-domain_resourcespec.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-domain_resourcespec.go
similarity index 93%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-domain_resourcespec.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-domain_resourcespec.go
index ef54951512..d80e844d6d 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-domain_resourcespec.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-domain_resourcespec.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain_ResourceSpec AWS CloudFormation Resource (AWS::SageMaker::Domain.ResourceSpec)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-domain_sharingsettings.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-domain_sharingsettings.go
similarity index 93%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-domain_sharingsettings.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-domain_sharingsettings.go
index bbb6d60dad..74f185c40b 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-domain_sharingsettings.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-domain_sharingsettings.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain_SharingSettings AWS CloudFormation Resource (AWS::SageMaker::Domain.SharingSettings)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-domain_usersettings.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-domain_usersettings.go
similarity index 95%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-domain_usersettings.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-domain_usersettings.go
index ff6f23db73..94f0fd8478 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-domain_usersettings.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-domain_usersettings.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain_UserSettings AWS CloudFormation Resource (AWS::SageMaker::Domain.UserSettings)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint.go
similarity index 96%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-endpoint.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint.go
index b53ce5ae0a..c5ee741235 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Endpoint AWS CloudFormation Resource (AWS::SageMaker::Endpoint)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_alarm.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_alarm.go
similarity index 91%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_alarm.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_alarm.go
index 34b01bbe80..58b17643e7 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_alarm.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_alarm.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Endpoint_Alarm AWS CloudFormation Resource (AWS::SageMaker::Endpoint.Alarm)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_autorollbackconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_autorollbackconfig.go
similarity index 95%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_autorollbackconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_autorollbackconfig.go
index efcf177bff..0497c1c737 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_autorollbackconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_autorollbackconfig.go
@@ -1,7 +1,7 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Endpoint_AutoRollbackConfig AWS CloudFormation Resource (AWS::SageMaker::Endpoint.AutoRollbackConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_bluegreenupdatepolicy.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_bluegreenupdatepolicy.go
similarity index 94%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_bluegreenupdatepolicy.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_bluegreenupdatepolicy.go
index 0e2436b307..f3ee9ca3f0 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_bluegreenupdatepolicy.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_bluegreenupdatepolicy.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Endpoint_BlueGreenUpdatePolicy AWS CloudFormation Resource (AWS::SageMaker::Endpoint.BlueGreenUpdatePolicy)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_capacitysize.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_capacitysize.go
similarity index 92%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_capacitysize.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_capacitysize.go
index c59a7d192f..420aefe908 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_capacitysize.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_capacitysize.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Endpoint_CapacitySize AWS CloudFormation Resource (AWS::SageMaker::Endpoint.CapacitySize)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_deploymentconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_deploymentconfig.go
similarity index 96%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_deploymentconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_deploymentconfig.go
index 695d1c3252..ff0627e5db 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_deploymentconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_deploymentconfig.go
@@ -1,7 +1,7 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Endpoint_DeploymentConfig AWS CloudFormation Resource (AWS::SageMaker::Endpoint.DeploymentConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_trafficroutingconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_trafficroutingconfig.go
similarity index 94%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_trafficroutingconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_trafficroutingconfig.go
index e821f36380..c76c17595a 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_trafficroutingconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_trafficroutingconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Endpoint_TrafficRoutingConfig AWS CloudFormation Resource (AWS::SageMaker::Endpoint.TrafficRoutingConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_variantproperty.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_variantproperty.go
similarity index 91%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_variantproperty.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_variantproperty.go
index f86c31c252..2510458cfe 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_variantproperty.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_variantproperty.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Endpoint_VariantProperty AWS CloudFormation Resource (AWS::SageMaker::Endpoint.VariantProperty)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig.go
similarity index 96%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig.go
index b5dc7e7406..b4071daa82 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EndpointConfig AWS CloudFormation Resource (AWS::SageMaker::EndpointConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceclientconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceclientconfig.go
similarity index 92%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceclientconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceclientconfig.go
index dd6b7fb1b6..e447ff4cb5 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceclientconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceclientconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EndpointConfig_AsyncInferenceClientConfig AWS CloudFormation Resource (AWS::SageMaker::EndpointConfig.AsyncInferenceClientConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceconfig.go
similarity index 96%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceconfig.go
index 8e5c732f45..1741d4d032 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceconfig.go
@@ -1,7 +1,7 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EndpointConfig_AsyncInferenceConfig AWS CloudFormation Resource (AWS::SageMaker::EndpointConfig.AsyncInferenceConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferencenotificationconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferencenotificationconfig.go
similarity index 93%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferencenotificationconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferencenotificationconfig.go
index a2980720f4..966e6bde4a 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferencenotificationconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferencenotificationconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EndpointConfig_AsyncInferenceNotificationConfig AWS CloudFormation Resource (AWS::SageMaker::EndpointConfig.AsyncInferenceNotificationConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceoutputconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceoutputconfig.go
similarity index 94%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceoutputconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceoutputconfig.go
index b1014b06a1..0c382ad72c 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceoutputconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceoutputconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EndpointConfig_AsyncInferenceOutputConfig AWS CloudFormation Resource (AWS::SageMaker::EndpointConfig.AsyncInferenceOutputConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_capturecontenttypeheader.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_capturecontenttypeheader.go
similarity index 93%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_capturecontenttypeheader.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_capturecontenttypeheader.go
index f39a01c4b9..fa5d7bdbb4 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_capturecontenttypeheader.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_capturecontenttypeheader.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EndpointConfig_CaptureContentTypeHeader AWS CloudFormation Resource (AWS::SageMaker::EndpointConfig.CaptureContentTypeHeader)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_captureoption.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_captureoption.go
similarity index 91%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_captureoption.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_captureoption.go
index 3e59a777de..05fb5df79a 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_captureoption.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_captureoption.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EndpointConfig_CaptureOption AWS CloudFormation Resource (AWS::SageMaker::EndpointConfig.CaptureOption)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_datacaptureconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_datacaptureconfig.go
similarity index 95%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_datacaptureconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_datacaptureconfig.go
index aa3c104cc8..cbaad37775 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_datacaptureconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_datacaptureconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EndpointConfig_DataCaptureConfig AWS CloudFormation Resource (AWS::SageMaker::EndpointConfig.DataCaptureConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_productionvariant.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_productionvariant.go
similarity index 96%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_productionvariant.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_productionvariant.go
index 4f993a3fbb..4b0bba7fbc 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_productionvariant.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_productionvariant.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EndpointConfig_ProductionVariant AWS CloudFormation Resource (AWS::SageMaker::EndpointConfig.ProductionVariant)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_serverlessconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_serverlessconfig.go
similarity index 93%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_serverlessconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_serverlessconfig.go
index 9abf255cd7..aa0667b944 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_serverlessconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_serverlessconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // EndpointConfig_ServerlessConfig AWS CloudFormation Resource (AWS::SageMaker::EndpointConfig.ServerlessConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-featuregroup.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-featuregroup.go
similarity index 96%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-featuregroup.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-featuregroup.go
index 8e5a1795c5..52e43674d1 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-featuregroup.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-featuregroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FeatureGroup AWS CloudFormation Resource (AWS::SageMaker::FeatureGroup)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-featuregroup_featuredefinition.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-featuregroup_featuredefinition.go
similarity index 93%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-featuregroup_featuredefinition.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-featuregroup_featuredefinition.go
index b5125fc43a..b31be0d1ab 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-featuregroup_featuredefinition.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-featuregroup_featuredefinition.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // FeatureGroup_FeatureDefinition AWS CloudFormation Resource (AWS::SageMaker::FeatureGroup.FeatureDefinition)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-image.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-image.go
similarity index 95%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-image.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-image.go
index 7d5455ea6f..0c1be8aa85 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-image.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-image.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Image AWS CloudFormation Resource (AWS::SageMaker::Image)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-imageversion.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-imageversion.go
similarity index 96%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-imageversion.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-imageversion.go
index ad1716bd50..613f48afca 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-imageversion.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-imageversion.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ImageVersion AWS CloudFormation Resource (AWS::SageMaker::ImageVersion)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-model.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-model.go
similarity index 96%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-model.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-model.go
index dcb5641058..b6e60182c7 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-model.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-model.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Model AWS CloudFormation Resource (AWS::SageMaker::Model)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-model_containerdefinition.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-model_containerdefinition.go
similarity index 96%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-model_containerdefinition.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-model_containerdefinition.go
index 9fb4f1a91c..5d31446ed5 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-model_containerdefinition.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-model_containerdefinition.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Model_ContainerDefinition AWS CloudFormation Resource (AWS::SageMaker::Model.ContainerDefinition)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-model_imageconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-model_imageconfig.go
similarity index 93%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-model_imageconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-model_imageconfig.go
index 9709c18bd1..ed62036785 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-model_imageconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-model_imageconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Model_ImageConfig AWS CloudFormation Resource (AWS::SageMaker::Model.ImageConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-model_inferenceexecutionconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-model_inferenceexecutionconfig.go
similarity index 91%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-model_inferenceexecutionconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-model_inferenceexecutionconfig.go
index c1ef301547..f1253fd277 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-model_inferenceexecutionconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-model_inferenceexecutionconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Model_InferenceExecutionConfig AWS CloudFormation Resource (AWS::SageMaker::Model.InferenceExecutionConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-model_multimodelconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-model_multimodelconfig.go
similarity index 92%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-model_multimodelconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-model_multimodelconfig.go
index f8168da188..63737a6202 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-model_multimodelconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-model_multimodelconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Model_MultiModelConfig AWS CloudFormation Resource (AWS::SageMaker::Model.MultiModelConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-model_repositoryauthconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-model_repositoryauthconfig.go
similarity index 92%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-model_repositoryauthconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-model_repositoryauthconfig.go
index f325ec5708..68b887aefa 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-model_repositoryauthconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-model_repositoryauthconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Model_RepositoryAuthConfig AWS CloudFormation Resource (AWS::SageMaker::Model.RepositoryAuthConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-model_vpcconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-model_vpcconfig.go
similarity index 92%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-model_vpcconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-model_vpcconfig.go
index b767b15f40..83720feb5b 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-model_vpcconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-model_vpcconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Model_VpcConfig AWS CloudFormation Resource (AWS::SageMaker::Model.VpcConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition.go
similarity index 97%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition.go
index 5935a706a5..2d128c7033 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelBiasJobDefinition AWS CloudFormation Resource (AWS::SageMaker::ModelBiasJobDefinition)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_clusterconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_clusterconfig.go
similarity index 94%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_clusterconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_clusterconfig.go
index 5df05193cb..b7e6e83019 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_clusterconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_clusterconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelBiasJobDefinition_ClusterConfig AWS CloudFormation Resource (AWS::SageMaker::ModelBiasJobDefinition.ClusterConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_constraintsresource.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_constraintsresource.go
similarity index 92%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_constraintsresource.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_constraintsresource.go
index cca3912216..46be2424cd 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_constraintsresource.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_constraintsresource.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelBiasJobDefinition_ConstraintsResource AWS CloudFormation Resource (AWS::SageMaker::ModelBiasJobDefinition.ConstraintsResource)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_endpointinput.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_endpointinput.go
similarity index 97%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_endpointinput.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_endpointinput.go
index 66a76ea64a..d83bb9015c 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_endpointinput.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_endpointinput.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelBiasJobDefinition_EndpointInput AWS CloudFormation Resource (AWS::SageMaker::ModelBiasJobDefinition.EndpointInput)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasappspecification.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasappspecification.go
similarity index 94%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasappspecification.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasappspecification.go
index 00fc661003..bb0423006b 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasappspecification.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasappspecification.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelBiasJobDefinition_ModelBiasAppSpecification AWS CloudFormation Resource (AWS::SageMaker::ModelBiasJobDefinition.ModelBiasAppSpecification)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasbaselineconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasbaselineconfig.go
similarity index 93%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasbaselineconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasbaselineconfig.go
index bdda20f068..fe5e26d03d 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasbaselineconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasbaselineconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelBiasJobDefinition_ModelBiasBaselineConfig AWS CloudFormation Resource (AWS::SageMaker::ModelBiasJobDefinition.ModelBiasBaselineConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasjobinput.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasjobinput.go
similarity index 96%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasjobinput.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasjobinput.go
index f5904ac117..dfcbff7f7b 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasjobinput.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasjobinput.go
@@ -1,7 +1,7 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelBiasJobDefinition_ModelBiasJobInput AWS CloudFormation Resource (AWS::SageMaker::ModelBiasJobDefinition.ModelBiasJobInput)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringgroundtruths3input.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringgroundtruths3input.go
similarity index 92%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringgroundtruths3input.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringgroundtruths3input.go
index 7b4c5a035c..746d5c8616 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringgroundtruths3input.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringgroundtruths3input.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelBiasJobDefinition_MonitoringGroundTruthS3Input AWS CloudFormation Resource (AWS::SageMaker::ModelBiasJobDefinition.MonitoringGroundTruthS3Input)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringoutput.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringoutput.go
similarity index 95%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringoutput.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringoutput.go
index 4b154b622f..24ed635eff 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringoutput.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringoutput.go
@@ -1,7 +1,7 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelBiasJobDefinition_MonitoringOutput AWS CloudFormation Resource (AWS::SageMaker::ModelBiasJobDefinition.MonitoringOutput)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringoutputconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringoutputconfig.go
similarity index 93%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringoutputconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringoutputconfig.go
index e0d437a06d..741287c049 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringoutputconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringoutputconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelBiasJobDefinition_MonitoringOutputConfig AWS CloudFormation Resource (AWS::SageMaker::ModelBiasJobDefinition.MonitoringOutputConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringresources.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringresources.go
similarity index 96%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringresources.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringresources.go
index 674033738d..8bc8fd99bc 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringresources.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringresources.go
@@ -1,7 +1,7 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelBiasJobDefinition_MonitoringResources AWS CloudFormation Resource (AWS::SageMaker::ModelBiasJobDefinition.MonitoringResources)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_networkconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_networkconfig.go
similarity index 94%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_networkconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_networkconfig.go
index 32c1a6c77b..1cc2decfe1 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_networkconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_networkconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelBiasJobDefinition_NetworkConfig AWS CloudFormation Resource (AWS::SageMaker::ModelBiasJobDefinition.NetworkConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_s3output.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_s3output.go
similarity index 94%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_s3output.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_s3output.go
index 1327a72733..6ffe4c406e 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_s3output.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_s3output.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelBiasJobDefinition_S3Output AWS CloudFormation Resource (AWS::SageMaker::ModelBiasJobDefinition.S3Output)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_stoppingcondition.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_stoppingcondition.go
similarity index 92%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_stoppingcondition.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_stoppingcondition.go
index 211002f3a2..4c04a4c92c 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_stoppingcondition.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_stoppingcondition.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelBiasJobDefinition_StoppingCondition AWS CloudFormation Resource (AWS::SageMaker::ModelBiasJobDefinition.StoppingCondition)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_vpcconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_vpcconfig.go
similarity index 93%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_vpcconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_vpcconfig.go
index 86667d14e8..44547cf130 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_vpcconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_vpcconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelBiasJobDefinition_VpcConfig AWS CloudFormation Resource (AWS::SageMaker::ModelBiasJobDefinition.VpcConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition.go
similarity index 97%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition.go
index f04356bd24..a85a236df5 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelExplainabilityJobDefinition AWS CloudFormation Resource (AWS::SageMaker::ModelExplainabilityJobDefinition)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_clusterconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_clusterconfig.go
similarity index 95%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_clusterconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_clusterconfig.go
index 6b9fdc30c7..0cf63a1a03 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_clusterconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_clusterconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelExplainabilityJobDefinition_ClusterConfig AWS CloudFormation Resource (AWS::SageMaker::ModelExplainabilityJobDefinition.ClusterConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_constraintsresource.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_constraintsresource.go
similarity index 92%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_constraintsresource.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_constraintsresource.go
index 847dc3f6ce..ecfbca6e89 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_constraintsresource.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_constraintsresource.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelExplainabilityJobDefinition_ConstraintsResource AWS CloudFormation Resource (AWS::SageMaker::ModelExplainabilityJobDefinition.ConstraintsResource)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_endpointinput.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_endpointinput.go
similarity index 96%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_endpointinput.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_endpointinput.go
index 730ddd58cf..24c89f082c 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_endpointinput.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_endpointinput.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelExplainabilityJobDefinition_EndpointInput AWS CloudFormation Resource (AWS::SageMaker::ModelExplainabilityJobDefinition.EndpointInput)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilityappspecification.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilityappspecification.go
similarity index 95%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilityappspecification.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilityappspecification.go
index 64b0eba380..312001f6e6 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilityappspecification.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilityappspecification.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelExplainabilityJobDefinition_ModelExplainabilityAppSpecification AWS CloudFormation Resource (AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityAppSpecification)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilitybaselineconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilitybaselineconfig.go
similarity index 94%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilitybaselineconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilitybaselineconfig.go
index 28900760b7..aabd7e53dc 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilitybaselineconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilitybaselineconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelExplainabilityJobDefinition_ModelExplainabilityBaselineConfig AWS CloudFormation Resource (AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityBaselineConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilityjobinput.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilityjobinput.go
similarity index 96%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilityjobinput.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilityjobinput.go
index 03d1a68ded..3cbdedfa2c 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilityjobinput.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilityjobinput.go
@@ -1,7 +1,7 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelExplainabilityJobDefinition_ModelExplainabilityJobInput AWS CloudFormation Resource (AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityJobInput)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringoutput.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringoutput.go
similarity index 96%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringoutput.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringoutput.go
index 34fc40376d..7e05c1d1da 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringoutput.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringoutput.go
@@ -1,7 +1,7 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelExplainabilityJobDefinition_MonitoringOutput AWS CloudFormation Resource (AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringOutput)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringoutputconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringoutputconfig.go
similarity index 94%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringoutputconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringoutputconfig.go
index edac619755..a3ef05ab47 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringoutputconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringoutputconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelExplainabilityJobDefinition_MonitoringOutputConfig AWS CloudFormation Resource (AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringOutputConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringresources.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringresources.go
similarity index 96%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringresources.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringresources.go
index 156b2782ee..e62ce92dda 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringresources.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringresources.go
@@ -1,7 +1,7 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelExplainabilityJobDefinition_MonitoringResources AWS CloudFormation Resource (AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringResources)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_networkconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_networkconfig.go
similarity index 94%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_networkconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_networkconfig.go
index 44f90c7c31..8aa82ee0d5 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_networkconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_networkconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelExplainabilityJobDefinition_NetworkConfig AWS CloudFormation Resource (AWS::SageMaker::ModelExplainabilityJobDefinition.NetworkConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_s3output.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_s3output.go
similarity index 94%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_s3output.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_s3output.go
index 1fff2e779b..3e95a1d166 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_s3output.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_s3output.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelExplainabilityJobDefinition_S3Output AWS CloudFormation Resource (AWS::SageMaker::ModelExplainabilityJobDefinition.S3Output)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_stoppingcondition.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_stoppingcondition.go
similarity index 92%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_stoppingcondition.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_stoppingcondition.go
index e7187e0dc7..687e0e9db0 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_stoppingcondition.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_stoppingcondition.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelExplainabilityJobDefinition_StoppingCondition AWS CloudFormation Resource (AWS::SageMaker::ModelExplainabilityJobDefinition.StoppingCondition)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_vpcconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_vpcconfig.go
similarity index 93%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_vpcconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_vpcconfig.go
index 2c4a86495c..9c26ec5391 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_vpcconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_vpcconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelExplainabilityJobDefinition_VpcConfig AWS CloudFormation Resource (AWS::SageMaker::ModelExplainabilityJobDefinition.VpcConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelpackagegroup.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelpackagegroup.go
similarity index 95%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelpackagegroup.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelpackagegroup.go
index cb989f9bac..d5f1fe7df9 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelpackagegroup.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelpackagegroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelPackageGroup AWS CloudFormation Resource (AWS::SageMaker::ModelPackageGroup)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition.go
similarity index 97%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition.go
index 79e540110e..2abf51d25d 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelQualityJobDefinition AWS CloudFormation Resource (AWS::SageMaker::ModelQualityJobDefinition)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_clusterconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_clusterconfig.go
similarity index 95%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_clusterconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_clusterconfig.go
index e905af1e4b..3b73d73c6b 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_clusterconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_clusterconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelQualityJobDefinition_ClusterConfig AWS CloudFormation Resource (AWS::SageMaker::ModelQualityJobDefinition.ClusterConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_constraintsresource.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_constraintsresource.go
similarity index 92%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_constraintsresource.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_constraintsresource.go
index 8c3c853234..e874ea10d6 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_constraintsresource.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_constraintsresource.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelQualityJobDefinition_ConstraintsResource AWS CloudFormation Resource (AWS::SageMaker::ModelQualityJobDefinition.ConstraintsResource)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_endpointinput.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_endpointinput.go
similarity index 96%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_endpointinput.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_endpointinput.go
index 8f647cf80f..c0b2e37f5d 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_endpointinput.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_endpointinput.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelQualityJobDefinition_EndpointInput AWS CloudFormation Resource (AWS::SageMaker::ModelQualityJobDefinition.EndpointInput)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualityappspecification.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualityappspecification.go
similarity index 96%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualityappspecification.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualityappspecification.go
index 2588f08573..34ba4c49be 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualityappspecification.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualityappspecification.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelQualityJobDefinition_ModelQualityAppSpecification AWS CloudFormation Resource (AWS::SageMaker::ModelQualityJobDefinition.ModelQualityAppSpecification)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualitybaselineconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualitybaselineconfig.go
similarity index 94%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualitybaselineconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualitybaselineconfig.go
index 056120774b..60f11e247b 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualitybaselineconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualitybaselineconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelQualityJobDefinition_ModelQualityBaselineConfig AWS CloudFormation Resource (AWS::SageMaker::ModelQualityJobDefinition.ModelQualityBaselineConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualityjobinput.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualityjobinput.go
similarity index 96%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualityjobinput.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualityjobinput.go
index 95eca30da8..548df61b51 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualityjobinput.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualityjobinput.go
@@ -1,7 +1,7 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelQualityJobDefinition_ModelQualityJobInput AWS CloudFormation Resource (AWS::SageMaker::ModelQualityJobDefinition.ModelQualityJobInput)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringgroundtruths3input.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringgroundtruths3input.go
similarity index 92%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringgroundtruths3input.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringgroundtruths3input.go
index fb1eb287fc..ca5984410a 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringgroundtruths3input.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringgroundtruths3input.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelQualityJobDefinition_MonitoringGroundTruthS3Input AWS CloudFormation Resource (AWS::SageMaker::ModelQualityJobDefinition.MonitoringGroundTruthS3Input)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringoutput.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringoutput.go
similarity index 96%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringoutput.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringoutput.go
index f5b24f0411..7a2b3e00a8 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringoutput.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringoutput.go
@@ -1,7 +1,7 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelQualityJobDefinition_MonitoringOutput AWS CloudFormation Resource (AWS::SageMaker::ModelQualityJobDefinition.MonitoringOutput)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringoutputconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringoutputconfig.go
similarity index 93%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringoutputconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringoutputconfig.go
index 87eab3e355..35e72f921b 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringoutputconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringoutputconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelQualityJobDefinition_MonitoringOutputConfig AWS CloudFormation Resource (AWS::SageMaker::ModelQualityJobDefinition.MonitoringOutputConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringresources.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringresources.go
similarity index 96%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringresources.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringresources.go
index 2c8c0e08a7..a061c578c2 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringresources.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringresources.go
@@ -1,7 +1,7 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelQualityJobDefinition_MonitoringResources AWS CloudFormation Resource (AWS::SageMaker::ModelQualityJobDefinition.MonitoringResources)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_networkconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_networkconfig.go
similarity index 94%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_networkconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_networkconfig.go
index fa0fe30fb7..22ae2024e3 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_networkconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_networkconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelQualityJobDefinition_NetworkConfig AWS CloudFormation Resource (AWS::SageMaker::ModelQualityJobDefinition.NetworkConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_s3output.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_s3output.go
similarity index 94%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_s3output.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_s3output.go
index 516412ca81..811964e11e 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_s3output.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_s3output.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelQualityJobDefinition_S3Output AWS CloudFormation Resource (AWS::SageMaker::ModelQualityJobDefinition.S3Output)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_stoppingcondition.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_stoppingcondition.go
similarity index 92%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_stoppingcondition.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_stoppingcondition.go
index 62e771dec8..44fece4c0e 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_stoppingcondition.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_stoppingcondition.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelQualityJobDefinition_StoppingCondition AWS CloudFormation Resource (AWS::SageMaker::ModelQualityJobDefinition.StoppingCondition)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_vpcconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_vpcconfig.go
similarity index 93%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_vpcconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_vpcconfig.go
index f0ba08093c..9ffe51065d 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_vpcconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_vpcconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ModelQualityJobDefinition_VpcConfig AWS CloudFormation Resource (AWS::SageMaker::ModelQualityJobDefinition.VpcConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule.go
similarity index 96%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule.go
index 73eb3fd741..97b9b7cd04 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MonitoringSchedule AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_baselineconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_baselineconfig.go
similarity index 96%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_baselineconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_baselineconfig.go
index ef9f8161a4..07824a396e 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_baselineconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_baselineconfig.go
@@ -1,7 +1,7 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MonitoringSchedule_BaselineConfig AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.BaselineConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_clusterconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_clusterconfig.go
similarity index 94%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_clusterconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_clusterconfig.go
index 4c4537f021..c894cfc134 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_clusterconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_clusterconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MonitoringSchedule_ClusterConfig AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.ClusterConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_constraintsresource.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_constraintsresource.go
similarity index 92%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_constraintsresource.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_constraintsresource.go
index 46cfb777f7..4b961910f9 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_constraintsresource.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_constraintsresource.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MonitoringSchedule_ConstraintsResource AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.ConstraintsResource)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_endpointinput.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_endpointinput.go
similarity index 94%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_endpointinput.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_endpointinput.go
index cd8b91346f..3af9973099 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_endpointinput.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_endpointinput.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MonitoringSchedule_EndpointInput AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.EndpointInput)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_environment.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_environment.go
similarity index 94%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_environment.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_environment.go
index 4a6b02d178..3d71c7653a 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_environment.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_environment.go
@@ -1,7 +1,7 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MonitoringSchedule_Environment AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.Environment)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringappspecification.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringappspecification.go
similarity index 95%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringappspecification.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringappspecification.go
index 49c2113647..c6eeb82663 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringappspecification.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringappspecification.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MonitoringSchedule_MonitoringAppSpecification AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.MonitoringAppSpecification)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringexecutionsummary.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringexecutionsummary.go
similarity index 96%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringexecutionsummary.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringexecutionsummary.go
index fddab5cb38..56936ac481 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringexecutionsummary.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringexecutionsummary.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MonitoringSchedule_MonitoringExecutionSummary AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.MonitoringExecutionSummary)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringinput.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringinput.go
similarity index 95%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringinput.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringinput.go
index a024cef526..dd16c0a3e4 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringinput.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringinput.go
@@ -1,7 +1,7 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MonitoringSchedule_MonitoringInput AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.MonitoringInput)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringinputs.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringinputs.go
similarity index 95%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringinputs.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringinputs.go
index 2c0eb755ad..c9a7f3244f 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringinputs.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringinputs.go
@@ -1,7 +1,7 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MonitoringSchedule_MonitoringInputs AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.MonitoringInputs)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringjobdefinition.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringjobdefinition.go
similarity index 97%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringjobdefinition.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringjobdefinition.go
index 041c9366bf..a3082f0836 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringjobdefinition.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringjobdefinition.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MonitoringSchedule_MonitoringJobDefinition AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.MonitoringJobDefinition)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringoutput.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringoutput.go
similarity index 95%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringoutput.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringoutput.go
index 141fde8a5d..82457005a3 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringoutput.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringoutput.go
@@ -1,7 +1,7 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MonitoringSchedule_MonitoringOutput AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.MonitoringOutput)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringoutputconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringoutputconfig.go
similarity index 93%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringoutputconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringoutputconfig.go
index b663580752..0cfe102968 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringoutputconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringoutputconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MonitoringSchedule_MonitoringOutputConfig AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.MonitoringOutputConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringresources.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringresources.go
similarity index 95%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringresources.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringresources.go
index b46be6edbe..40eaac914b 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringresources.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringresources.go
@@ -1,7 +1,7 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MonitoringSchedule_MonitoringResources AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.MonitoringResources)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringscheduleconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringscheduleconfig.go
similarity index 95%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringscheduleconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringscheduleconfig.go
index 4020ab2745..aee8041578 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringscheduleconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringscheduleconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MonitoringSchedule_MonitoringScheduleConfig AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.MonitoringScheduleConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_networkconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_networkconfig.go
similarity index 94%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_networkconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_networkconfig.go
index 21a8bb4b9e..9fa0f712d0 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_networkconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_networkconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MonitoringSchedule_NetworkConfig AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.NetworkConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_s3output.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_s3output.go
similarity index 93%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_s3output.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_s3output.go
index d90e39ac4f..5c6b688b15 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_s3output.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_s3output.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MonitoringSchedule_S3Output AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.S3Output)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_scheduleconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_scheduleconfig.go
similarity index 92%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_scheduleconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_scheduleconfig.go
index c4132efa47..a10e0a06ce 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_scheduleconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_scheduleconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MonitoringSchedule_ScheduleConfig AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.ScheduleConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_statisticsresource.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_statisticsresource.go
similarity index 92%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_statisticsresource.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_statisticsresource.go
index c8917da5c3..82aa5fdbfd 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_statisticsresource.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_statisticsresource.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MonitoringSchedule_StatisticsResource AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.StatisticsResource)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_stoppingcondition.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_stoppingcondition.go
similarity index 92%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_stoppingcondition.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_stoppingcondition.go
index ae02c66286..7f4a94fa92 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_stoppingcondition.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_stoppingcondition.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MonitoringSchedule_StoppingCondition AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.StoppingCondition)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_vpcconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_vpcconfig.go
similarity index 93%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_vpcconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_vpcconfig.go
index e4dc9f3afe..491f767393 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_vpcconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_vpcconfig.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MonitoringSchedule_VpcConfig AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.VpcConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-notebookinstance.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-notebookinstance.go
similarity index 97%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-notebookinstance.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-notebookinstance.go
index a675db927d..a3a43467c3 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-notebookinstance.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-notebookinstance.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NotebookInstance AWS CloudFormation Resource (AWS::SageMaker::NotebookInstance)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-notebookinstancelifecycleconfig.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-notebookinstancelifecycleconfig.go
similarity index 97%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-notebookinstancelifecycleconfig.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-notebookinstancelifecycleconfig.go
index e4615c8f52..08ee3a22da 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-notebookinstancelifecycleconfig.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-notebookinstancelifecycleconfig.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NotebookInstanceLifecycleConfig AWS CloudFormation Resource (AWS::SageMaker::NotebookInstanceLifecycleConfig)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-notebookinstancelifecycleconfig_notebookinstancelifecyclehook.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-notebookinstancelifecycleconfig_notebookinstancelifecyclehook.go
similarity index 92%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-notebookinstancelifecycleconfig_notebookinstancelifecyclehook.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-notebookinstancelifecycleconfig_notebookinstancelifecyclehook.go
index 719ad855c9..69e75e937c 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-notebookinstancelifecycleconfig_notebookinstancelifecyclehook.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-notebookinstancelifecycleconfig_notebookinstancelifecyclehook.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // NotebookInstanceLifecycleConfig_NotebookInstanceLifecycleHook AWS CloudFormation Resource (AWS::SageMaker::NotebookInstanceLifecycleConfig.NotebookInstanceLifecycleHook)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-pipeline.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-pipeline.go
similarity index 96%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-pipeline.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-pipeline.go
index 017c8c1ae4..c72687b72e 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-pipeline.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-pipeline.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Pipeline AWS CloudFormation Resource (AWS::SageMaker::Pipeline)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-project.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-project.go
similarity index 95%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-project.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-project.go
index d7ce7e8f5d..3fbe4de580 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-project.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-project.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Project AWS CloudFormation Resource (AWS::SageMaker::Project)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile.go
similarity index 96%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-userprofile.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile.go
index f05f95e6c8..8b22d68a07 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserProfile AWS CloudFormation Resource (AWS::SageMaker::UserProfile)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_customimage.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_customimage.go
similarity index 93%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_customimage.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_customimage.go
index b36760d8c1..ae9516d524 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_customimage.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_customimage.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserProfile_CustomImage AWS CloudFormation Resource (AWS::SageMaker::UserProfile.CustomImage)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_jupyterserverappsettings.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_jupyterserverappsettings.go
similarity index 95%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_jupyterserverappsettings.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_jupyterserverappsettings.go
index 9bb4bdb28c..ba518db47d 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_jupyterserverappsettings.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_jupyterserverappsettings.go
@@ -1,7 +1,7 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserProfile_JupyterServerAppSettings AWS CloudFormation Resource (AWS::SageMaker::UserProfile.JupyterServerAppSettings)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_kernelgatewayappsettings.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_kernelgatewayappsettings.go
similarity index 96%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_kernelgatewayappsettings.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_kernelgatewayappsettings.go
index e8ce1c1f08..6ebcce48b4 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_kernelgatewayappsettings.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_kernelgatewayappsettings.go
@@ -1,7 +1,7 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserProfile_KernelGatewayAppSettings AWS CloudFormation Resource (AWS::SageMaker::UserProfile.KernelGatewayAppSettings)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_resourcespec.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_resourcespec.go
similarity index 94%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_resourcespec.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_resourcespec.go
index 66489f2dfe..707c0db28b 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_resourcespec.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_resourcespec.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserProfile_ResourceSpec AWS CloudFormation Resource (AWS::SageMaker::UserProfile.ResourceSpec)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_sharingsettings.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_sharingsettings.go
similarity index 94%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_sharingsettings.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_sharingsettings.go
index 43f66d719a..a187b19e4d 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_sharingsettings.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_sharingsettings.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserProfile_SharingSettings AWS CloudFormation Resource (AWS::SageMaker::UserProfile.SharingSettings)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_usersettings.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_usersettings.go
similarity index 95%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_usersettings.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_usersettings.go
index 35df528dbf..4614801366 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_usersettings.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_usersettings.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // UserProfile_UserSettings AWS CloudFormation Resource (AWS::SageMaker::UserProfile.UserSettings)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-workteam.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-workteam.go
similarity index 95%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-workteam.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-workteam.go
index 1f7916794f..e01be680be 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-workteam.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-workteam.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Workteam AWS CloudFormation Resource (AWS::SageMaker::Workteam)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-workteam_cognitomemberdefinition.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-workteam_cognitomemberdefinition.go
similarity index 94%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-workteam_cognitomemberdefinition.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-workteam_cognitomemberdefinition.go
index c63f6dcd42..b7af7370d3 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-workteam_cognitomemberdefinition.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-workteam_cognitomemberdefinition.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Workteam_CognitoMemberDefinition AWS CloudFormation Resource (AWS::SageMaker::Workteam.CognitoMemberDefinition)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-workteam_memberdefinition.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-workteam_memberdefinition.go
similarity index 95%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-workteam_memberdefinition.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-workteam_memberdefinition.go
index aa0a4c2257..5eb8d7fb47 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-workteam_memberdefinition.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-workteam_memberdefinition.go
@@ -1,7 +1,7 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Workteam_MemberDefinition AWS CloudFormation Resource (AWS::SageMaker::Workteam.MemberDefinition)
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-workteam_notificationconfiguration.go b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-workteam_notificationconfiguration.go
similarity index 92%
rename from goformation/cloudformation/sagemaker/aws-sagemaker-workteam_notificationconfiguration.go
rename to pkg/goformation/cloudformation/sagemaker/aws-sagemaker-workteam_notificationconfiguration.go
index 0e4bdafb0a..26665692fa 100644
--- a/goformation/cloudformation/sagemaker/aws-sagemaker-workteam_notificationconfiguration.go
+++ b/pkg/goformation/cloudformation/sagemaker/aws-sagemaker-workteam_notificationconfiguration.go
@@ -1,9 +1,9 @@
 package sagemaker
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Workteam_NotificationConfiguration AWS CloudFormation Resource (AWS::SageMaker::Workteam.NotificationConfiguration)
diff --git a/goformation/cloudformation/sdb/aws-sdb-domain.go b/pkg/goformation/cloudformation/sdb/aws-sdb-domain.go
similarity index 96%
rename from goformation/cloudformation/sdb/aws-sdb-domain.go
rename to pkg/goformation/cloudformation/sdb/aws-sdb-domain.go
index 1e4a7b90f6..a1ce19ec66 100644
--- a/goformation/cloudformation/sdb/aws-sdb-domain.go
+++ b/pkg/goformation/cloudformation/sdb/aws-sdb-domain.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Domain AWS CloudFormation Resource (AWS::SDB::Domain)
diff --git a/goformation/cloudformation/secretsmanager/aws-secretsmanager-resourcepolicy.go b/pkg/goformation/cloudformation/secretsmanager/aws-secretsmanager-resourcepolicy.go
similarity index 97%
rename from goformation/cloudformation/secretsmanager/aws-secretsmanager-resourcepolicy.go
rename to pkg/goformation/cloudformation/secretsmanager/aws-secretsmanager-resourcepolicy.go
index 8b64fa837e..5d616bc9ef 100644
--- a/goformation/cloudformation/secretsmanager/aws-secretsmanager-resourcepolicy.go
+++ b/pkg/goformation/cloudformation/secretsmanager/aws-secretsmanager-resourcepolicy.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourcePolicy AWS CloudFormation Resource (AWS::SecretsManager::ResourcePolicy)
diff --git a/goformation/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule.go b/pkg/goformation/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule.go
similarity index 97%
rename from goformation/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule.go
rename to pkg/goformation/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule.go
index 5b25009e4b..01f82d5b43 100644
--- a/goformation/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule.go
+++ b/pkg/goformation/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RotationSchedule AWS CloudFormation Resource (AWS::SecretsManager::RotationSchedule)
diff --git a/goformation/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule_hostedrotationlambda.go b/pkg/goformation/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule_hostedrotationlambda.go
similarity index 97%
rename from goformation/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule_hostedrotationlambda.go
rename to pkg/goformation/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule_hostedrotationlambda.go
index 89e38a0ff0..efac954adc 100644
--- a/goformation/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule_hostedrotationlambda.go
+++ b/pkg/goformation/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule_hostedrotationlambda.go
@@ -1,9 +1,9 @@
 package secretsmanager
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RotationSchedule_HostedRotationLambda AWS CloudFormation Resource (AWS::SecretsManager::RotationSchedule.HostedRotationLambda)
diff --git a/goformation/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule_rotationrules.go b/pkg/goformation/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule_rotationrules.go
similarity index 92%
rename from goformation/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule_rotationrules.go
rename to pkg/goformation/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule_rotationrules.go
index 548c4ea79c..57a617a290 100644
--- a/goformation/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule_rotationrules.go
+++ b/pkg/goformation/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule_rotationrules.go
@@ -1,9 +1,9 @@
 package secretsmanager
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RotationSchedule_RotationRules AWS CloudFormation Resource (AWS::SecretsManager::RotationSchedule.RotationRules)
diff --git a/goformation/cloudformation/secretsmanager/aws-secretsmanager-secret.go b/pkg/goformation/cloudformation/secretsmanager/aws-secretsmanager-secret.go
similarity index 96%
rename from goformation/cloudformation/secretsmanager/aws-secretsmanager-secret.go
rename to pkg/goformation/cloudformation/secretsmanager/aws-secretsmanager-secret.go
index c10429c0ce..554bf434e0 100644
--- a/goformation/cloudformation/secretsmanager/aws-secretsmanager-secret.go
+++ b/pkg/goformation/cloudformation/secretsmanager/aws-secretsmanager-secret.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Secret AWS CloudFormation Resource (AWS::SecretsManager::Secret)
diff --git a/goformation/cloudformation/secretsmanager/aws-secretsmanager-secret_generatesecretstring.go b/pkg/goformation/cloudformation/secretsmanager/aws-secretsmanager-secret_generatesecretstring.go
similarity index 97%
rename from goformation/cloudformation/secretsmanager/aws-secretsmanager-secret_generatesecretstring.go
rename to pkg/goformation/cloudformation/secretsmanager/aws-secretsmanager-secret_generatesecretstring.go
index 9d415020e5..014627a8e8 100644
--- a/goformation/cloudformation/secretsmanager/aws-secretsmanager-secret_generatesecretstring.go
+++ b/pkg/goformation/cloudformation/secretsmanager/aws-secretsmanager-secret_generatesecretstring.go
@@ -1,9 +1,9 @@
 package secretsmanager
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Secret_GenerateSecretString AWS CloudFormation Resource (AWS::SecretsManager::Secret.GenerateSecretString)
diff --git a/goformation/cloudformation/secretsmanager/aws-secretsmanager-secret_replicaregion.go b/pkg/goformation/cloudformation/secretsmanager/aws-secretsmanager-secret_replicaregion.go
similarity index 92%
rename from goformation/cloudformation/secretsmanager/aws-secretsmanager-secret_replicaregion.go
rename to pkg/goformation/cloudformation/secretsmanager/aws-secretsmanager-secret_replicaregion.go
index 2e8a7319df..e0dc977db7 100644
--- a/goformation/cloudformation/secretsmanager/aws-secretsmanager-secret_replicaregion.go
+++ b/pkg/goformation/cloudformation/secretsmanager/aws-secretsmanager-secret_replicaregion.go
@@ -1,9 +1,9 @@
 package secretsmanager
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Secret_ReplicaRegion AWS CloudFormation Resource (AWS::SecretsManager::Secret.ReplicaRegion)
diff --git a/goformation/cloudformation/secretsmanager/aws-secretsmanager-secrettargetattachment.go b/pkg/goformation/cloudformation/secretsmanager/aws-secretsmanager-secrettargetattachment.go
similarity index 97%
rename from goformation/cloudformation/secretsmanager/aws-secretsmanager-secrettargetattachment.go
rename to pkg/goformation/cloudformation/secretsmanager/aws-secretsmanager-secrettargetattachment.go
index 283f7f3802..58ab3741d2 100644
--- a/goformation/cloudformation/secretsmanager/aws-secretsmanager-secrettargetattachment.go
+++ b/pkg/goformation/cloudformation/secretsmanager/aws-secretsmanager-secrettargetattachment.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SecretTargetAttachment AWS CloudFormation Resource (AWS::SecretsManager::SecretTargetAttachment)
diff --git a/goformation/cloudformation/securityhub/aws-securityhub-hub.go b/pkg/goformation/cloudformation/securityhub/aws-securityhub-hub.go
similarity index 98%
rename from goformation/cloudformation/securityhub/aws-securityhub-hub.go
rename to pkg/goformation/cloudformation/securityhub/aws-securityhub-hub.go
index 4d9bcb3003..64d0938f73 100644
--- a/goformation/cloudformation/securityhub/aws-securityhub-hub.go
+++ b/pkg/goformation/cloudformation/securityhub/aws-securityhub-hub.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Hub AWS CloudFormation Resource (AWS::SecurityHub::Hub)
diff --git a/goformation/cloudformation/serverless/api_cors.go b/pkg/goformation/cloudformation/serverless/api_cors.go
similarity index 89%
rename from goformation/cloudformation/serverless/api_cors.go
rename to pkg/goformation/cloudformation/serverless/api_cors.go
index 5f6e68eb27..a0c206658a 100644
--- a/goformation/cloudformation/serverless/api_cors.go
+++ b/pkg/goformation/cloudformation/serverless/api_cors.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"sort"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
-	"github.com/awslabs/goformation/v4/cloudformation/utils"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/utils"
 )
 
 // Api_Cors is a helper struct that can hold either a String or CorsConfiguration value
diff --git a/goformation/cloudformation/serverless/api_definitionuri.go b/pkg/goformation/cloudformation/serverless/api_definitionuri.go
similarity index 89%
rename from goformation/cloudformation/serverless/api_definitionuri.go
rename to pkg/goformation/cloudformation/serverless/api_definitionuri.go
index 9b590f2c6f..a51f2ae5f0 100644
--- a/goformation/cloudformation/serverless/api_definitionuri.go
+++ b/pkg/goformation/cloudformation/serverless/api_definitionuri.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"sort"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
-	"github.com/awslabs/goformation/v4/cloudformation/utils"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/utils"
 )
 
 // Api_DefinitionUri is a helper struct that can hold either a String or S3Location value
diff --git a/goformation/cloudformation/serverless/application_location.go b/pkg/goformation/cloudformation/serverless/application_location.go
similarity index 90%
rename from goformation/cloudformation/serverless/application_location.go
rename to pkg/goformation/cloudformation/serverless/application_location.go
index fbe7c25fa4..bb6e3e9cab 100644
--- a/goformation/cloudformation/serverless/application_location.go
+++ b/pkg/goformation/cloudformation/serverless/application_location.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"sort"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
-	"github.com/awslabs/goformation/v4/cloudformation/utils"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/utils"
 )
 
 // Application_Location is a helper struct that can hold either a String or ApplicationLocation value
diff --git a/goformation/cloudformation/serverless/aws-serverless-api.go b/pkg/goformation/cloudformation/serverless/aws-serverless-api.go
similarity index 98%
rename from goformation/cloudformation/serverless/aws-serverless-api.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-api.go
index 3a77d17bd4..43c622063c 100644
--- a/goformation/cloudformation/serverless/aws-serverless-api.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-api.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Api AWS CloudFormation Resource (AWS::Serverless::Api)
diff --git a/goformation/cloudformation/serverless/aws-serverless-api_accesslogsetting.go b/pkg/goformation/cloudformation/serverless/aws-serverless-api_accesslogsetting.go
similarity index 92%
rename from goformation/cloudformation/serverless/aws-serverless-api_accesslogsetting.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-api_accesslogsetting.go
index c25f6a42e5..018e89d936 100644
--- a/goformation/cloudformation/serverless/aws-serverless-api_accesslogsetting.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-api_accesslogsetting.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Api_AccessLogSetting AWS CloudFormation Resource (AWS::Serverless::Api.AccessLogSetting)
diff --git a/goformation/cloudformation/serverless/aws-serverless-api_auth.go b/pkg/goformation/cloudformation/serverless/aws-serverless-api_auth.go
similarity index 92%
rename from goformation/cloudformation/serverless/aws-serverless-api_auth.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-api_auth.go
index 2148b9924c..60abe23ddf 100644
--- a/goformation/cloudformation/serverless/aws-serverless-api_auth.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-api_auth.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Api_Auth AWS CloudFormation Resource (AWS::Serverless::Api.Auth)
diff --git a/goformation/cloudformation/serverless/aws-serverless-api_corsconfiguration.go b/pkg/goformation/cloudformation/serverless/aws-serverless-api_corsconfiguration.go
similarity index 94%
rename from goformation/cloudformation/serverless/aws-serverless-api_corsconfiguration.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-api_corsconfiguration.go
index baf16f5034..f6e6cf84cc 100644
--- a/goformation/cloudformation/serverless/aws-serverless-api_corsconfiguration.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-api_corsconfiguration.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Api_CorsConfiguration AWS CloudFormation Resource (AWS::Serverless::Api.CorsConfiguration)
diff --git a/goformation/cloudformation/serverless/aws-serverless-api_s3location.go b/pkg/goformation/cloudformation/serverless/aws-serverless-api_s3location.go
similarity index 93%
rename from goformation/cloudformation/serverless/aws-serverless-api_s3location.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-api_s3location.go
index f7dd66bb8e..90141b6133 100644
--- a/goformation/cloudformation/serverless/aws-serverless-api_s3location.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-api_s3location.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Api_S3Location AWS CloudFormation Resource (AWS::Serverless::Api.S3Location)
diff --git a/goformation/cloudformation/serverless/aws-serverless-application.go b/pkg/goformation/cloudformation/serverless/aws-serverless-application.go
similarity index 97%
rename from goformation/cloudformation/serverless/aws-serverless-application.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-application.go
index 1ae6712efe..02b58b8f28 100644
--- a/goformation/cloudformation/serverless/aws-serverless-application.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-application.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application AWS CloudFormation Resource (AWS::Serverless::Application)
diff --git a/goformation/cloudformation/serverless/aws-serverless-application_applicationlocation.go b/pkg/goformation/cloudformation/serverless/aws-serverless-application_applicationlocation.go
similarity index 92%
rename from goformation/cloudformation/serverless/aws-serverless-application_applicationlocation.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-application_applicationlocation.go
index a23011e88c..d3300e4d48 100644
--- a/goformation/cloudformation/serverless/aws-serverless-application_applicationlocation.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-application_applicationlocation.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application_ApplicationLocation AWS CloudFormation Resource (AWS::Serverless::Application.ApplicationLocation)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function.go
similarity index 98%
rename from goformation/cloudformation/serverless/aws-serverless-function.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function.go
index f5270c1f4c..1f6803eb74 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function AWS CloudFormation Resource (AWS::Serverless::Function)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_alexaskillevent.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_alexaskillevent.go
similarity index 91%
rename from goformation/cloudformation/serverless/aws-serverless-function_alexaskillevent.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_alexaskillevent.go
index b99442df83..214729bbd9 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_alexaskillevent.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_alexaskillevent.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_AlexaSkillEvent AWS CloudFormation Resource (AWS::Serverless::Function.AlexaSkillEvent)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_apievent.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_apievent.go
similarity index 92%
rename from goformation/cloudformation/serverless/aws-serverless-function_apievent.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_apievent.go
index bd738eb307..bce3cd54d8 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_apievent.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_apievent.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_ApiEvent AWS CloudFormation Resource (AWS::Serverless::Function.ApiEvent)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_bucketsampt.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_bucketsampt.go
similarity index 91%
rename from goformation/cloudformation/serverless/aws-serverless-function_bucketsampt.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_bucketsampt.go
index f11e50c729..d02a112368 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_bucketsampt.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_bucketsampt.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_BucketSAMPT AWS CloudFormation Resource (AWS::Serverless::Function.BucketSAMPT)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_cloudwatcheventevent.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_cloudwatcheventevent.go
similarity index 93%
rename from goformation/cloudformation/serverless/aws-serverless-function_cloudwatcheventevent.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_cloudwatcheventevent.go
index 4dfb2b3239..ca359ab25a 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_cloudwatcheventevent.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_cloudwatcheventevent.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_CloudWatchEventEvent AWS CloudFormation Resource (AWS::Serverless::Function.CloudWatchEventEvent)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_cloudwatchlogsevent.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_cloudwatchlogsevent.go
similarity index 92%
rename from goformation/cloudformation/serverless/aws-serverless-function_cloudwatchlogsevent.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_cloudwatchlogsevent.go
index 7c395caa77..f1dee3e6af 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_cloudwatchlogsevent.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_cloudwatchlogsevent.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_CloudWatchLogsEvent AWS CloudFormation Resource (AWS::Serverless::Function.CloudWatchLogsEvent)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_collectionsampt.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_collectionsampt.go
similarity index 91%
rename from goformation/cloudformation/serverless/aws-serverless-function_collectionsampt.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_collectionsampt.go
index e70805459d..dd6db40e8e 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_collectionsampt.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_collectionsampt.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_CollectionSAMPT AWS CloudFormation Resource (AWS::Serverless::Function.CollectionSAMPT)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_deadletterqueue.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_deadletterqueue.go
similarity index 92%
rename from goformation/cloudformation/serverless/aws-serverless-function_deadletterqueue.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_deadletterqueue.go
index 5b4b790b72..a68f9efe9d 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_deadletterqueue.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_deadletterqueue.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_DeadLetterQueue AWS CloudFormation Resource (AWS::Serverless::Function.DeadLetterQueue)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_deploymentpreference.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_deploymentpreference.go
similarity index 94%
rename from goformation/cloudformation/serverless/aws-serverless-function_deploymentpreference.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_deploymentpreference.go
index 6110f7d3fd..7cd0d32fa2 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_deploymentpreference.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_deploymentpreference.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_DeploymentPreference AWS CloudFormation Resource (AWS::Serverless::Function.DeploymentPreference)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_destinationconfig.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_destinationconfig.go
similarity index 95%
rename from goformation/cloudformation/serverless/aws-serverless-function_destinationconfig.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_destinationconfig.go
index e33a9ced9e..1ed9975bde 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_destinationconfig.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_destinationconfig.go
@@ -1,7 +1,7 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_DestinationConfig AWS CloudFormation Resource (AWS::Serverless::Function.DestinationConfig)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_domainsampt.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_domainsampt.go
similarity index 91%
rename from goformation/cloudformation/serverless/aws-serverless-function_domainsampt.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_domainsampt.go
index 963a8c5c74..206685a00a 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_domainsampt.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_domainsampt.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_DomainSAMPT AWS CloudFormation Resource (AWS::Serverless::Function.DomainSAMPT)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_dynamodbevent.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_dynamodbevent.go
similarity index 96%
rename from goformation/cloudformation/serverless/aws-serverless-function_dynamodbevent.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_dynamodbevent.go
index 3a707a6cd2..56a9728508 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_dynamodbevent.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_dynamodbevent.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_DynamoDBEvent AWS CloudFormation Resource (AWS::Serverless::Function.DynamoDBEvent)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_emptysampt.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_emptysampt.go
similarity index 94%
rename from goformation/cloudformation/serverless/aws-serverless-function_emptysampt.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_emptysampt.go
index 6a7a164c5c..3dc304f132 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_emptysampt.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_emptysampt.go
@@ -1,7 +1,7 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_EmptySAMPT AWS CloudFormation Resource (AWS::Serverless::Function.EmptySAMPT)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_eventbridgeruleevent.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_eventbridgeruleevent.go
similarity index 93%
rename from goformation/cloudformation/serverless/aws-serverless-function_eventbridgeruleevent.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_eventbridgeruleevent.go
index 31e714b4cb..2cbf8b37ab 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_eventbridgeruleevent.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_eventbridgeruleevent.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_EventBridgeRuleEvent AWS CloudFormation Resource (AWS::Serverless::Function.EventBridgeRuleEvent)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_eventsource.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_eventsource.go
similarity index 92%
rename from goformation/cloudformation/serverless/aws-serverless-function_eventsource.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_eventsource.go
index 7a90d1593b..8bebecf469 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_eventsource.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_eventsource.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_EventSource AWS CloudFormation Resource (AWS::Serverless::Function.EventSource)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_filesystemconfig.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_filesystemconfig.go
similarity index 93%
rename from goformation/cloudformation/serverless/aws-serverless-function_filesystemconfig.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_filesystemconfig.go
index 7b8c7a81a4..2b7c44da44 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_filesystemconfig.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_filesystemconfig.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_FileSystemConfig AWS CloudFormation Resource (AWS::Serverless::Function.FileSystemConfig)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_functionenvironment.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_functionenvironment.go
similarity index 91%
rename from goformation/cloudformation/serverless/aws-serverless-function_functionenvironment.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_functionenvironment.go
index 75582d8b06..03ac2913be 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_functionenvironment.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_functionenvironment.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_FunctionEnvironment AWS CloudFormation Resource (AWS::Serverless::Function.FunctionEnvironment)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_functionsampt.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_functionsampt.go
similarity index 91%
rename from goformation/cloudformation/serverless/aws-serverless-function_functionsampt.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_functionsampt.go
index 1783b8198a..86adc6e9c4 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_functionsampt.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_functionsampt.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_FunctionSAMPT AWS CloudFormation Resource (AWS::Serverless::Function.FunctionSAMPT)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_iampolicydocument.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_iampolicydocument.go
similarity index 95%
rename from goformation/cloudformation/serverless/aws-serverless-function_iampolicydocument.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_iampolicydocument.go
index 4595a4ab7f..86a7bf9f2a 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_iampolicydocument.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_iampolicydocument.go
@@ -1,7 +1,7 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_IAMPolicyDocument AWS CloudFormation Resource (AWS::Serverless::Function.IAMPolicyDocument)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_identitysampt.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_identitysampt.go
similarity index 91%
rename from goformation/cloudformation/serverless/aws-serverless-function_identitysampt.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_identitysampt.go
index df68a08357..b603a7e100 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_identitysampt.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_identitysampt.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_IdentitySAMPT AWS CloudFormation Resource (AWS::Serverless::Function.IdentitySAMPT)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_iotruleevent.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_iotruleevent.go
similarity index 92%
rename from goformation/cloudformation/serverless/aws-serverless-function_iotruleevent.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_iotruleevent.go
index dfa8b94113..b99a817574 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_iotruleevent.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_iotruleevent.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_IoTRuleEvent AWS CloudFormation Resource (AWS::Serverless::Function.IoTRuleEvent)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_keysampt.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_keysampt.go
similarity index 91%
rename from goformation/cloudformation/serverless/aws-serverless-function_keysampt.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_keysampt.go
index 6ea1133e1b..376f37607b 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_keysampt.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_keysampt.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_KeySAMPT AWS CloudFormation Resource (AWS::Serverless::Function.KeySAMPT)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_kinesisevent.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_kinesisevent.go
similarity index 93%
rename from goformation/cloudformation/serverless/aws-serverless-function_kinesisevent.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_kinesisevent.go
index 7cf504d3d3..8abfd8e167 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_kinesisevent.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_kinesisevent.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_KinesisEvent AWS CloudFormation Resource (AWS::Serverless::Function.KinesisEvent)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_loggroupsampt.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_loggroupsampt.go
similarity index 91%
rename from goformation/cloudformation/serverless/aws-serverless-function_loggroupsampt.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_loggroupsampt.go
index fb365a16e7..6fbe36b8f1 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_loggroupsampt.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_loggroupsampt.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_LogGroupSAMPT AWS CloudFormation Resource (AWS::Serverless::Function.LogGroupSAMPT)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_onfailure.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_onfailure.go
similarity index 92%
rename from goformation/cloudformation/serverless/aws-serverless-function_onfailure.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_onfailure.go
index 16c4c0f112..7dfc7a272b 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_onfailure.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_onfailure.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_OnFailure AWS CloudFormation Resource (AWS::Serverless::Function.OnFailure)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_queuesampt.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_queuesampt.go
similarity index 91%
rename from goformation/cloudformation/serverless/aws-serverless-function_queuesampt.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_queuesampt.go
index 7f571919c4..caf90fa625 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_queuesampt.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_queuesampt.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_QueueSAMPT AWS CloudFormation Resource (AWS::Serverless::Function.QueueSAMPT)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_s3event.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_s3event.go
similarity index 92%
rename from goformation/cloudformation/serverless/aws-serverless-function_s3event.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_s3event.go
index 1145722124..314144d356 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_s3event.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_s3event.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_S3Event AWS CloudFormation Resource (AWS::Serverless::Function.S3Event)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_s3keyfilter.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_s3keyfilter.go
similarity index 95%
rename from goformation/cloudformation/serverless/aws-serverless-function_s3keyfilter.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_s3keyfilter.go
index 7313f9bb5d..3692935ce7 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_s3keyfilter.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_s3keyfilter.go
@@ -1,7 +1,7 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_S3KeyFilter AWS CloudFormation Resource (AWS::Serverless::Function.S3KeyFilter)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_s3keyfilterrule.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_s3keyfilterrule.go
similarity index 92%
rename from goformation/cloudformation/serverless/aws-serverless-function_s3keyfilterrule.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_s3keyfilterrule.go
index 24f0f2dd76..c708075249 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_s3keyfilterrule.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_s3keyfilterrule.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_S3KeyFilterRule AWS CloudFormation Resource (AWS::Serverless::Function.S3KeyFilterRule)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_s3location.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_s3location.go
similarity index 93%
rename from goformation/cloudformation/serverless/aws-serverless-function_s3location.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_s3location.go
index 392512ca0e..ea39e1f130 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_s3location.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_s3location.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_S3Location AWS CloudFormation Resource (AWS::Serverless::Function.S3Location)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_s3notificationfilter.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_s3notificationfilter.go
similarity index 95%
rename from goformation/cloudformation/serverless/aws-serverless-function_s3notificationfilter.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_s3notificationfilter.go
index f519f7e8a1..6fc332181b 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_s3notificationfilter.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_s3notificationfilter.go
@@ -1,7 +1,7 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_S3NotificationFilter AWS CloudFormation Resource (AWS::Serverless::Function.S3NotificationFilter)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_sampolicytemplate.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_sampolicytemplate.go
similarity index 99%
rename from goformation/cloudformation/serverless/aws-serverless-function_sampolicytemplate.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_sampolicytemplate.go
index bc0a028b07..b42abbcfa0 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_sampolicytemplate.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_sampolicytemplate.go
@@ -1,7 +1,7 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_SAMPolicyTemplate AWS CloudFormation Resource (AWS::Serverless::Function.SAMPolicyTemplate)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_scheduleevent.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_scheduleevent.go
similarity index 92%
rename from goformation/cloudformation/serverless/aws-serverless-function_scheduleevent.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_scheduleevent.go
index f691be34b3..9d8ed15f9a 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_scheduleevent.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_scheduleevent.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_ScheduleEvent AWS CloudFormation Resource (AWS::Serverless::Function.ScheduleEvent)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_snsevent.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_snsevent.go
similarity index 91%
rename from goformation/cloudformation/serverless/aws-serverless-function_snsevent.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_snsevent.go
index f3ab1b8d8f..65dced0923 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_snsevent.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_snsevent.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_SNSEvent AWS CloudFormation Resource (AWS::Serverless::Function.SNSEvent)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_sqsevent.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_sqsevent.go
similarity index 92%
rename from goformation/cloudformation/serverless/aws-serverless-function_sqsevent.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_sqsevent.go
index 6b186b2e8b..0de55abfaf 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_sqsevent.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_sqsevent.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_SQSEvent AWS CloudFormation Resource (AWS::Serverless::Function.SQSEvent)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_statemachinesampt.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_statemachinesampt.go
similarity index 91%
rename from goformation/cloudformation/serverless/aws-serverless-function_statemachinesampt.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_statemachinesampt.go
index 7a0e6d83f5..ac908a3640 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_statemachinesampt.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_statemachinesampt.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_StateMachineSAMPT AWS CloudFormation Resource (AWS::Serverless::Function.StateMachineSAMPT)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_streamsampt.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_streamsampt.go
similarity index 91%
rename from goformation/cloudformation/serverless/aws-serverless-function_streamsampt.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_streamsampt.go
index 2a4e634078..0028607299 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_streamsampt.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_streamsampt.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_StreamSAMPT AWS CloudFormation Resource (AWS::Serverless::Function.StreamSAMPT)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_tablesampt.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_tablesampt.go
similarity index 91%
rename from goformation/cloudformation/serverless/aws-serverless-function_tablesampt.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_tablesampt.go
index 45bf611ff4..539eaff1ac 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_tablesampt.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_tablesampt.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_TableSAMPT AWS CloudFormation Resource (AWS::Serverless::Function.TableSAMPT)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_tablestreamsampt.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_tablestreamsampt.go
similarity index 92%
rename from goformation/cloudformation/serverless/aws-serverless-function_tablestreamsampt.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_tablestreamsampt.go
index 03acde507b..236a0e6614 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_tablestreamsampt.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_tablestreamsampt.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_TableStreamSAMPT AWS CloudFormation Resource (AWS::Serverless::Function.TableStreamSAMPT)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_topicsampt.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_topicsampt.go
similarity index 91%
rename from goformation/cloudformation/serverless/aws-serverless-function_topicsampt.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_topicsampt.go
index 5f38959e2c..c09ea60def 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_topicsampt.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_topicsampt.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_TopicSAMPT AWS CloudFormation Resource (AWS::Serverless::Function.TopicSAMPT)
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_vpcconfig.go b/pkg/goformation/cloudformation/serverless/aws-serverless-function_vpcconfig.go
similarity index 92%
rename from goformation/cloudformation/serverless/aws-serverless-function_vpcconfig.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-function_vpcconfig.go
index d7f2974928..123648a131 100644
--- a/goformation/cloudformation/serverless/aws-serverless-function_vpcconfig.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-function_vpcconfig.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Function_VpcConfig AWS CloudFormation Resource (AWS::Serverless::Function.VpcConfig)
diff --git a/goformation/cloudformation/serverless/aws-serverless-layerversion.go b/pkg/goformation/cloudformation/serverless/aws-serverless-layerversion.go
similarity index 97%
rename from goformation/cloudformation/serverless/aws-serverless-layerversion.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-layerversion.go
index 7de2fd4961..c603f4e377 100644
--- a/goformation/cloudformation/serverless/aws-serverless-layerversion.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-layerversion.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LayerVersion AWS CloudFormation Resource (AWS::Serverless::LayerVersion)
diff --git a/goformation/cloudformation/serverless/aws-serverless-simpletable.go b/pkg/goformation/cloudformation/serverless/aws-serverless-simpletable.go
similarity index 97%
rename from goformation/cloudformation/serverless/aws-serverless-simpletable.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-simpletable.go
index 611af4f455..5832678fd1 100644
--- a/goformation/cloudformation/serverless/aws-serverless-simpletable.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-simpletable.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SimpleTable AWS CloudFormation Resource (AWS::Serverless::SimpleTable)
diff --git a/goformation/cloudformation/serverless/aws-serverless-simpletable_primarykey.go b/pkg/goformation/cloudformation/serverless/aws-serverless-simpletable_primarykey.go
similarity index 92%
rename from goformation/cloudformation/serverless/aws-serverless-simpletable_primarykey.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-simpletable_primarykey.go
index 3cae4504ec..631f9a1ec0 100644
--- a/goformation/cloudformation/serverless/aws-serverless-simpletable_primarykey.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-simpletable_primarykey.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SimpleTable_PrimaryKey AWS CloudFormation Resource (AWS::Serverless::SimpleTable.PrimaryKey)
diff --git a/goformation/cloudformation/serverless/aws-serverless-simpletable_provisionedthroughput.go b/pkg/goformation/cloudformation/serverless/aws-serverless-simpletable_provisionedthroughput.go
similarity index 92%
rename from goformation/cloudformation/serverless/aws-serverless-simpletable_provisionedthroughput.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-simpletable_provisionedthroughput.go
index 77c77d602f..23decf52da 100644
--- a/goformation/cloudformation/serverless/aws-serverless-simpletable_provisionedthroughput.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-simpletable_provisionedthroughput.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SimpleTable_ProvisionedThroughput AWS CloudFormation Resource (AWS::Serverless::SimpleTable.ProvisionedThroughput)
diff --git a/goformation/cloudformation/serverless/aws-serverless-simpletable_ssespecification.go b/pkg/goformation/cloudformation/serverless/aws-serverless-simpletable_ssespecification.go
similarity index 91%
rename from goformation/cloudformation/serverless/aws-serverless-simpletable_ssespecification.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-simpletable_ssespecification.go
index 8b62c8d821..325f3d9427 100644
--- a/goformation/cloudformation/serverless/aws-serverless-simpletable_ssespecification.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-simpletable_ssespecification.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SimpleTable_SSESpecification AWS CloudFormation Resource (AWS::Serverless::SimpleTable.SSESpecification)
diff --git a/goformation/cloudformation/serverless/aws-serverless-statemachine.go b/pkg/goformation/cloudformation/serverless/aws-serverless-statemachine.go
similarity index 97%
rename from goformation/cloudformation/serverless/aws-serverless-statemachine.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-statemachine.go
index f420416bcc..35e3f96a98 100644
--- a/goformation/cloudformation/serverless/aws-serverless-statemachine.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-statemachine.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StateMachine AWS CloudFormation Resource (AWS::Serverless::StateMachine)
diff --git a/goformation/cloudformation/serverless/aws-serverless-statemachine_apievent.go b/pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_apievent.go
similarity index 93%
rename from goformation/cloudformation/serverless/aws-serverless-statemachine_apievent.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_apievent.go
index b8c73d4abd..ec199b494b 100644
--- a/goformation/cloudformation/serverless/aws-serverless-statemachine_apievent.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_apievent.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StateMachine_ApiEvent AWS CloudFormation Resource (AWS::Serverless::StateMachine.ApiEvent)
diff --git a/goformation/cloudformation/serverless/aws-serverless-statemachine_cloudwatcheventevent.go b/pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_cloudwatcheventevent.go
similarity index 94%
rename from goformation/cloudformation/serverless/aws-serverless-statemachine_cloudwatcheventevent.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_cloudwatcheventevent.go
index 539de89942..d578083e86 100644
--- a/goformation/cloudformation/serverless/aws-serverless-statemachine_cloudwatcheventevent.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_cloudwatcheventevent.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StateMachine_CloudWatchEventEvent AWS CloudFormation Resource (AWS::Serverless::StateMachine.CloudWatchEventEvent)
diff --git a/goformation/cloudformation/serverless/aws-serverless-statemachine_cloudwatchlogsloggroup.go b/pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_cloudwatchlogsloggroup.go
similarity index 92%
rename from goformation/cloudformation/serverless/aws-serverless-statemachine_cloudwatchlogsloggroup.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_cloudwatchlogsloggroup.go
index e117594c0d..559e7a2228 100644
--- a/goformation/cloudformation/serverless/aws-serverless-statemachine_cloudwatchlogsloggroup.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_cloudwatchlogsloggroup.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StateMachine_CloudWatchLogsLogGroup AWS CloudFormation Resource (AWS::Serverless::StateMachine.CloudWatchLogsLogGroup)
diff --git a/goformation/cloudformation/serverless/aws-serverless-statemachine_eventbridgeruleevent.go b/pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_eventbridgeruleevent.go
similarity index 94%
rename from goformation/cloudformation/serverless/aws-serverless-statemachine_eventbridgeruleevent.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_eventbridgeruleevent.go
index db4f4c1542..63f63b0273 100644
--- a/goformation/cloudformation/serverless/aws-serverless-statemachine_eventbridgeruleevent.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_eventbridgeruleevent.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StateMachine_EventBridgeRuleEvent AWS CloudFormation Resource (AWS::Serverless::StateMachine.EventBridgeRuleEvent)
diff --git a/goformation/cloudformation/serverless/aws-serverless-statemachine_eventsource.go b/pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_eventsource.go
similarity index 92%
rename from goformation/cloudformation/serverless/aws-serverless-statemachine_eventsource.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_eventsource.go
index 7d3c4a03a7..b1c017b688 100644
--- a/goformation/cloudformation/serverless/aws-serverless-statemachine_eventsource.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_eventsource.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StateMachine_EventSource AWS CloudFormation Resource (AWS::Serverless::StateMachine.EventSource)
diff --git a/goformation/cloudformation/serverless/aws-serverless-statemachine_functionsampt.go b/pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_functionsampt.go
similarity index 91%
rename from goformation/cloudformation/serverless/aws-serverless-statemachine_functionsampt.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_functionsampt.go
index a00e0de022..c14dca9e77 100644
--- a/goformation/cloudformation/serverless/aws-serverless-statemachine_functionsampt.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_functionsampt.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StateMachine_FunctionSAMPT AWS CloudFormation Resource (AWS::Serverless::StateMachine.FunctionSAMPT)
diff --git a/goformation/cloudformation/serverless/aws-serverless-statemachine_iampolicydocument.go b/pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_iampolicydocument.go
similarity index 95%
rename from goformation/cloudformation/serverless/aws-serverless-statemachine_iampolicydocument.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_iampolicydocument.go
index bce863386d..b8efdee725 100644
--- a/goformation/cloudformation/serverless/aws-serverless-statemachine_iampolicydocument.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_iampolicydocument.go
@@ -1,7 +1,7 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StateMachine_IAMPolicyDocument AWS CloudFormation Resource (AWS::Serverless::StateMachine.IAMPolicyDocument)
diff --git a/goformation/cloudformation/serverless/aws-serverless-statemachine_logdestination.go b/pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_logdestination.go
similarity index 96%
rename from goformation/cloudformation/serverless/aws-serverless-statemachine_logdestination.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_logdestination.go
index 381cf96400..012ebc4b84 100644
--- a/goformation/cloudformation/serverless/aws-serverless-statemachine_logdestination.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_logdestination.go
@@ -1,7 +1,7 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StateMachine_LogDestination AWS CloudFormation Resource (AWS::Serverless::StateMachine.LogDestination)
diff --git a/goformation/cloudformation/serverless/aws-serverless-statemachine_loggingconfiguration.go b/pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_loggingconfiguration.go
similarity index 93%
rename from goformation/cloudformation/serverless/aws-serverless-statemachine_loggingconfiguration.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_loggingconfiguration.go
index 3519a57f83..ea66887330 100644
--- a/goformation/cloudformation/serverless/aws-serverless-statemachine_loggingconfiguration.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_loggingconfiguration.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StateMachine_LoggingConfiguration AWS CloudFormation Resource (AWS::Serverless::StateMachine.LoggingConfiguration)
diff --git a/goformation/cloudformation/serverless/aws-serverless-statemachine_s3location.go b/pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_s3location.go
similarity index 93%
rename from goformation/cloudformation/serverless/aws-serverless-statemachine_s3location.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_s3location.go
index c1efec98be..ff5c28bfb5 100644
--- a/goformation/cloudformation/serverless/aws-serverless-statemachine_s3location.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_s3location.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StateMachine_S3Location AWS CloudFormation Resource (AWS::Serverless::StateMachine.S3Location)
diff --git a/goformation/cloudformation/serverless/aws-serverless-statemachine_sampolicytemplate.go b/pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_sampolicytemplate.go
similarity index 96%
rename from goformation/cloudformation/serverless/aws-serverless-statemachine_sampolicytemplate.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_sampolicytemplate.go
index 6fcda080c0..dad4947949 100644
--- a/goformation/cloudformation/serverless/aws-serverless-statemachine_sampolicytemplate.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_sampolicytemplate.go
@@ -1,7 +1,7 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StateMachine_SAMPolicyTemplate AWS CloudFormation Resource (AWS::Serverless::StateMachine.SAMPolicyTemplate)
diff --git a/goformation/cloudformation/serverless/aws-serverless-statemachine_scheduleevent.go b/pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_scheduleevent.go
similarity index 92%
rename from goformation/cloudformation/serverless/aws-serverless-statemachine_scheduleevent.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_scheduleevent.go
index 6b688fb67d..b2e38c1651 100644
--- a/goformation/cloudformation/serverless/aws-serverless-statemachine_scheduleevent.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_scheduleevent.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StateMachine_ScheduleEvent AWS CloudFormation Resource (AWS::Serverless::StateMachine.ScheduleEvent)
diff --git a/goformation/cloudformation/serverless/aws-serverless-statemachine_statemachinesampt.go b/pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_statemachinesampt.go
similarity index 91%
rename from goformation/cloudformation/serverless/aws-serverless-statemachine_statemachinesampt.go
rename to pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_statemachinesampt.go
index 5bdb60c1ac..c2a149f816 100644
--- a/goformation/cloudformation/serverless/aws-serverless-statemachine_statemachinesampt.go
+++ b/pkg/goformation/cloudformation/serverless/aws-serverless-statemachine_statemachinesampt.go
@@ -1,9 +1,9 @@
 package serverless
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StateMachine_StateMachineSAMPT AWS CloudFormation Resource (AWS::Serverless::StateMachine.StateMachineSAMPT)
diff --git a/goformation/cloudformation/serverless/function_codeuri.go b/pkg/goformation/cloudformation/serverless/function_codeuri.go
similarity index 89%
rename from goformation/cloudformation/serverless/function_codeuri.go
rename to pkg/goformation/cloudformation/serverless/function_codeuri.go
index d163d7daf2..efdd85e3e8 100644
--- a/goformation/cloudformation/serverless/function_codeuri.go
+++ b/pkg/goformation/cloudformation/serverless/function_codeuri.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"sort"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
-	"github.com/awslabs/goformation/v4/cloudformation/utils"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/utils"
 )
 
 // Function_CodeUri is a helper struct that can hold either a String or S3Location value
diff --git a/goformation/cloudformation/serverless/function_events.go b/pkg/goformation/cloudformation/serverless/function_events.go
similarity index 91%
rename from goformation/cloudformation/serverless/function_events.go
rename to pkg/goformation/cloudformation/serverless/function_events.go
index b981a3c15e..e8842bef3d 100644
--- a/goformation/cloudformation/serverless/function_events.go
+++ b/pkg/goformation/cloudformation/serverless/function_events.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"sort"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
-	"github.com/awslabs/goformation/v4/cloudformation/utils"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/utils"
 )
 
 // Function_Events is a helper struct that can hold either a String or String value
diff --git a/goformation/cloudformation/serverless/function_policies.go b/pkg/goformation/cloudformation/serverless/function_policies.go
similarity index 93%
rename from goformation/cloudformation/serverless/function_policies.go
rename to pkg/goformation/cloudformation/serverless/function_policies.go
index dd4fa3addf..f7653e78b3 100644
--- a/goformation/cloudformation/serverless/function_policies.go
+++ b/pkg/goformation/cloudformation/serverless/function_policies.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"sort"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
-	"github.com/awslabs/goformation/v4/cloudformation/utils"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/utils"
 )
 
 // Function_Policies is a helper struct that can hold either a String, String, IAMPolicyDocument, SAMPolicyTemplate, or IAMPolicyDocument value
diff --git a/goformation/cloudformation/serverless/function_properties.go b/pkg/goformation/cloudformation/serverless/function_properties.go
similarity index 97%
rename from goformation/cloudformation/serverless/function_properties.go
rename to pkg/goformation/cloudformation/serverless/function_properties.go
index c00b031d38..48892b223a 100644
--- a/goformation/cloudformation/serverless/function_properties.go
+++ b/pkg/goformation/cloudformation/serverless/function_properties.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"sort"
 
-	"github.com/awslabs/goformation/v4/cloudformation/utils"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/utils"
 )
 
 // Function_Properties is a helper struct that can hold either a S3Event, SNSEvent, SQSEvent, KinesisEvent, DynamoDBEvent, ApiEvent, ScheduleEvent, CloudWatchEventEvent, CloudWatchLogsEvent, IoTRuleEvent, AlexaSkillEvent, or EventBridgeRuleEvent value
diff --git a/goformation/cloudformation/serverless/statemachine_definitionuri.go b/pkg/goformation/cloudformation/serverless/statemachine_definitionuri.go
similarity index 90%
rename from goformation/cloudformation/serverless/statemachine_definitionuri.go
rename to pkg/goformation/cloudformation/serverless/statemachine_definitionuri.go
index 57279fef15..8eb8a1505a 100644
--- a/goformation/cloudformation/serverless/statemachine_definitionuri.go
+++ b/pkg/goformation/cloudformation/serverless/statemachine_definitionuri.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"sort"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
-	"github.com/awslabs/goformation/v4/cloudformation/utils"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/utils"
 )
 
 // StateMachine_DefinitionUri is a helper struct that can hold either a String or S3Location value
diff --git a/goformation/cloudformation/serverless/statemachine_policies.go b/pkg/goformation/cloudformation/serverless/statemachine_policies.go
similarity index 93%
rename from goformation/cloudformation/serverless/statemachine_policies.go
rename to pkg/goformation/cloudformation/serverless/statemachine_policies.go
index 787b5d0b97..3cf6580e9b 100644
--- a/goformation/cloudformation/serverless/statemachine_policies.go
+++ b/pkg/goformation/cloudformation/serverless/statemachine_policies.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"sort"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
-	"github.com/awslabs/goformation/v4/cloudformation/utils"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/utils"
 )
 
 // StateMachine_Policies is a helper struct that can hold either a String, String, IAMPolicyDocument, SAMPolicyTemplate, or IAMPolicyDocument value
diff --git a/goformation/cloudformation/serverless/statemachine_properties.go b/pkg/goformation/cloudformation/serverless/statemachine_properties.go
similarity index 95%
rename from goformation/cloudformation/serverless/statemachine_properties.go
rename to pkg/goformation/cloudformation/serverless/statemachine_properties.go
index 74f268b8af..3d9c19f16f 100644
--- a/goformation/cloudformation/serverless/statemachine_properties.go
+++ b/pkg/goformation/cloudformation/serverless/statemachine_properties.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"sort"
 
-	"github.com/awslabs/goformation/v4/cloudformation/utils"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/utils"
 )
 
 // StateMachine_Properties is a helper struct that can hold either a CloudWatchEventEvent, EventBridgeRuleEvent, ScheduleEvent, or ApiEvent value
diff --git a/goformation/cloudformation/servicecatalog/aws-servicecatalog-acceptedportfolioshare.go b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-acceptedportfolioshare.go
similarity index 96%
rename from goformation/cloudformation/servicecatalog/aws-servicecatalog-acceptedportfolioshare.go
rename to pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-acceptedportfolioshare.go
index c20fec5b65..05f8bcf970 100644
--- a/goformation/cloudformation/servicecatalog/aws-servicecatalog-acceptedportfolioshare.go
+++ b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-acceptedportfolioshare.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AcceptedPortfolioShare AWS CloudFormation Resource (AWS::ServiceCatalog::AcceptedPortfolioShare)
diff --git a/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationproduct.go b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationproduct.go
similarity index 97%
rename from goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationproduct.go
rename to pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationproduct.go
index 72b1bf7e70..4db101fef2 100644
--- a/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationproduct.go
+++ b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationproduct.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CloudFormationProduct AWS CloudFormation Resource (AWS::ServiceCatalog::CloudFormationProduct)
diff --git a/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationproduct_provisioningartifactproperties.go b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationproduct_provisioningartifactproperties.go
similarity index 95%
rename from goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationproduct_provisioningartifactproperties.go
rename to pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationproduct_provisioningartifactproperties.go
index 2202a8a644..f59da9b151 100644
--- a/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationproduct_provisioningartifactproperties.go
+++ b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationproduct_provisioningartifactproperties.go
@@ -1,9 +1,9 @@
 package servicecatalog
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CloudFormationProduct_ProvisioningArtifactProperties AWS CloudFormation Resource (AWS::ServiceCatalog::CloudFormationProduct.ProvisioningArtifactProperties)
diff --git a/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct.go b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct.go
similarity index 97%
rename from goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct.go
rename to pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct.go
index ae2ee0241f..c250269f2f 100644
--- a/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct.go
+++ b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CloudFormationProvisionedProduct AWS CloudFormation Resource (AWS::ServiceCatalog::CloudFormationProvisionedProduct)
diff --git a/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct_provisioningparameter.go b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct_provisioningparameter.go
similarity index 93%
rename from goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct_provisioningparameter.go
rename to pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct_provisioningparameter.go
index e8804a9396..af35a53ef1 100644
--- a/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct_provisioningparameter.go
+++ b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct_provisioningparameter.go
@@ -1,9 +1,9 @@
 package servicecatalog
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CloudFormationProvisionedProduct_ProvisioningParameter AWS CloudFormation Resource (AWS::ServiceCatalog::CloudFormationProvisionedProduct.ProvisioningParameter)
diff --git a/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct_provisioningpreferences.go b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct_provisioningpreferences.go
similarity index 96%
rename from goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct_provisioningpreferences.go
rename to pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct_provisioningpreferences.go
index 3f28d1719d..3edaed8573 100644
--- a/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct_provisioningpreferences.go
+++ b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct_provisioningpreferences.go
@@ -1,9 +1,9 @@
 package servicecatalog
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // CloudFormationProvisionedProduct_ProvisioningPreferences AWS CloudFormation Resource (AWS::ServiceCatalog::CloudFormationProvisionedProduct.ProvisioningPreferences)
diff --git a/goformation/cloudformation/servicecatalog/aws-servicecatalog-launchnotificationconstraint.go b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-launchnotificationconstraint.go
similarity index 97%
rename from goformation/cloudformation/servicecatalog/aws-servicecatalog-launchnotificationconstraint.go
rename to pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-launchnotificationconstraint.go
index ea35bf0c86..1560dda754 100644
--- a/goformation/cloudformation/servicecatalog/aws-servicecatalog-launchnotificationconstraint.go
+++ b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-launchnotificationconstraint.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchNotificationConstraint AWS CloudFormation Resource (AWS::ServiceCatalog::LaunchNotificationConstraint)
diff --git a/goformation/cloudformation/servicecatalog/aws-servicecatalog-launchroleconstraint.go b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-launchroleconstraint.go
similarity index 97%
rename from goformation/cloudformation/servicecatalog/aws-servicecatalog-launchroleconstraint.go
rename to pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-launchroleconstraint.go
index 8ae90a1015..aed8a83a95 100644
--- a/goformation/cloudformation/servicecatalog/aws-servicecatalog-launchroleconstraint.go
+++ b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-launchroleconstraint.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchRoleConstraint AWS CloudFormation Resource (AWS::ServiceCatalog::LaunchRoleConstraint)
diff --git a/goformation/cloudformation/servicecatalog/aws-servicecatalog-launchtemplateconstraint.go b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-launchtemplateconstraint.go
similarity index 97%
rename from goformation/cloudformation/servicecatalog/aws-servicecatalog-launchtemplateconstraint.go
rename to pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-launchtemplateconstraint.go
index 2cba4ad6cc..75b57e0c91 100644
--- a/goformation/cloudformation/servicecatalog/aws-servicecatalog-launchtemplateconstraint.go
+++ b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-launchtemplateconstraint.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LaunchTemplateConstraint AWS CloudFormation Resource (AWS::ServiceCatalog::LaunchTemplateConstraint)
diff --git a/goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolio.go b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolio.go
similarity index 95%
rename from goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolio.go
rename to pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolio.go
index 789532c597..c43beb7cf2 100644
--- a/goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolio.go
+++ b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolio.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Portfolio AWS CloudFormation Resource (AWS::ServiceCatalog::Portfolio)
diff --git a/goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolioprincipalassociation.go b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolioprincipalassociation.go
similarity index 97%
rename from goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolioprincipalassociation.go
rename to pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolioprincipalassociation.go
index 98ca8bd7f0..6c9e978485 100644
--- a/goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolioprincipalassociation.go
+++ b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolioprincipalassociation.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PortfolioPrincipalAssociation AWS CloudFormation Resource (AWS::ServiceCatalog::PortfolioPrincipalAssociation)
diff --git a/goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolioproductassociation.go b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolioproductassociation.go
similarity index 97%
rename from goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolioproductassociation.go
rename to pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolioproductassociation.go
index 92aa895761..43f8d12785 100644
--- a/goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolioproductassociation.go
+++ b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolioproductassociation.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PortfolioProductAssociation AWS CloudFormation Resource (AWS::ServiceCatalog::PortfolioProductAssociation)
diff --git a/goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolioshare.go b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolioshare.go
similarity index 97%
rename from goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolioshare.go
rename to pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolioshare.go
index d85bf4be5a..ec01758ff2 100644
--- a/goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolioshare.go
+++ b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolioshare.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PortfolioShare AWS CloudFormation Resource (AWS::ServiceCatalog::PortfolioShare)
diff --git a/goformation/cloudformation/servicecatalog/aws-servicecatalog-resourceupdateconstraint.go b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-resourceupdateconstraint.go
similarity index 97%
rename from goformation/cloudformation/servicecatalog/aws-servicecatalog-resourceupdateconstraint.go
rename to pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-resourceupdateconstraint.go
index 88289c02c8..d968105a50 100644
--- a/goformation/cloudformation/servicecatalog/aws-servicecatalog-resourceupdateconstraint.go
+++ b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-resourceupdateconstraint.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceUpdateConstraint AWS CloudFormation Resource (AWS::ServiceCatalog::ResourceUpdateConstraint)
diff --git a/goformation/cloudformation/servicecatalog/aws-servicecatalog-serviceaction.go b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-serviceaction.go
similarity index 97%
rename from goformation/cloudformation/servicecatalog/aws-servicecatalog-serviceaction.go
rename to pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-serviceaction.go
index 646faaf4ee..80e8b7e78f 100644
--- a/goformation/cloudformation/servicecatalog/aws-servicecatalog-serviceaction.go
+++ b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-serviceaction.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ServiceAction AWS CloudFormation Resource (AWS::ServiceCatalog::ServiceAction)
diff --git a/goformation/cloudformation/servicecatalog/aws-servicecatalog-serviceaction_definitionparameter.go b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-serviceaction_definitionparameter.go
similarity index 93%
rename from goformation/cloudformation/servicecatalog/aws-servicecatalog-serviceaction_definitionparameter.go
rename to pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-serviceaction_definitionparameter.go
index a055be4cdd..7f806186f4 100644
--- a/goformation/cloudformation/servicecatalog/aws-servicecatalog-serviceaction_definitionparameter.go
+++ b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-serviceaction_definitionparameter.go
@@ -1,9 +1,9 @@
 package servicecatalog
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ServiceAction_DefinitionParameter AWS CloudFormation Resource (AWS::ServiceCatalog::ServiceAction.DefinitionParameter)
diff --git a/goformation/cloudformation/servicecatalog/aws-servicecatalog-serviceactionassociation.go b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-serviceactionassociation.go
similarity index 97%
rename from goformation/cloudformation/servicecatalog/aws-servicecatalog-serviceactionassociation.go
rename to pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-serviceactionassociation.go
index cfb82a4a8e..8080c51376 100644
--- a/goformation/cloudformation/servicecatalog/aws-servicecatalog-serviceactionassociation.go
+++ b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-serviceactionassociation.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ServiceActionAssociation AWS CloudFormation Resource (AWS::ServiceCatalog::ServiceActionAssociation)
diff --git a/goformation/cloudformation/servicecatalog/aws-servicecatalog-stacksetconstraint.go b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-stacksetconstraint.go
similarity index 97%
rename from goformation/cloudformation/servicecatalog/aws-servicecatalog-stacksetconstraint.go
rename to pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-stacksetconstraint.go
index 9cfc94e019..f720a339e2 100644
--- a/goformation/cloudformation/servicecatalog/aws-servicecatalog-stacksetconstraint.go
+++ b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-stacksetconstraint.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StackSetConstraint AWS CloudFormation Resource (AWS::ServiceCatalog::StackSetConstraint)
diff --git a/goformation/cloudformation/servicecatalog/aws-servicecatalog-tagoption.go b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-tagoption.go
similarity index 96%
rename from goformation/cloudformation/servicecatalog/aws-servicecatalog-tagoption.go
rename to pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-tagoption.go
index 44e1b401aa..271685eb1d 100644
--- a/goformation/cloudformation/servicecatalog/aws-servicecatalog-tagoption.go
+++ b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-tagoption.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TagOption AWS CloudFormation Resource (AWS::ServiceCatalog::TagOption)
diff --git a/goformation/cloudformation/servicecatalog/aws-servicecatalog-tagoptionassociation.go b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-tagoptionassociation.go
similarity index 96%
rename from goformation/cloudformation/servicecatalog/aws-servicecatalog-tagoptionassociation.go
rename to pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-tagoptionassociation.go
index be4c95ba37..29aa7c20fc 100644
--- a/goformation/cloudformation/servicecatalog/aws-servicecatalog-tagoptionassociation.go
+++ b/pkg/goformation/cloudformation/servicecatalog/aws-servicecatalog-tagoptionassociation.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TagOptionAssociation AWS CloudFormation Resource (AWS::ServiceCatalog::TagOptionAssociation)
diff --git a/goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-application.go b/pkg/goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-application.go
similarity index 97%
rename from goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-application.go
rename to pkg/goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-application.go
index 3bd0507774..fb0b78e0df 100644
--- a/goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-application.go
+++ b/pkg/goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-application.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Application AWS CloudFormation Resource (AWS::ServiceCatalogAppRegistry::Application)
diff --git a/goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-attributegroup.go b/pkg/goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-attributegroup.go
similarity index 97%
rename from goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-attributegroup.go
rename to pkg/goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-attributegroup.go
index 8768cc70e3..35e56d01b8 100644
--- a/goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-attributegroup.go
+++ b/pkg/goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-attributegroup.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AttributeGroup AWS CloudFormation Resource (AWS::ServiceCatalogAppRegistry::AttributeGroup)
diff --git a/goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-attributegroupassociation.go b/pkg/goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-attributegroupassociation.go
similarity index 97%
rename from goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-attributegroupassociation.go
rename to pkg/goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-attributegroupassociation.go
index 6be5a1f6eb..09d98c98d3 100644
--- a/goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-attributegroupassociation.go
+++ b/pkg/goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-attributegroupassociation.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AttributeGroupAssociation AWS CloudFormation Resource (AWS::ServiceCatalogAppRegistry::AttributeGroupAssociation)
diff --git a/goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-resourceassociation.go b/pkg/goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-resourceassociation.go
similarity index 97%
rename from goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-resourceassociation.go
rename to pkg/goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-resourceassociation.go
index eb296cda8f..0f0d36fceb 100644
--- a/goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-resourceassociation.go
+++ b/pkg/goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-resourceassociation.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceAssociation AWS CloudFormation Resource (AWS::ServiceCatalogAppRegistry::ResourceAssociation)
diff --git a/goformation/cloudformation/servicediscovery/aws-servicediscovery-httpnamespace.go b/pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-httpnamespace.go
similarity index 95%
rename from goformation/cloudformation/servicediscovery/aws-servicediscovery-httpnamespace.go
rename to pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-httpnamespace.go
index b8e562055e..36fd65e34b 100644
--- a/goformation/cloudformation/servicediscovery/aws-servicediscovery-httpnamespace.go
+++ b/pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-httpnamespace.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // HttpNamespace AWS CloudFormation Resource (AWS::ServiceDiscovery::HttpNamespace)
diff --git a/goformation/cloudformation/servicediscovery/aws-servicediscovery-instance.go b/pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-instance.go
similarity index 96%
rename from goformation/cloudformation/servicediscovery/aws-servicediscovery-instance.go
rename to pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-instance.go
index 2fdd8274fb..7dc51d3e83 100644
--- a/goformation/cloudformation/servicediscovery/aws-servicediscovery-instance.go
+++ b/pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-instance.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Instance AWS CloudFormation Resource (AWS::ServiceDiscovery::Instance)
diff --git a/goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace.go b/pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace.go
similarity index 95%
rename from goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace.go
rename to pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace.go
index 2028bc92c7..c024341b6d 100644
--- a/goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace.go
+++ b/pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PrivateDnsNamespace AWS CloudFormation Resource (AWS::ServiceDiscovery::PrivateDnsNamespace)
diff --git a/goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_privatednspropertiesmutable.go b/pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_privatednspropertiesmutable.go
similarity index 96%
rename from goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_privatednspropertiesmutable.go
rename to pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_privatednspropertiesmutable.go
index 39ddbf4d82..e5f6c6bef6 100644
--- a/goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_privatednspropertiesmutable.go
+++ b/pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_privatednspropertiesmutable.go
@@ -1,7 +1,7 @@
 package servicediscovery
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PrivateDnsNamespace_PrivateDnsPropertiesMutable AWS CloudFormation Resource (AWS::ServiceDiscovery::PrivateDnsNamespace.PrivateDnsPropertiesMutable)
diff --git a/goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_properties.go b/pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_properties.go
similarity index 95%
rename from goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_properties.go
rename to pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_properties.go
index e6ed33e1e2..ca7585d172 100644
--- a/goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_properties.go
+++ b/pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_properties.go
@@ -1,7 +1,7 @@
 package servicediscovery
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PrivateDnsNamespace_Properties AWS CloudFormation Resource (AWS::ServiceDiscovery::PrivateDnsNamespace.Properties)
diff --git a/goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_soa.go b/pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_soa.go
similarity index 91%
rename from goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_soa.go
rename to pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_soa.go
index 7881913eb8..b76d2e911f 100644
--- a/goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_soa.go
+++ b/pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_soa.go
@@ -1,9 +1,9 @@
 package servicediscovery
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PrivateDnsNamespace_SOA AWS CloudFormation Resource (AWS::ServiceDiscovery::PrivateDnsNamespace.SOA)
diff --git a/goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace.go b/pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace.go
similarity index 95%
rename from goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace.go
rename to pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace.go
index 2a56893ab1..5a2a74542e 100644
--- a/goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace.go
+++ b/pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PublicDnsNamespace AWS CloudFormation Resource (AWS::ServiceDiscovery::PublicDnsNamespace)
diff --git a/goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_properties.go b/pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_properties.go
similarity index 95%
rename from goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_properties.go
rename to pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_properties.go
index fdd97bcb8e..c6930ffc97 100644
--- a/goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_properties.go
+++ b/pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_properties.go
@@ -1,7 +1,7 @@
 package servicediscovery
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PublicDnsNamespace_Properties AWS CloudFormation Resource (AWS::ServiceDiscovery::PublicDnsNamespace.Properties)
diff --git a/goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_publicdnspropertiesmutable.go b/pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_publicdnspropertiesmutable.go
similarity index 96%
rename from goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_publicdnspropertiesmutable.go
rename to pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_publicdnspropertiesmutable.go
index 3e2fe16eca..af2338621c 100644
--- a/goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_publicdnspropertiesmutable.go
+++ b/pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_publicdnspropertiesmutable.go
@@ -1,7 +1,7 @@
 package servicediscovery
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PublicDnsNamespace_PublicDnsPropertiesMutable AWS CloudFormation Resource (AWS::ServiceDiscovery::PublicDnsNamespace.PublicDnsPropertiesMutable)
diff --git a/goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_soa.go b/pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_soa.go
similarity index 91%
rename from goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_soa.go
rename to pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_soa.go
index d6e1966793..0e435030a5 100644
--- a/goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_soa.go
+++ b/pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_soa.go
@@ -1,9 +1,9 @@
 package servicediscovery
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PublicDnsNamespace_SOA AWS CloudFormation Resource (AWS::ServiceDiscovery::PublicDnsNamespace.SOA)
diff --git a/goformation/cloudformation/servicediscovery/aws-servicediscovery-service.go b/pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-service.go
similarity index 96%
rename from goformation/cloudformation/servicediscovery/aws-servicediscovery-service.go
rename to pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-service.go
index 76c667d737..34a208c142 100644
--- a/goformation/cloudformation/servicediscovery/aws-servicediscovery-service.go
+++ b/pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-service.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Service AWS CloudFormation Resource (AWS::ServiceDiscovery::Service)
diff --git a/goformation/cloudformation/servicediscovery/aws-servicediscovery-service_dnsconfig.go b/pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-service_dnsconfig.go
similarity index 93%
rename from goformation/cloudformation/servicediscovery/aws-servicediscovery-service_dnsconfig.go
rename to pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-service_dnsconfig.go
index 5f4944a23f..6e90de1703 100644
--- a/goformation/cloudformation/servicediscovery/aws-servicediscovery-service_dnsconfig.go
+++ b/pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-service_dnsconfig.go
@@ -1,9 +1,9 @@
 package servicediscovery
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Service_DnsConfig AWS CloudFormation Resource (AWS::ServiceDiscovery::Service.DnsConfig)
diff --git a/goformation/cloudformation/servicediscovery/aws-servicediscovery-service_dnsrecord.go b/pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-service_dnsrecord.go
similarity index 92%
rename from goformation/cloudformation/servicediscovery/aws-servicediscovery-service_dnsrecord.go
rename to pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-service_dnsrecord.go
index ff8af09f53..ee11452a05 100644
--- a/goformation/cloudformation/servicediscovery/aws-servicediscovery-service_dnsrecord.go
+++ b/pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-service_dnsrecord.go
@@ -1,9 +1,9 @@
 package servicediscovery
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Service_DnsRecord AWS CloudFormation Resource (AWS::ServiceDiscovery::Service.DnsRecord)
diff --git a/goformation/cloudformation/servicediscovery/aws-servicediscovery-service_healthcheckconfig.go b/pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-service_healthcheckconfig.go
similarity index 94%
rename from goformation/cloudformation/servicediscovery/aws-servicediscovery-service_healthcheckconfig.go
rename to pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-service_healthcheckconfig.go
index 10291a084e..012cd44cce 100644
--- a/goformation/cloudformation/servicediscovery/aws-servicediscovery-service_healthcheckconfig.go
+++ b/pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-service_healthcheckconfig.go
@@ -1,9 +1,9 @@
 package servicediscovery
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Service_HealthCheckConfig AWS CloudFormation Resource (AWS::ServiceDiscovery::Service.HealthCheckConfig)
diff --git a/goformation/cloudformation/servicediscovery/aws-servicediscovery-service_healthcheckcustomconfig.go b/pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-service_healthcheckcustomconfig.go
similarity index 92%
rename from goformation/cloudformation/servicediscovery/aws-servicediscovery-service_healthcheckcustomconfig.go
rename to pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-service_healthcheckcustomconfig.go
index fafdd5ab4f..aa4be883ee 100644
--- a/goformation/cloudformation/servicediscovery/aws-servicediscovery-service_healthcheckcustomconfig.go
+++ b/pkg/goformation/cloudformation/servicediscovery/aws-servicediscovery-service_healthcheckcustomconfig.go
@@ -1,9 +1,9 @@
 package servicediscovery
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Service_HealthCheckCustomConfig AWS CloudFormation Resource (AWS::ServiceDiscovery::Service.HealthCheckCustomConfig)
diff --git a/goformation/cloudformation/ses/aws-ses-configurationset.go b/pkg/goformation/cloudformation/ses/aws-ses-configurationset.go
similarity index 96%
rename from goformation/cloudformation/ses/aws-ses-configurationset.go
rename to pkg/goformation/cloudformation/ses/aws-ses-configurationset.go
index 023526e089..9d8fd6e3f9 100644
--- a/goformation/cloudformation/ses/aws-ses-configurationset.go
+++ b/pkg/goformation/cloudformation/ses/aws-ses-configurationset.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigurationSet AWS CloudFormation Resource (AWS::SES::ConfigurationSet)
diff --git a/goformation/cloudformation/ses/aws-ses-configurationseteventdestination.go b/pkg/goformation/cloudformation/ses/aws-ses-configurationseteventdestination.go
similarity index 97%
rename from goformation/cloudformation/ses/aws-ses-configurationseteventdestination.go
rename to pkg/goformation/cloudformation/ses/aws-ses-configurationseteventdestination.go
index f20dbef3e0..0f0556bd76 100644
--- a/goformation/cloudformation/ses/aws-ses-configurationseteventdestination.go
+++ b/pkg/goformation/cloudformation/ses/aws-ses-configurationseteventdestination.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigurationSetEventDestination AWS CloudFormation Resource (AWS::SES::ConfigurationSetEventDestination)
diff --git a/goformation/cloudformation/ses/aws-ses-configurationseteventdestination_cloudwatchdestination.go b/pkg/goformation/cloudformation/ses/aws-ses-configurationseteventdestination_cloudwatchdestination.go
similarity index 96%
rename from goformation/cloudformation/ses/aws-ses-configurationseteventdestination_cloudwatchdestination.go
rename to pkg/goformation/cloudformation/ses/aws-ses-configurationseteventdestination_cloudwatchdestination.go
index b514b65c58..ccdc4629ef 100644
--- a/goformation/cloudformation/ses/aws-ses-configurationseteventdestination_cloudwatchdestination.go
+++ b/pkg/goformation/cloudformation/ses/aws-ses-configurationseteventdestination_cloudwatchdestination.go
@@ -1,7 +1,7 @@
 package ses
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigurationSetEventDestination_CloudWatchDestination AWS CloudFormation Resource (AWS::SES::ConfigurationSetEventDestination.CloudWatchDestination)
diff --git a/goformation/cloudformation/ses/aws-ses-configurationseteventdestination_dimensionconfiguration.go b/pkg/goformation/cloudformation/ses/aws-ses-configurationseteventdestination_dimensionconfiguration.go
similarity index 94%
rename from goformation/cloudformation/ses/aws-ses-configurationseteventdestination_dimensionconfiguration.go
rename to pkg/goformation/cloudformation/ses/aws-ses-configurationseteventdestination_dimensionconfiguration.go
index eb5897e88c..226309d3eb 100644
--- a/goformation/cloudformation/ses/aws-ses-configurationseteventdestination_dimensionconfiguration.go
+++ b/pkg/goformation/cloudformation/ses/aws-ses-configurationseteventdestination_dimensionconfiguration.go
@@ -1,9 +1,9 @@
 package ses
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigurationSetEventDestination_DimensionConfiguration AWS CloudFormation Resource (AWS::SES::ConfigurationSetEventDestination.DimensionConfiguration)
diff --git a/goformation/cloudformation/ses/aws-ses-configurationseteventdestination_eventdestination.go b/pkg/goformation/cloudformation/ses/aws-ses-configurationseteventdestination_eventdestination.go
similarity index 95%
rename from goformation/cloudformation/ses/aws-ses-configurationseteventdestination_eventdestination.go
rename to pkg/goformation/cloudformation/ses/aws-ses-configurationseteventdestination_eventdestination.go
index a13e360733..51a81aa589 100644
--- a/goformation/cloudformation/ses/aws-ses-configurationseteventdestination_eventdestination.go
+++ b/pkg/goformation/cloudformation/ses/aws-ses-configurationseteventdestination_eventdestination.go
@@ -1,9 +1,9 @@
 package ses
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigurationSetEventDestination_EventDestination AWS CloudFormation Resource (AWS::SES::ConfigurationSetEventDestination.EventDestination)
diff --git a/goformation/cloudformation/ses/aws-ses-configurationseteventdestination_kinesisfirehosedestination.go b/pkg/goformation/cloudformation/ses/aws-ses-configurationseteventdestination_kinesisfirehosedestination.go
similarity index 93%
rename from goformation/cloudformation/ses/aws-ses-configurationseteventdestination_kinesisfirehosedestination.go
rename to pkg/goformation/cloudformation/ses/aws-ses-configurationseteventdestination_kinesisfirehosedestination.go
index 8564e70973..ab25e8e34f 100644
--- a/goformation/cloudformation/ses/aws-ses-configurationseteventdestination_kinesisfirehosedestination.go
+++ b/pkg/goformation/cloudformation/ses/aws-ses-configurationseteventdestination_kinesisfirehosedestination.go
@@ -1,9 +1,9 @@
 package ses
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConfigurationSetEventDestination_KinesisFirehoseDestination AWS CloudFormation Resource (AWS::SES::ConfigurationSetEventDestination.KinesisFirehoseDestination)
diff --git a/goformation/cloudformation/ses/aws-ses-contactlist.go b/pkg/goformation/cloudformation/ses/aws-ses-contactlist.go
similarity index 95%
rename from goformation/cloudformation/ses/aws-ses-contactlist.go
rename to pkg/goformation/cloudformation/ses/aws-ses-contactlist.go
index f8d2b1d9d0..39c5bb38d5 100644
--- a/goformation/cloudformation/ses/aws-ses-contactlist.go
+++ b/pkg/goformation/cloudformation/ses/aws-ses-contactlist.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ContactList AWS CloudFormation Resource (AWS::SES::ContactList)
diff --git a/goformation/cloudformation/ses/aws-ses-contactlist_topic.go b/pkg/goformation/cloudformation/ses/aws-ses-contactlist_topic.go
similarity index 94%
rename from goformation/cloudformation/ses/aws-ses-contactlist_topic.go
rename to pkg/goformation/cloudformation/ses/aws-ses-contactlist_topic.go
index 9f245e7c92..b76f69b7d2 100644
--- a/goformation/cloudformation/ses/aws-ses-contactlist_topic.go
+++ b/pkg/goformation/cloudformation/ses/aws-ses-contactlist_topic.go
@@ -1,9 +1,9 @@
 package ses
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ContactList_Topic AWS CloudFormation Resource (AWS::SES::ContactList.Topic)
diff --git a/goformation/cloudformation/ses/aws-ses-receiptfilter.go b/pkg/goformation/cloudformation/ses/aws-ses-receiptfilter.go
similarity index 98%
rename from goformation/cloudformation/ses/aws-ses-receiptfilter.go
rename to pkg/goformation/cloudformation/ses/aws-ses-receiptfilter.go
index 275a747641..ddeff4a7d4 100644
--- a/goformation/cloudformation/ses/aws-ses-receiptfilter.go
+++ b/pkg/goformation/cloudformation/ses/aws-ses-receiptfilter.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReceiptFilter AWS CloudFormation Resource (AWS::SES::ReceiptFilter)
diff --git a/goformation/cloudformation/ses/aws-ses-receiptfilter_filter.go b/pkg/goformation/cloudformation/ses/aws-ses-receiptfilter_filter.go
similarity index 92%
rename from goformation/cloudformation/ses/aws-ses-receiptfilter_filter.go
rename to pkg/goformation/cloudformation/ses/aws-ses-receiptfilter_filter.go
index 9dc6fa21c3..7856b7df43 100644
--- a/goformation/cloudformation/ses/aws-ses-receiptfilter_filter.go
+++ b/pkg/goformation/cloudformation/ses/aws-ses-receiptfilter_filter.go
@@ -1,9 +1,9 @@
 package ses
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReceiptFilter_Filter AWS CloudFormation Resource (AWS::SES::ReceiptFilter.Filter)
diff --git a/goformation/cloudformation/ses/aws-ses-receiptfilter_ipfilter.go b/pkg/goformation/cloudformation/ses/aws-ses-receiptfilter_ipfilter.go
similarity index 92%
rename from goformation/cloudformation/ses/aws-ses-receiptfilter_ipfilter.go
rename to pkg/goformation/cloudformation/ses/aws-ses-receiptfilter_ipfilter.go
index 04153c6b08..1ea443ec8b 100644
--- a/goformation/cloudformation/ses/aws-ses-receiptfilter_ipfilter.go
+++ b/pkg/goformation/cloudformation/ses/aws-ses-receiptfilter_ipfilter.go
@@ -1,9 +1,9 @@
 package ses
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReceiptFilter_IpFilter AWS CloudFormation Resource (AWS::SES::ReceiptFilter.IpFilter)
diff --git a/goformation/cloudformation/ses/aws-ses-receiptrule.go b/pkg/goformation/cloudformation/ses/aws-ses-receiptrule.go
similarity index 96%
rename from goformation/cloudformation/ses/aws-ses-receiptrule.go
rename to pkg/goformation/cloudformation/ses/aws-ses-receiptrule.go
index fed44d28a3..096c0afc32 100644
--- a/goformation/cloudformation/ses/aws-ses-receiptrule.go
+++ b/pkg/goformation/cloudformation/ses/aws-ses-receiptrule.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReceiptRule AWS CloudFormation Resource (AWS::SES::ReceiptRule)
diff --git a/goformation/cloudformation/ses/aws-ses-receiptrule_action.go b/pkg/goformation/cloudformation/ses/aws-ses-receiptrule_action.go
similarity index 97%
rename from goformation/cloudformation/ses/aws-ses-receiptrule_action.go
rename to pkg/goformation/cloudformation/ses/aws-ses-receiptrule_action.go
index 8cc52d3ee9..dc29d69b33 100644
--- a/goformation/cloudformation/ses/aws-ses-receiptrule_action.go
+++ b/pkg/goformation/cloudformation/ses/aws-ses-receiptrule_action.go
@@ -1,7 +1,7 @@
 package ses
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReceiptRule_Action AWS CloudFormation Resource (AWS::SES::ReceiptRule.Action)
diff --git a/goformation/cloudformation/ses/aws-ses-receiptrule_addheaderaction.go b/pkg/goformation/cloudformation/ses/aws-ses-receiptrule_addheaderaction.go
similarity index 92%
rename from goformation/cloudformation/ses/aws-ses-receiptrule_addheaderaction.go
rename to pkg/goformation/cloudformation/ses/aws-ses-receiptrule_addheaderaction.go
index 44456b61fb..e9e511aadb 100644
--- a/goformation/cloudformation/ses/aws-ses-receiptrule_addheaderaction.go
+++ b/pkg/goformation/cloudformation/ses/aws-ses-receiptrule_addheaderaction.go
@@ -1,9 +1,9 @@
 package ses
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReceiptRule_AddHeaderAction AWS CloudFormation Resource (AWS::SES::ReceiptRule.AddHeaderAction)
diff --git a/goformation/cloudformation/ses/aws-ses-receiptrule_bounceaction.go b/pkg/goformation/cloudformation/ses/aws-ses-receiptrule_bounceaction.go
similarity index 94%
rename from goformation/cloudformation/ses/aws-ses-receiptrule_bounceaction.go
rename to pkg/goformation/cloudformation/ses/aws-ses-receiptrule_bounceaction.go
index 4352db4964..a14ee6d2f7 100644
--- a/goformation/cloudformation/ses/aws-ses-receiptrule_bounceaction.go
+++ b/pkg/goformation/cloudformation/ses/aws-ses-receiptrule_bounceaction.go
@@ -1,9 +1,9 @@
 package ses
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReceiptRule_BounceAction AWS CloudFormation Resource (AWS::SES::ReceiptRule.BounceAction)
diff --git a/goformation/cloudformation/ses/aws-ses-receiptrule_lambdaaction.go b/pkg/goformation/cloudformation/ses/aws-ses-receiptrule_lambdaaction.go
similarity index 93%
rename from goformation/cloudformation/ses/aws-ses-receiptrule_lambdaaction.go
rename to pkg/goformation/cloudformation/ses/aws-ses-receiptrule_lambdaaction.go
index 0f442065e2..e388528094 100644
--- a/goformation/cloudformation/ses/aws-ses-receiptrule_lambdaaction.go
+++ b/pkg/goformation/cloudformation/ses/aws-ses-receiptrule_lambdaaction.go
@@ -1,9 +1,9 @@
 package ses
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReceiptRule_LambdaAction AWS CloudFormation Resource (AWS::SES::ReceiptRule.LambdaAction)
diff --git a/goformation/cloudformation/ses/aws-ses-receiptrule_rule.go b/pkg/goformation/cloudformation/ses/aws-ses-receiptrule_rule.go
similarity index 95%
rename from goformation/cloudformation/ses/aws-ses-receiptrule_rule.go
rename to pkg/goformation/cloudformation/ses/aws-ses-receiptrule_rule.go
index 17253cd2d8..e0dc4fceda 100644
--- a/goformation/cloudformation/ses/aws-ses-receiptrule_rule.go
+++ b/pkg/goformation/cloudformation/ses/aws-ses-receiptrule_rule.go
@@ -1,9 +1,9 @@
 package ses
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReceiptRule_Rule AWS CloudFormation Resource (AWS::SES::ReceiptRule.Rule)
diff --git a/goformation/cloudformation/ses/aws-ses-receiptrule_s3action.go b/pkg/goformation/cloudformation/ses/aws-ses-receiptrule_s3action.go
similarity index 94%
rename from goformation/cloudformation/ses/aws-ses-receiptrule_s3action.go
rename to pkg/goformation/cloudformation/ses/aws-ses-receiptrule_s3action.go
index aef16945a0..4827cbeb99 100644
--- a/goformation/cloudformation/ses/aws-ses-receiptrule_s3action.go
+++ b/pkg/goformation/cloudformation/ses/aws-ses-receiptrule_s3action.go
@@ -1,9 +1,9 @@
 package ses
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReceiptRule_S3Action AWS CloudFormation Resource (AWS::SES::ReceiptRule.S3Action)
diff --git a/goformation/cloudformation/ses/aws-ses-receiptrule_snsaction.go b/pkg/goformation/cloudformation/ses/aws-ses-receiptrule_snsaction.go
similarity index 92%
rename from goformation/cloudformation/ses/aws-ses-receiptrule_snsaction.go
rename to pkg/goformation/cloudformation/ses/aws-ses-receiptrule_snsaction.go
index e288444644..a10a608a45 100644
--- a/goformation/cloudformation/ses/aws-ses-receiptrule_snsaction.go
+++ b/pkg/goformation/cloudformation/ses/aws-ses-receiptrule_snsaction.go
@@ -1,9 +1,9 @@
 package ses
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReceiptRule_SNSAction AWS CloudFormation Resource (AWS::SES::ReceiptRule.SNSAction)
diff --git a/goformation/cloudformation/ses/aws-ses-receiptrule_stopaction.go b/pkg/goformation/cloudformation/ses/aws-ses-receiptrule_stopaction.go
similarity index 92%
rename from goformation/cloudformation/ses/aws-ses-receiptrule_stopaction.go
rename to pkg/goformation/cloudformation/ses/aws-ses-receiptrule_stopaction.go
index 4fd690b453..3469ce3f7d 100644
--- a/goformation/cloudformation/ses/aws-ses-receiptrule_stopaction.go
+++ b/pkg/goformation/cloudformation/ses/aws-ses-receiptrule_stopaction.go
@@ -1,9 +1,9 @@
 package ses
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReceiptRule_StopAction AWS CloudFormation Resource (AWS::SES::ReceiptRule.StopAction)
diff --git a/goformation/cloudformation/ses/aws-ses-receiptrule_workmailaction.go b/pkg/goformation/cloudformation/ses/aws-ses-receiptrule_workmailaction.go
similarity index 92%
rename from goformation/cloudformation/ses/aws-ses-receiptrule_workmailaction.go
rename to pkg/goformation/cloudformation/ses/aws-ses-receiptrule_workmailaction.go
index ef33eef49a..3af0e0bd6f 100644
--- a/goformation/cloudformation/ses/aws-ses-receiptrule_workmailaction.go
+++ b/pkg/goformation/cloudformation/ses/aws-ses-receiptrule_workmailaction.go
@@ -1,9 +1,9 @@
 package ses
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReceiptRule_WorkmailAction AWS CloudFormation Resource (AWS::SES::ReceiptRule.WorkmailAction)
diff --git a/goformation/cloudformation/ses/aws-ses-receiptruleset.go b/pkg/goformation/cloudformation/ses/aws-ses-receiptruleset.go
similarity index 96%
rename from goformation/cloudformation/ses/aws-ses-receiptruleset.go
rename to pkg/goformation/cloudformation/ses/aws-ses-receiptruleset.go
index 7f42df95d3..82dcda9eec 100644
--- a/goformation/cloudformation/ses/aws-ses-receiptruleset.go
+++ b/pkg/goformation/cloudformation/ses/aws-ses-receiptruleset.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReceiptRuleSet AWS CloudFormation Resource (AWS::SES::ReceiptRuleSet)
diff --git a/goformation/cloudformation/ses/aws-ses-template.go b/pkg/goformation/cloudformation/ses/aws-ses-template.go
similarity index 98%
rename from goformation/cloudformation/ses/aws-ses-template.go
rename to pkg/goformation/cloudformation/ses/aws-ses-template.go
index 130365c971..1ae0d82860 100644
--- a/goformation/cloudformation/ses/aws-ses-template.go
+++ b/pkg/goformation/cloudformation/ses/aws-ses-template.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Template AWS CloudFormation Resource (AWS::SES::Template)
diff --git a/goformation/cloudformation/ses/aws-ses-template_template.go b/pkg/goformation/cloudformation/ses/aws-ses-template_template.go
similarity index 94%
rename from goformation/cloudformation/ses/aws-ses-template_template.go
rename to pkg/goformation/cloudformation/ses/aws-ses-template_template.go
index 97be92813d..33c2b8041b 100644
--- a/goformation/cloudformation/ses/aws-ses-template_template.go
+++ b/pkg/goformation/cloudformation/ses/aws-ses-template_template.go
@@ -1,9 +1,9 @@
 package ses
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Template_Template AWS CloudFormation Resource (AWS::SES::Template.Template)
diff --git a/goformation/cloudformation/signer/aws-signer-profilepermission.go b/pkg/goformation/cloudformation/signer/aws-signer-profilepermission.go
similarity index 97%
rename from goformation/cloudformation/signer/aws-signer-profilepermission.go
rename to pkg/goformation/cloudformation/signer/aws-signer-profilepermission.go
index 184f1e8656..427f122481 100644
--- a/goformation/cloudformation/signer/aws-signer-profilepermission.go
+++ b/pkg/goformation/cloudformation/signer/aws-signer-profilepermission.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ProfilePermission AWS CloudFormation Resource (AWS::Signer::ProfilePermission)
diff --git a/goformation/cloudformation/signer/aws-signer-signingprofile.go b/pkg/goformation/cloudformation/signer/aws-signer-signingprofile.go
similarity index 95%
rename from goformation/cloudformation/signer/aws-signer-signingprofile.go
rename to pkg/goformation/cloudformation/signer/aws-signer-signingprofile.go
index fca1a658be..9c7d473ef9 100644
--- a/goformation/cloudformation/signer/aws-signer-signingprofile.go
+++ b/pkg/goformation/cloudformation/signer/aws-signer-signingprofile.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SigningProfile AWS CloudFormation Resource (AWS::Signer::SigningProfile)
diff --git a/goformation/cloudformation/signer/aws-signer-signingprofile_signaturevalidityperiod.go b/pkg/goformation/cloudformation/signer/aws-signer-signingprofile_signaturevalidityperiod.go
similarity index 93%
rename from goformation/cloudformation/signer/aws-signer-signingprofile_signaturevalidityperiod.go
rename to pkg/goformation/cloudformation/signer/aws-signer-signingprofile_signaturevalidityperiod.go
index 4e91eaa0b8..eaa316052a 100644
--- a/goformation/cloudformation/signer/aws-signer-signingprofile_signaturevalidityperiod.go
+++ b/pkg/goformation/cloudformation/signer/aws-signer-signingprofile_signaturevalidityperiod.go
@@ -1,9 +1,9 @@
 package signer
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SigningProfile_SignatureValidityPeriod AWS CloudFormation Resource (AWS::Signer::SigningProfile.SignatureValidityPeriod)
diff --git a/goformation/cloudformation/sns/aws-sns-subscription.go b/pkg/goformation/cloudformation/sns/aws-sns-subscription.go
similarity index 97%
rename from goformation/cloudformation/sns/aws-sns-subscription.go
rename to pkg/goformation/cloudformation/sns/aws-sns-subscription.go
index 55e1b6b5de..ca1ce1bcb7 100644
--- a/goformation/cloudformation/sns/aws-sns-subscription.go
+++ b/pkg/goformation/cloudformation/sns/aws-sns-subscription.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Subscription AWS CloudFormation Resource (AWS::SNS::Subscription)
diff --git a/goformation/cloudformation/sns/aws-sns-topic.go b/pkg/goformation/cloudformation/sns/aws-sns-topic.go
similarity index 96%
rename from goformation/cloudformation/sns/aws-sns-topic.go
rename to pkg/goformation/cloudformation/sns/aws-sns-topic.go
index 39dc10c468..46199ab372 100644
--- a/goformation/cloudformation/sns/aws-sns-topic.go
+++ b/pkg/goformation/cloudformation/sns/aws-sns-topic.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Topic AWS CloudFormation Resource (AWS::SNS::Topic)
diff --git a/goformation/cloudformation/sns/aws-sns-topic_subscription.go b/pkg/goformation/cloudformation/sns/aws-sns-topic_subscription.go
similarity index 92%
rename from goformation/cloudformation/sns/aws-sns-topic_subscription.go
rename to pkg/goformation/cloudformation/sns/aws-sns-topic_subscription.go
index ccef5012eb..484018f525 100644
--- a/goformation/cloudformation/sns/aws-sns-topic_subscription.go
+++ b/pkg/goformation/cloudformation/sns/aws-sns-topic_subscription.go
@@ -1,9 +1,9 @@
 package sns
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Topic_Subscription AWS CloudFormation Resource (AWS::SNS::Topic.Subscription)
diff --git a/goformation/cloudformation/sns/aws-sns-topicpolicy.go b/pkg/goformation/cloudformation/sns/aws-sns-topicpolicy.go
similarity index 96%
rename from goformation/cloudformation/sns/aws-sns-topicpolicy.go
rename to pkg/goformation/cloudformation/sns/aws-sns-topicpolicy.go
index edf5fce8d0..92c4357f73 100644
--- a/goformation/cloudformation/sns/aws-sns-topicpolicy.go
+++ b/pkg/goformation/cloudformation/sns/aws-sns-topicpolicy.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // TopicPolicy AWS CloudFormation Resource (AWS::SNS::TopicPolicy)
diff --git a/goformation/cloudformation/sqs/aws-sqs-queue.go b/pkg/goformation/cloudformation/sqs/aws-sqs-queue.go
similarity index 97%
rename from goformation/cloudformation/sqs/aws-sqs-queue.go
rename to pkg/goformation/cloudformation/sqs/aws-sqs-queue.go
index c71ad07dd7..198d5c6e39 100644
--- a/goformation/cloudformation/sqs/aws-sqs-queue.go
+++ b/pkg/goformation/cloudformation/sqs/aws-sqs-queue.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Queue AWS CloudFormation Resource (AWS::SQS::Queue)
diff --git a/goformation/cloudformation/sqs/aws-sqs-queuepolicy.go b/pkg/goformation/cloudformation/sqs/aws-sqs-queuepolicy.go
similarity index 96%
rename from goformation/cloudformation/sqs/aws-sqs-queuepolicy.go
rename to pkg/goformation/cloudformation/sqs/aws-sqs-queuepolicy.go
index 69008f18bf..3eb249f1a8 100644
--- a/goformation/cloudformation/sqs/aws-sqs-queuepolicy.go
+++ b/pkg/goformation/cloudformation/sqs/aws-sqs-queuepolicy.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // QueuePolicy AWS CloudFormation Resource (AWS::SQS::QueuePolicy)
diff --git a/goformation/cloudformation/ssm/aws-ssm-association.go b/pkg/goformation/cloudformation/ssm/aws-ssm-association.go
similarity index 98%
rename from goformation/cloudformation/ssm/aws-ssm-association.go
rename to pkg/goformation/cloudformation/ssm/aws-ssm-association.go
index 82dc8cdc70..c2c7792a59 100644
--- a/goformation/cloudformation/ssm/aws-ssm-association.go
+++ b/pkg/goformation/cloudformation/ssm/aws-ssm-association.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Association AWS CloudFormation Resource (AWS::SSM::Association)
diff --git a/goformation/cloudformation/ssm/aws-ssm-association_instanceassociationoutputlocation.go b/pkg/goformation/cloudformation/ssm/aws-ssm-association_instanceassociationoutputlocation.go
similarity index 95%
rename from goformation/cloudformation/ssm/aws-ssm-association_instanceassociationoutputlocation.go
rename to pkg/goformation/cloudformation/ssm/aws-ssm-association_instanceassociationoutputlocation.go
index ec9fee1493..9aee76fe66 100644
--- a/goformation/cloudformation/ssm/aws-ssm-association_instanceassociationoutputlocation.go
+++ b/pkg/goformation/cloudformation/ssm/aws-ssm-association_instanceassociationoutputlocation.go
@@ -1,7 +1,7 @@
 package ssm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Association_InstanceAssociationOutputLocation AWS CloudFormation Resource (AWS::SSM::Association.InstanceAssociationOutputLocation)
diff --git a/goformation/cloudformation/ssm/aws-ssm-association_parametervalues.go b/pkg/goformation/cloudformation/ssm/aws-ssm-association_parametervalues.go
similarity index 91%
rename from goformation/cloudformation/ssm/aws-ssm-association_parametervalues.go
rename to pkg/goformation/cloudformation/ssm/aws-ssm-association_parametervalues.go
index 8413160a6a..7295f863d5 100644
--- a/goformation/cloudformation/ssm/aws-ssm-association_parametervalues.go
+++ b/pkg/goformation/cloudformation/ssm/aws-ssm-association_parametervalues.go
@@ -1,9 +1,9 @@
 package ssm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Association_ParameterValues AWS CloudFormation Resource (AWS::SSM::Association.ParameterValues)
diff --git a/goformation/cloudformation/ssm/aws-ssm-association_s3outputlocation.go b/pkg/goformation/cloudformation/ssm/aws-ssm-association_s3outputlocation.go
similarity index 94%
rename from goformation/cloudformation/ssm/aws-ssm-association_s3outputlocation.go
rename to pkg/goformation/cloudformation/ssm/aws-ssm-association_s3outputlocation.go
index 93b474c93c..4e5648fdd4 100644
--- a/goformation/cloudformation/ssm/aws-ssm-association_s3outputlocation.go
+++ b/pkg/goformation/cloudformation/ssm/aws-ssm-association_s3outputlocation.go
@@ -1,9 +1,9 @@
 package ssm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Association_S3OutputLocation AWS CloudFormation Resource (AWS::SSM::Association.S3OutputLocation)
diff --git a/goformation/cloudformation/ssm/aws-ssm-association_target.go b/pkg/goformation/cloudformation/ssm/aws-ssm-association_target.go
similarity index 92%
rename from goformation/cloudformation/ssm/aws-ssm-association_target.go
rename to pkg/goformation/cloudformation/ssm/aws-ssm-association_target.go
index ceefac7127..29e23f8df7 100644
--- a/goformation/cloudformation/ssm/aws-ssm-association_target.go
+++ b/pkg/goformation/cloudformation/ssm/aws-ssm-association_target.go
@@ -1,9 +1,9 @@
 package ssm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Association_Target AWS CloudFormation Resource (AWS::SSM::Association.Target)
diff --git a/goformation/cloudformation/ssm/aws-ssm-document.go b/pkg/goformation/cloudformation/ssm/aws-ssm-document.go
similarity index 96%
rename from goformation/cloudformation/ssm/aws-ssm-document.go
rename to pkg/goformation/cloudformation/ssm/aws-ssm-document.go
index de44e09e2b..03940a23ea 100644
--- a/goformation/cloudformation/ssm/aws-ssm-document.go
+++ b/pkg/goformation/cloudformation/ssm/aws-ssm-document.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Document AWS CloudFormation Resource (AWS::SSM::Document)
diff --git a/goformation/cloudformation/ssm/aws-ssm-document_attachmentssource.go b/pkg/goformation/cloudformation/ssm/aws-ssm-document_attachmentssource.go
similarity index 93%
rename from goformation/cloudformation/ssm/aws-ssm-document_attachmentssource.go
rename to pkg/goformation/cloudformation/ssm/aws-ssm-document_attachmentssource.go
index 05c2b534ba..cfdaf8e7a9 100644
--- a/goformation/cloudformation/ssm/aws-ssm-document_attachmentssource.go
+++ b/pkg/goformation/cloudformation/ssm/aws-ssm-document_attachmentssource.go
@@ -1,9 +1,9 @@
 package ssm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Document_AttachmentsSource AWS CloudFormation Resource (AWS::SSM::Document.AttachmentsSource)
diff --git a/goformation/cloudformation/ssm/aws-ssm-document_documentrequires.go b/pkg/goformation/cloudformation/ssm/aws-ssm-document_documentrequires.go
similarity index 92%
rename from goformation/cloudformation/ssm/aws-ssm-document_documentrequires.go
rename to pkg/goformation/cloudformation/ssm/aws-ssm-document_documentrequires.go
index 8cb6798382..cf729dfca1 100644
--- a/goformation/cloudformation/ssm/aws-ssm-document_documentrequires.go
+++ b/pkg/goformation/cloudformation/ssm/aws-ssm-document_documentrequires.go
@@ -1,9 +1,9 @@
 package ssm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Document_DocumentRequires AWS CloudFormation Resource (AWS::SSM::Document.DocumentRequires)
diff --git a/goformation/cloudformation/ssm/aws-ssm-maintenancewindow.go b/pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindow.go
similarity index 96%
rename from goformation/cloudformation/ssm/aws-ssm-maintenancewindow.go
rename to pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindow.go
index ab19eb338a..d80620f71c 100644
--- a/goformation/cloudformation/ssm/aws-ssm-maintenancewindow.go
+++ b/pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindow.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MaintenanceWindow AWS CloudFormation Resource (AWS::SSM::MaintenanceWindow)
diff --git a/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtarget.go b/pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtarget.go
similarity index 97%
rename from goformation/cloudformation/ssm/aws-ssm-maintenancewindowtarget.go
rename to pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtarget.go
index e199e884c2..fdc3cbb810 100644
--- a/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtarget.go
+++ b/pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtarget.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MaintenanceWindowTarget AWS CloudFormation Resource (AWS::SSM::MaintenanceWindowTarget)
diff --git a/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtarget_targets.go b/pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtarget_targets.go
similarity index 92%
rename from goformation/cloudformation/ssm/aws-ssm-maintenancewindowtarget_targets.go
rename to pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtarget_targets.go
index 6f93675260..4349870103 100644
--- a/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtarget_targets.go
+++ b/pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtarget_targets.go
@@ -1,9 +1,9 @@
 package ssm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MaintenanceWindowTarget_Targets AWS CloudFormation Resource (AWS::SSM::MaintenanceWindowTarget.Targets)
diff --git a/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask.go b/pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask.go
similarity index 98%
rename from goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask.go
rename to pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask.go
index edf272cc24..eedd8981c3 100644
--- a/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask.go
+++ b/pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MaintenanceWindowTask AWS CloudFormation Resource (AWS::SSM::MaintenanceWindowTask)
diff --git a/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_logginginfo.go b/pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_logginginfo.go
similarity index 93%
rename from goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_logginginfo.go
rename to pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_logginginfo.go
index 08bceccd34..3b66687733 100644
--- a/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_logginginfo.go
+++ b/pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_logginginfo.go
@@ -1,9 +1,9 @@
 package ssm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MaintenanceWindowTask_LoggingInfo AWS CloudFormation Resource (AWS::SSM::MaintenanceWindowTask.LoggingInfo)
diff --git a/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowautomationparameters.go b/pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowautomationparameters.go
similarity index 93%
rename from goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowautomationparameters.go
rename to pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowautomationparameters.go
index 8039a0f993..1dda17fd06 100644
--- a/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowautomationparameters.go
+++ b/pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowautomationparameters.go
@@ -1,9 +1,9 @@
 package ssm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MaintenanceWindowTask_MaintenanceWindowAutomationParameters AWS CloudFormation Resource (AWS::SSM::MaintenanceWindowTask.MaintenanceWindowAutomationParameters)
diff --git a/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowlambdaparameters.go b/pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowlambdaparameters.go
similarity index 94%
rename from goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowlambdaparameters.go
rename to pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowlambdaparameters.go
index f937289319..7ac4f22476 100644
--- a/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowlambdaparameters.go
+++ b/pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowlambdaparameters.go
@@ -1,9 +1,9 @@
 package ssm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MaintenanceWindowTask_MaintenanceWindowLambdaParameters AWS CloudFormation Resource (AWS::SSM::MaintenanceWindowTask.MaintenanceWindowLambdaParameters)
diff --git a/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowruncommandparameters.go b/pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowruncommandparameters.go
similarity index 97%
rename from goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowruncommandparameters.go
rename to pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowruncommandparameters.go
index 855f23d1ce..53711843c1 100644
--- a/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowruncommandparameters.go
+++ b/pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowruncommandparameters.go
@@ -1,9 +1,9 @@
 package ssm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MaintenanceWindowTask_MaintenanceWindowRunCommandParameters AWS CloudFormation Resource (AWS::SSM::MaintenanceWindowTask.MaintenanceWindowRunCommandParameters)
diff --git a/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowstepfunctionsparameters.go b/pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowstepfunctionsparameters.go
similarity index 93%
rename from goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowstepfunctionsparameters.go
rename to pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowstepfunctionsparameters.go
index b451c38f09..072fb7e13e 100644
--- a/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowstepfunctionsparameters.go
+++ b/pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowstepfunctionsparameters.go
@@ -1,9 +1,9 @@
 package ssm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MaintenanceWindowTask_MaintenanceWindowStepFunctionsParameters AWS CloudFormation Resource (AWS::SSM::MaintenanceWindowTask.MaintenanceWindowStepFunctionsParameters)
diff --git a/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_notificationconfig.go b/pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_notificationconfig.go
similarity index 94%
rename from goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_notificationconfig.go
rename to pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_notificationconfig.go
index f120c676c8..e94b0b00bc 100644
--- a/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_notificationconfig.go
+++ b/pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_notificationconfig.go
@@ -1,9 +1,9 @@
 package ssm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MaintenanceWindowTask_NotificationConfig AWS CloudFormation Resource (AWS::SSM::MaintenanceWindowTask.NotificationConfig)
diff --git a/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_target.go b/pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_target.go
similarity index 92%
rename from goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_target.go
rename to pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_target.go
index 5d6baa2378..dd5c1f20dc 100644
--- a/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_target.go
+++ b/pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_target.go
@@ -1,9 +1,9 @@
 package ssm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MaintenanceWindowTask_Target AWS CloudFormation Resource (AWS::SSM::MaintenanceWindowTask.Target)
diff --git a/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_taskinvocationparameters.go b/pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_taskinvocationparameters.go
similarity index 97%
rename from goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_taskinvocationparameters.go
rename to pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_taskinvocationparameters.go
index ae55f518ab..5affc5a142 100644
--- a/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_taskinvocationparameters.go
+++ b/pkg/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_taskinvocationparameters.go
@@ -1,7 +1,7 @@
 package ssm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // MaintenanceWindowTask_TaskInvocationParameters AWS CloudFormation Resource (AWS::SSM::MaintenanceWindowTask.TaskInvocationParameters)
diff --git a/goformation/cloudformation/ssm/aws-ssm-parameter.go b/pkg/goformation/cloudformation/ssm/aws-ssm-parameter.go
similarity index 97%
rename from goformation/cloudformation/ssm/aws-ssm-parameter.go
rename to pkg/goformation/cloudformation/ssm/aws-ssm-parameter.go
index 0f857d8033..893831c1cb 100644
--- a/goformation/cloudformation/ssm/aws-ssm-parameter.go
+++ b/pkg/goformation/cloudformation/ssm/aws-ssm-parameter.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Parameter AWS CloudFormation Resource (AWS::SSM::Parameter)
diff --git a/goformation/cloudformation/ssm/aws-ssm-patchbaseline.go b/pkg/goformation/cloudformation/ssm/aws-ssm-patchbaseline.go
similarity index 97%
rename from goformation/cloudformation/ssm/aws-ssm-patchbaseline.go
rename to pkg/goformation/cloudformation/ssm/aws-ssm-patchbaseline.go
index 4a98811847..a4ccc246e5 100644
--- a/goformation/cloudformation/ssm/aws-ssm-patchbaseline.go
+++ b/pkg/goformation/cloudformation/ssm/aws-ssm-patchbaseline.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PatchBaseline AWS CloudFormation Resource (AWS::SSM::PatchBaseline)
diff --git a/goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchfilter.go b/pkg/goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchfilter.go
similarity index 92%
rename from goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchfilter.go
rename to pkg/goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchfilter.go
index 52f90ec1c6..e4817f9f3f 100644
--- a/goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchfilter.go
+++ b/pkg/goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchfilter.go
@@ -1,9 +1,9 @@
 package ssm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PatchBaseline_PatchFilter AWS CloudFormation Resource (AWS::SSM::PatchBaseline.PatchFilter)
diff --git a/goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchfiltergroup.go b/pkg/goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchfiltergroup.go
similarity index 95%
rename from goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchfiltergroup.go
rename to pkg/goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchfiltergroup.go
index 8f5c15e42b..9505d89d3d 100644
--- a/goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchfiltergroup.go
+++ b/pkg/goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchfiltergroup.go
@@ -1,7 +1,7 @@
 package ssm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PatchBaseline_PatchFilterGroup AWS CloudFormation Resource (AWS::SSM::PatchBaseline.PatchFilterGroup)
diff --git a/goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchsource.go b/pkg/goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchsource.go
similarity index 93%
rename from goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchsource.go
rename to pkg/goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchsource.go
index 6a786fd196..c60b4ed96d 100644
--- a/goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchsource.go
+++ b/pkg/goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchsource.go
@@ -1,9 +1,9 @@
 package ssm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PatchBaseline_PatchSource AWS CloudFormation Resource (AWS::SSM::PatchBaseline.PatchSource)
diff --git a/goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchstringdate.go b/pkg/goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchstringdate.go
similarity index 94%
rename from goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchstringdate.go
rename to pkg/goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchstringdate.go
index b9b21ceeb5..93f96f9d9a 100644
--- a/goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchstringdate.go
+++ b/pkg/goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchstringdate.go
@@ -1,7 +1,7 @@
 package ssm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PatchBaseline_PatchStringDate AWS CloudFormation Resource (AWS::SSM::PatchBaseline.PatchStringDate)
diff --git a/goformation/cloudformation/ssm/aws-ssm-patchbaseline_rule.go b/pkg/goformation/cloudformation/ssm/aws-ssm-patchbaseline_rule.go
similarity index 95%
rename from goformation/cloudformation/ssm/aws-ssm-patchbaseline_rule.go
rename to pkg/goformation/cloudformation/ssm/aws-ssm-patchbaseline_rule.go
index 5fbfcc9cf0..0fbead1789 100644
--- a/goformation/cloudformation/ssm/aws-ssm-patchbaseline_rule.go
+++ b/pkg/goformation/cloudformation/ssm/aws-ssm-patchbaseline_rule.go
@@ -1,9 +1,9 @@
 package ssm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PatchBaseline_Rule AWS CloudFormation Resource (AWS::SSM::PatchBaseline.Rule)
diff --git a/goformation/cloudformation/ssm/aws-ssm-patchbaseline_rulegroup.go b/pkg/goformation/cloudformation/ssm/aws-ssm-patchbaseline_rulegroup.go
similarity index 95%
rename from goformation/cloudformation/ssm/aws-ssm-patchbaseline_rulegroup.go
rename to pkg/goformation/cloudformation/ssm/aws-ssm-patchbaseline_rulegroup.go
index 0b1f36a0f8..decf8a087b 100644
--- a/goformation/cloudformation/ssm/aws-ssm-patchbaseline_rulegroup.go
+++ b/pkg/goformation/cloudformation/ssm/aws-ssm-patchbaseline_rulegroup.go
@@ -1,7 +1,7 @@
 package ssm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PatchBaseline_RuleGroup AWS CloudFormation Resource (AWS::SSM::PatchBaseline.RuleGroup)
diff --git a/goformation/cloudformation/ssm/aws-ssm-resourcedatasync.go b/pkg/goformation/cloudformation/ssm/aws-ssm-resourcedatasync.go
similarity index 97%
rename from goformation/cloudformation/ssm/aws-ssm-resourcedatasync.go
rename to pkg/goformation/cloudformation/ssm/aws-ssm-resourcedatasync.go
index 857d7354b5..ecac853e19 100644
--- a/goformation/cloudformation/ssm/aws-ssm-resourcedatasync.go
+++ b/pkg/goformation/cloudformation/ssm/aws-ssm-resourcedatasync.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceDataSync AWS CloudFormation Resource (AWS::SSM::ResourceDataSync)
diff --git a/goformation/cloudformation/ssm/aws-ssm-resourcedatasync_awsorganizationssource.go b/pkg/goformation/cloudformation/ssm/aws-ssm-resourcedatasync_awsorganizationssource.go
similarity index 93%
rename from goformation/cloudformation/ssm/aws-ssm-resourcedatasync_awsorganizationssource.go
rename to pkg/goformation/cloudformation/ssm/aws-ssm-resourcedatasync_awsorganizationssource.go
index 5359f92f99..d7a0d84c5b 100644
--- a/goformation/cloudformation/ssm/aws-ssm-resourcedatasync_awsorganizationssource.go
+++ b/pkg/goformation/cloudformation/ssm/aws-ssm-resourcedatasync_awsorganizationssource.go
@@ -1,9 +1,9 @@
 package ssm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceDataSync_AwsOrganizationsSource AWS CloudFormation Resource (AWS::SSM::ResourceDataSync.AwsOrganizationsSource)
diff --git a/goformation/cloudformation/ssm/aws-ssm-resourcedatasync_s3destination.go b/pkg/goformation/cloudformation/ssm/aws-ssm-resourcedatasync_s3destination.go
similarity index 95%
rename from goformation/cloudformation/ssm/aws-ssm-resourcedatasync_s3destination.go
rename to pkg/goformation/cloudformation/ssm/aws-ssm-resourcedatasync_s3destination.go
index d7d4600c89..4f2861b506 100644
--- a/goformation/cloudformation/ssm/aws-ssm-resourcedatasync_s3destination.go
+++ b/pkg/goformation/cloudformation/ssm/aws-ssm-resourcedatasync_s3destination.go
@@ -1,9 +1,9 @@
 package ssm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceDataSync_S3Destination AWS CloudFormation Resource (AWS::SSM::ResourceDataSync.S3Destination)
diff --git a/goformation/cloudformation/ssm/aws-ssm-resourcedatasync_syncsource.go b/pkg/goformation/cloudformation/ssm/aws-ssm-resourcedatasync_syncsource.go
similarity index 94%
rename from goformation/cloudformation/ssm/aws-ssm-resourcedatasync_syncsource.go
rename to pkg/goformation/cloudformation/ssm/aws-ssm-resourcedatasync_syncsource.go
index 54652ee2bd..15a61190d9 100644
--- a/goformation/cloudformation/ssm/aws-ssm-resourcedatasync_syncsource.go
+++ b/pkg/goformation/cloudformation/ssm/aws-ssm-resourcedatasync_syncsource.go
@@ -1,9 +1,9 @@
 package ssm
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResourceDataSync_SyncSource AWS CloudFormation Resource (AWS::SSM::ResourceDataSync.SyncSource)
diff --git a/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact.go b/pkg/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact.go
similarity index 97%
rename from goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact.go
rename to pkg/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact.go
index e2e7d69473..eaea0a7c0a 100644
--- a/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact.go
+++ b/pkg/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Contact AWS CloudFormation Resource (AWS::SSMContacts::Contact)
diff --git a/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_channeltargetinfo.go b/pkg/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_channeltargetinfo.go
similarity index 93%
rename from goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_channeltargetinfo.go
rename to pkg/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_channeltargetinfo.go
index da78b35f04..02940478c0 100644
--- a/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_channeltargetinfo.go
+++ b/pkg/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_channeltargetinfo.go
@@ -1,9 +1,9 @@
 package ssmcontacts
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Contact_ChannelTargetInfo AWS CloudFormation Resource (AWS::SSMContacts::Contact.ChannelTargetInfo)
diff --git a/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_contacttargetinfo.go b/pkg/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_contacttargetinfo.go
similarity index 93%
rename from goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_contacttargetinfo.go
rename to pkg/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_contacttargetinfo.go
index 9b90eee5e2..e40a80233e 100644
--- a/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_contacttargetinfo.go
+++ b/pkg/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_contacttargetinfo.go
@@ -1,9 +1,9 @@
 package ssmcontacts
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Contact_ContactTargetInfo AWS CloudFormation Resource (AWS::SSMContacts::Contact.ContactTargetInfo)
diff --git a/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_stage.go b/pkg/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_stage.go
similarity index 92%
rename from goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_stage.go
rename to pkg/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_stage.go
index ad3e35b64d..b42e2d7299 100644
--- a/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_stage.go
+++ b/pkg/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_stage.go
@@ -1,9 +1,9 @@
 package ssmcontacts
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Contact_Stage AWS CloudFormation Resource (AWS::SSMContacts::Contact.Stage)
diff --git a/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_targets.go b/pkg/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_targets.go
similarity index 96%
rename from goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_targets.go
rename to pkg/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_targets.go
index e09b439e14..ac25e129bd 100644
--- a/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_targets.go
+++ b/pkg/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_targets.go
@@ -1,7 +1,7 @@
 package ssmcontacts
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Contact_Targets AWS CloudFormation Resource (AWS::SSMContacts::Contact.Targets)
diff --git a/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contactchannel.go b/pkg/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contactchannel.go
similarity index 97%
rename from goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contactchannel.go
rename to pkg/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contactchannel.go
index b54114eb9f..2255bd5089 100644
--- a/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contactchannel.go
+++ b/pkg/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contactchannel.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ContactChannel AWS CloudFormation Resource (AWS::SSMContacts::ContactChannel)
diff --git a/goformation/cloudformation/ssmincidents/aws-ssmincidents-replicationset.go b/pkg/goformation/cloudformation/ssmincidents/aws-ssmincidents-replicationset.go
similarity index 96%
rename from goformation/cloudformation/ssmincidents/aws-ssmincidents-replicationset.go
rename to pkg/goformation/cloudformation/ssmincidents/aws-ssmincidents-replicationset.go
index 684a365246..936599d0d6 100644
--- a/goformation/cloudformation/ssmincidents/aws-ssmincidents-replicationset.go
+++ b/pkg/goformation/cloudformation/ssmincidents/aws-ssmincidents-replicationset.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReplicationSet AWS CloudFormation Resource (AWS::SSMIncidents::ReplicationSet)
diff --git a/goformation/cloudformation/ssmincidents/aws-ssmincidents-replicationset_regionconfiguration.go b/pkg/goformation/cloudformation/ssmincidents/aws-ssmincidents-replicationset_regionconfiguration.go
similarity index 92%
rename from goformation/cloudformation/ssmincidents/aws-ssmincidents-replicationset_regionconfiguration.go
rename to pkg/goformation/cloudformation/ssmincidents/aws-ssmincidents-replicationset_regionconfiguration.go
index 0991a6b607..56fc6dbad9 100644
--- a/goformation/cloudformation/ssmincidents/aws-ssmincidents-replicationset_regionconfiguration.go
+++ b/pkg/goformation/cloudformation/ssmincidents/aws-ssmincidents-replicationset_regionconfiguration.go
@@ -1,9 +1,9 @@
 package ssmincidents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReplicationSet_RegionConfiguration AWS CloudFormation Resource (AWS::SSMIncidents::ReplicationSet.RegionConfiguration)
diff --git a/goformation/cloudformation/ssmincidents/aws-ssmincidents-replicationset_replicationregion.go b/pkg/goformation/cloudformation/ssmincidents/aws-ssmincidents-replicationset_replicationregion.go
similarity index 93%
rename from goformation/cloudformation/ssmincidents/aws-ssmincidents-replicationset_replicationregion.go
rename to pkg/goformation/cloudformation/ssmincidents/aws-ssmincidents-replicationset_replicationregion.go
index 9230252c61..64ec9a4aae 100644
--- a/goformation/cloudformation/ssmincidents/aws-ssmincidents-replicationset_replicationregion.go
+++ b/pkg/goformation/cloudformation/ssmincidents/aws-ssmincidents-replicationset_replicationregion.go
@@ -1,9 +1,9 @@
 package ssmincidents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ReplicationSet_ReplicationRegion AWS CloudFormation Resource (AWS::SSMIncidents::ReplicationSet.ReplicationRegion)
diff --git a/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan.go b/pkg/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan.go
similarity index 96%
rename from goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan.go
rename to pkg/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan.go
index b88e920a02..9dd702856e 100644
--- a/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan.go
+++ b/pkg/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResponsePlan AWS CloudFormation Resource (AWS::SSMIncidents::ResponsePlan)
diff --git a/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_action.go b/pkg/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_action.go
similarity index 95%
rename from goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_action.go
rename to pkg/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_action.go
index 9a942c26fb..3e62e940cb 100644
--- a/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_action.go
+++ b/pkg/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_action.go
@@ -1,7 +1,7 @@
 package ssmincidents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResponsePlan_Action AWS CloudFormation Resource (AWS::SSMIncidents::ResponsePlan.Action)
diff --git a/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_chatchannel.go b/pkg/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_chatchannel.go
similarity index 91%
rename from goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_chatchannel.go
rename to pkg/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_chatchannel.go
index 6430fe4967..5985409ee0 100644
--- a/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_chatchannel.go
+++ b/pkg/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_chatchannel.go
@@ -1,9 +1,9 @@
 package ssmincidents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResponsePlan_ChatChannel AWS CloudFormation Resource (AWS::SSMIncidents::ResponsePlan.ChatChannel)
diff --git a/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_incidenttemplate.go b/pkg/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_incidenttemplate.go
similarity index 95%
rename from goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_incidenttemplate.go
rename to pkg/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_incidenttemplate.go
index 3be0cd1f2f..2a8617fae3 100644
--- a/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_incidenttemplate.go
+++ b/pkg/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_incidenttemplate.go
@@ -1,9 +1,9 @@
 package ssmincidents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResponsePlan_IncidentTemplate AWS CloudFormation Resource (AWS::SSMIncidents::ResponsePlan.IncidentTemplate)
diff --git a/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_notificationtargetitem.go b/pkg/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_notificationtargetitem.go
similarity index 92%
rename from goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_notificationtargetitem.go
rename to pkg/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_notificationtargetitem.go
index 0c79f7fcf3..c3f9311129 100644
--- a/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_notificationtargetitem.go
+++ b/pkg/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_notificationtargetitem.go
@@ -1,9 +1,9 @@
 package ssmincidents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResponsePlan_NotificationTargetItem AWS CloudFormation Resource (AWS::SSMIncidents::ResponsePlan.NotificationTargetItem)
diff --git a/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_ssmautomation.go b/pkg/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_ssmautomation.go
similarity index 95%
rename from goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_ssmautomation.go
rename to pkg/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_ssmautomation.go
index 502f74acc5..e7b4f273e9 100644
--- a/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_ssmautomation.go
+++ b/pkg/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_ssmautomation.go
@@ -1,9 +1,9 @@
 package ssmincidents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResponsePlan_SsmAutomation AWS CloudFormation Resource (AWS::SSMIncidents::ResponsePlan.SsmAutomation)
diff --git a/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_ssmparameter.go b/pkg/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_ssmparameter.go
similarity index 92%
rename from goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_ssmparameter.go
rename to pkg/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_ssmparameter.go
index 450d52b582..b7a3553809 100644
--- a/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_ssmparameter.go
+++ b/pkg/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_ssmparameter.go
@@ -1,9 +1,9 @@
 package ssmincidents
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ResponsePlan_SsmParameter AWS CloudFormation Resource (AWS::SSMIncidents::ResponsePlan.SsmParameter)
diff --git a/goformation/cloudformation/sso/aws-sso-assignment.go b/pkg/goformation/cloudformation/sso/aws-sso-assignment.go
similarity index 97%
rename from goformation/cloudformation/sso/aws-sso-assignment.go
rename to pkg/goformation/cloudformation/sso/aws-sso-assignment.go
index a5c96fdc49..0e4b2f4a29 100644
--- a/goformation/cloudformation/sso/aws-sso-assignment.go
+++ b/pkg/goformation/cloudformation/sso/aws-sso-assignment.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Assignment AWS CloudFormation Resource (AWS::SSO::Assignment)
diff --git a/goformation/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration.go b/pkg/goformation/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration.go
similarity index 97%
rename from goformation/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration.go
rename to pkg/goformation/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration.go
index f3e519fe7b..2c6bfc4ce3 100644
--- a/goformation/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration.go
+++ b/pkg/goformation/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InstanceAccessControlAttributeConfiguration AWS CloudFormation Resource (AWS::SSO::InstanceAccessControlAttributeConfiguration)
diff --git a/goformation/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration_accesscontrolattribute.go b/pkg/goformation/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration_accesscontrolattribute.go
similarity index 94%
rename from goformation/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration_accesscontrolattribute.go
rename to pkg/goformation/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration_accesscontrolattribute.go
index a132e8bdf4..db95919e47 100644
--- a/goformation/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration_accesscontrolattribute.go
+++ b/pkg/goformation/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration_accesscontrolattribute.go
@@ -1,9 +1,9 @@
 package sso
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InstanceAccessControlAttributeConfiguration_AccessControlAttribute AWS CloudFormation Resource (AWS::SSO::InstanceAccessControlAttributeConfiguration.AccessControlAttribute)
diff --git a/goformation/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration_accesscontrolattributevalue.go b/pkg/goformation/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration_accesscontrolattributevalue.go
similarity index 93%
rename from goformation/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration_accesscontrolattributevalue.go
rename to pkg/goformation/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration_accesscontrolattributevalue.go
index 20a8e2594a..7e15401723 100644
--- a/goformation/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration_accesscontrolattributevalue.go
+++ b/pkg/goformation/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration_accesscontrolattributevalue.go
@@ -1,9 +1,9 @@
 package sso
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // InstanceAccessControlAttributeConfiguration_AccessControlAttributeValue AWS CloudFormation Resource (AWS::SSO::InstanceAccessControlAttributeConfiguration.AccessControlAttributeValue)
diff --git a/goformation/cloudformation/sso/aws-sso-permissionset.go b/pkg/goformation/cloudformation/sso/aws-sso-permissionset.go
similarity index 96%
rename from goformation/cloudformation/sso/aws-sso-permissionset.go
rename to pkg/goformation/cloudformation/sso/aws-sso-permissionset.go
index 523404b993..5a40505e68 100644
--- a/goformation/cloudformation/sso/aws-sso-permissionset.go
+++ b/pkg/goformation/cloudformation/sso/aws-sso-permissionset.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // PermissionSet AWS CloudFormation Resource (AWS::SSO::PermissionSet)
diff --git a/goformation/cloudformation/stepfunctions/aws-stepfunctions-activity.go b/pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-activity.go
similarity index 96%
rename from goformation/cloudformation/stepfunctions/aws-stepfunctions-activity.go
rename to pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-activity.go
index 833f47c9b6..60f4cca0c3 100644
--- a/goformation/cloudformation/stepfunctions/aws-stepfunctions-activity.go
+++ b/pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-activity.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Activity AWS CloudFormation Resource (AWS::StepFunctions::Activity)
diff --git a/goformation/cloudformation/stepfunctions/aws-stepfunctions-activity_tagsentry.go b/pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-activity_tagsentry.go
similarity index 92%
rename from goformation/cloudformation/stepfunctions/aws-stepfunctions-activity_tagsentry.go
rename to pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-activity_tagsentry.go
index b4541dfb98..69e1781c61 100644
--- a/goformation/cloudformation/stepfunctions/aws-stepfunctions-activity_tagsentry.go
+++ b/pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-activity_tagsentry.go
@@ -1,9 +1,9 @@
 package stepfunctions
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Activity_TagsEntry AWS CloudFormation Resource (AWS::StepFunctions::Activity.TagsEntry)
diff --git a/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine.go b/pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine.go
similarity index 97%
rename from goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine.go
rename to pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine.go
index e657e04841..c7b169cd8c 100644
--- a/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine.go
+++ b/pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StateMachine AWS CloudFormation Resource (AWS::StepFunctions::StateMachine)
diff --git a/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_cloudwatchlogsloggroup.go b/pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_cloudwatchlogsloggroup.go
similarity index 92%
rename from goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_cloudwatchlogsloggroup.go
rename to pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_cloudwatchlogsloggroup.go
index d9d9016dda..d9975bfe0a 100644
--- a/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_cloudwatchlogsloggroup.go
+++ b/pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_cloudwatchlogsloggroup.go
@@ -1,9 +1,9 @@
 package stepfunctions
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StateMachine_CloudWatchLogsLogGroup AWS CloudFormation Resource (AWS::StepFunctions::StateMachine.CloudWatchLogsLogGroup)
diff --git a/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_definition.go b/pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_definition.go
similarity index 94%
rename from goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_definition.go
rename to pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_definition.go
index 73dc3fd6b9..4f8e15d7db 100644
--- a/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_definition.go
+++ b/pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_definition.go
@@ -1,7 +1,7 @@
 package stepfunctions
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StateMachine_Definition AWS CloudFormation Resource (AWS::StepFunctions::StateMachine.Definition)
diff --git a/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_definitionsubstitutions.go b/pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_definitionsubstitutions.go
similarity index 94%
rename from goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_definitionsubstitutions.go
rename to pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_definitionsubstitutions.go
index d744735dc9..389f791549 100644
--- a/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_definitionsubstitutions.go
+++ b/pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_definitionsubstitutions.go
@@ -1,7 +1,7 @@
 package stepfunctions
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StateMachine_DefinitionSubstitutions AWS CloudFormation Resource (AWS::StepFunctions::StateMachine.DefinitionSubstitutions)
diff --git a/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_logdestination.go b/pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_logdestination.go
similarity index 95%
rename from goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_logdestination.go
rename to pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_logdestination.go
index 5922e2384a..9ba6fd3242 100644
--- a/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_logdestination.go
+++ b/pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_logdestination.go
@@ -1,7 +1,7 @@
 package stepfunctions
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StateMachine_LogDestination AWS CloudFormation Resource (AWS::StepFunctions::StateMachine.LogDestination)
diff --git a/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_loggingconfiguration.go b/pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_loggingconfiguration.go
similarity index 94%
rename from goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_loggingconfiguration.go
rename to pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_loggingconfiguration.go
index 9db115838b..b12b6f1f31 100644
--- a/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_loggingconfiguration.go
+++ b/pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_loggingconfiguration.go
@@ -1,9 +1,9 @@
 package stepfunctions
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StateMachine_LoggingConfiguration AWS CloudFormation Resource (AWS::StepFunctions::StateMachine.LoggingConfiguration)
diff --git a/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_s3location.go b/pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_s3location.go
similarity index 93%
rename from goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_s3location.go
rename to pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_s3location.go
index 3922226412..b12ad01e8d 100644
--- a/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_s3location.go
+++ b/pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_s3location.go
@@ -1,9 +1,9 @@
 package stepfunctions
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StateMachine_S3Location AWS CloudFormation Resource (AWS::StepFunctions::StateMachine.S3Location)
diff --git a/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_tagsentry.go b/pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_tagsentry.go
similarity index 92%
rename from goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_tagsentry.go
rename to pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_tagsentry.go
index 856d7c60c9..2e968f17d3 100644
--- a/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_tagsentry.go
+++ b/pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_tagsentry.go
@@ -1,9 +1,9 @@
 package stepfunctions
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StateMachine_TagsEntry AWS CloudFormation Resource (AWS::StepFunctions::StateMachine.TagsEntry)
diff --git a/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_tracingconfiguration.go b/pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_tracingconfiguration.go
similarity index 92%
rename from goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_tracingconfiguration.go
rename to pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_tracingconfiguration.go
index 94a161ccc1..1093c806f2 100644
--- a/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_tracingconfiguration.go
+++ b/pkg/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_tracingconfiguration.go
@@ -1,9 +1,9 @@
 package stepfunctions
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // StateMachine_TracingConfiguration AWS CloudFormation Resource (AWS::StepFunctions::StateMachine.TracingConfiguration)
diff --git a/goformation/cloudformation/synthetics/aws-synthetics-canary.go b/pkg/goformation/cloudformation/synthetics/aws-synthetics-canary.go
similarity index 97%
rename from goformation/cloudformation/synthetics/aws-synthetics-canary.go
rename to pkg/goformation/cloudformation/synthetics/aws-synthetics-canary.go
index 7298e00257..fa1f54ee23 100644
--- a/goformation/cloudformation/synthetics/aws-synthetics-canary.go
+++ b/pkg/goformation/cloudformation/synthetics/aws-synthetics-canary.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Canary AWS CloudFormation Resource (AWS::Synthetics::Canary)
diff --git a/goformation/cloudformation/synthetics/aws-synthetics-canary_artifactconfig.go b/pkg/goformation/cloudformation/synthetics/aws-synthetics-canary_artifactconfig.go
similarity index 95%
rename from goformation/cloudformation/synthetics/aws-synthetics-canary_artifactconfig.go
rename to pkg/goformation/cloudformation/synthetics/aws-synthetics-canary_artifactconfig.go
index e656da4e9d..1918f30a80 100644
--- a/goformation/cloudformation/synthetics/aws-synthetics-canary_artifactconfig.go
+++ b/pkg/goformation/cloudformation/synthetics/aws-synthetics-canary_artifactconfig.go
@@ -1,7 +1,7 @@
 package synthetics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Canary_ArtifactConfig AWS CloudFormation Resource (AWS::Synthetics::Canary.ArtifactConfig)
diff --git a/goformation/cloudformation/synthetics/aws-synthetics-canary_basescreenshot.go b/pkg/goformation/cloudformation/synthetics/aws-synthetics-canary_basescreenshot.go
similarity index 93%
rename from goformation/cloudformation/synthetics/aws-synthetics-canary_basescreenshot.go
rename to pkg/goformation/cloudformation/synthetics/aws-synthetics-canary_basescreenshot.go
index 5e75141337..4c9545aa4f 100644
--- a/goformation/cloudformation/synthetics/aws-synthetics-canary_basescreenshot.go
+++ b/pkg/goformation/cloudformation/synthetics/aws-synthetics-canary_basescreenshot.go
@@ -1,9 +1,9 @@
 package synthetics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Canary_BaseScreenshot AWS CloudFormation Resource (AWS::Synthetics::Canary.BaseScreenshot)
diff --git a/goformation/cloudformation/synthetics/aws-synthetics-canary_code.go b/pkg/goformation/cloudformation/synthetics/aws-synthetics-canary_code.go
similarity index 94%
rename from goformation/cloudformation/synthetics/aws-synthetics-canary_code.go
rename to pkg/goformation/cloudformation/synthetics/aws-synthetics-canary_code.go
index 9bdff29e1c..2a9342bb99 100644
--- a/goformation/cloudformation/synthetics/aws-synthetics-canary_code.go
+++ b/pkg/goformation/cloudformation/synthetics/aws-synthetics-canary_code.go
@@ -1,9 +1,9 @@
 package synthetics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Canary_Code AWS CloudFormation Resource (AWS::Synthetics::Canary.Code)
diff --git a/goformation/cloudformation/synthetics/aws-synthetics-canary_runconfig.go b/pkg/goformation/cloudformation/synthetics/aws-synthetics-canary_runconfig.go
similarity index 94%
rename from goformation/cloudformation/synthetics/aws-synthetics-canary_runconfig.go
rename to pkg/goformation/cloudformation/synthetics/aws-synthetics-canary_runconfig.go
index 1cbf8cebf7..246ca5fefa 100644
--- a/goformation/cloudformation/synthetics/aws-synthetics-canary_runconfig.go
+++ b/pkg/goformation/cloudformation/synthetics/aws-synthetics-canary_runconfig.go
@@ -1,9 +1,9 @@
 package synthetics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Canary_RunConfig AWS CloudFormation Resource (AWS::Synthetics::Canary.RunConfig)
diff --git a/goformation/cloudformation/synthetics/aws-synthetics-canary_s3encryption.go b/pkg/goformation/cloudformation/synthetics/aws-synthetics-canary_s3encryption.go
similarity index 92%
rename from goformation/cloudformation/synthetics/aws-synthetics-canary_s3encryption.go
rename to pkg/goformation/cloudformation/synthetics/aws-synthetics-canary_s3encryption.go
index e2a225b1f7..adfd707871 100644
--- a/goformation/cloudformation/synthetics/aws-synthetics-canary_s3encryption.go
+++ b/pkg/goformation/cloudformation/synthetics/aws-synthetics-canary_s3encryption.go
@@ -1,9 +1,9 @@
 package synthetics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Canary_S3Encryption AWS CloudFormation Resource (AWS::Synthetics::Canary.S3Encryption)
diff --git a/goformation/cloudformation/synthetics/aws-synthetics-canary_schedule.go b/pkg/goformation/cloudformation/synthetics/aws-synthetics-canary_schedule.go
similarity index 92%
rename from goformation/cloudformation/synthetics/aws-synthetics-canary_schedule.go
rename to pkg/goformation/cloudformation/synthetics/aws-synthetics-canary_schedule.go
index ad3070f97d..4aa101bf00 100644
--- a/goformation/cloudformation/synthetics/aws-synthetics-canary_schedule.go
+++ b/pkg/goformation/cloudformation/synthetics/aws-synthetics-canary_schedule.go
@@ -1,9 +1,9 @@
 package synthetics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Canary_Schedule AWS CloudFormation Resource (AWS::Synthetics::Canary.Schedule)
diff --git a/goformation/cloudformation/synthetics/aws-synthetics-canary_visualreference.go b/pkg/goformation/cloudformation/synthetics/aws-synthetics-canary_visualreference.go
similarity index 93%
rename from goformation/cloudformation/synthetics/aws-synthetics-canary_visualreference.go
rename to pkg/goformation/cloudformation/synthetics/aws-synthetics-canary_visualreference.go
index eae642ce8f..f38cd4df21 100644
--- a/goformation/cloudformation/synthetics/aws-synthetics-canary_visualreference.go
+++ b/pkg/goformation/cloudformation/synthetics/aws-synthetics-canary_visualreference.go
@@ -1,9 +1,9 @@
 package synthetics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Canary_VisualReference AWS CloudFormation Resource (AWS::Synthetics::Canary.VisualReference)
diff --git a/goformation/cloudformation/synthetics/aws-synthetics-canary_vpcconfig.go b/pkg/goformation/cloudformation/synthetics/aws-synthetics-canary_vpcconfig.go
similarity index 93%
rename from goformation/cloudformation/synthetics/aws-synthetics-canary_vpcconfig.go
rename to pkg/goformation/cloudformation/synthetics/aws-synthetics-canary_vpcconfig.go
index 1e352780b4..a8acd2b077 100644
--- a/goformation/cloudformation/synthetics/aws-synthetics-canary_vpcconfig.go
+++ b/pkg/goformation/cloudformation/synthetics/aws-synthetics-canary_vpcconfig.go
@@ -1,9 +1,9 @@
 package synthetics
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Canary_VPCConfig AWS CloudFormation Resource (AWS::Synthetics::Canary.VPCConfig)
diff --git a/goformation/cloudformation/tags/tag.go b/pkg/goformation/cloudformation/tags/tag.go
similarity index 97%
rename from goformation/cloudformation/tags/tag.go
rename to pkg/goformation/cloudformation/tags/tag.go
index 9dd096ab36..283e64e1c8 100644
--- a/goformation/cloudformation/tags/tag.go
+++ b/pkg/goformation/cloudformation/tags/tag.go
@@ -1,6 +1,6 @@
 package tags
 
-import "github.com/awslabs/goformation/v4/cloudformation/policies"
+import "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 
 // Tag AWS CloudFormation Resource (Tag)
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html
diff --git a/goformation/cloudformation/template.go b/pkg/goformation/cloudformation/template.go
similarity index 98%
rename from goformation/cloudformation/template.go
rename to pkg/goformation/cloudformation/template.go
index 2fd97c274f..0c5f7630c1 100644
--- a/goformation/cloudformation/template.go
+++ b/pkg/goformation/cloudformation/template.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	"github.com/sanathkr/yaml"
 )
diff --git a/goformation/cloudformation/timestream/aws-timestream-database.go b/pkg/goformation/cloudformation/timestream/aws-timestream-database.go
similarity index 95%
rename from goformation/cloudformation/timestream/aws-timestream-database.go
rename to pkg/goformation/cloudformation/timestream/aws-timestream-database.go
index 52138c624a..16b28eaa86 100644
--- a/goformation/cloudformation/timestream/aws-timestream-database.go
+++ b/pkg/goformation/cloudformation/timestream/aws-timestream-database.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Database AWS CloudFormation Resource (AWS::Timestream::Database)
diff --git a/goformation/cloudformation/timestream/aws-timestream-scheduledquery.go b/pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery.go
similarity index 96%
rename from goformation/cloudformation/timestream/aws-timestream-scheduledquery.go
rename to pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery.go
index 1a6c3c23ca..dcbe990f01 100644
--- a/goformation/cloudformation/timestream/aws-timestream-scheduledquery.go
+++ b/pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScheduledQuery AWS CloudFormation Resource (AWS::Timestream::ScheduledQuery)
diff --git a/goformation/cloudformation/timestream/aws-timestream-scheduledquery_dimensionmapping.go b/pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_dimensionmapping.go
similarity index 93%
rename from goformation/cloudformation/timestream/aws-timestream-scheduledquery_dimensionmapping.go
rename to pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_dimensionmapping.go
index f93818cb88..2996a2ab9b 100644
--- a/goformation/cloudformation/timestream/aws-timestream-scheduledquery_dimensionmapping.go
+++ b/pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_dimensionmapping.go
@@ -1,9 +1,9 @@
 package timestream
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScheduledQuery_DimensionMapping AWS CloudFormation Resource (AWS::Timestream::ScheduledQuery.DimensionMapping)
diff --git a/goformation/cloudformation/timestream/aws-timestream-scheduledquery_errorreportconfiguration.go b/pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_errorreportconfiguration.go
similarity index 96%
rename from goformation/cloudformation/timestream/aws-timestream-scheduledquery_errorreportconfiguration.go
rename to pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_errorreportconfiguration.go
index f7a4edf103..6d26994a3e 100644
--- a/goformation/cloudformation/timestream/aws-timestream-scheduledquery_errorreportconfiguration.go
+++ b/pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_errorreportconfiguration.go
@@ -1,7 +1,7 @@
 package timestream
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScheduledQuery_ErrorReportConfiguration AWS CloudFormation Resource (AWS::Timestream::ScheduledQuery.ErrorReportConfiguration)
diff --git a/goformation/cloudformation/timestream/aws-timestream-scheduledquery_mixedmeasuremapping.go b/pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_mixedmeasuremapping.go
similarity index 95%
rename from goformation/cloudformation/timestream/aws-timestream-scheduledquery_mixedmeasuremapping.go
rename to pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_mixedmeasuremapping.go
index f81863c6fe..1c4b1b6116 100644
--- a/goformation/cloudformation/timestream/aws-timestream-scheduledquery_mixedmeasuremapping.go
+++ b/pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_mixedmeasuremapping.go
@@ -1,9 +1,9 @@
 package timestream
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScheduledQuery_MixedMeasureMapping AWS CloudFormation Resource (AWS::Timestream::ScheduledQuery.MixedMeasureMapping)
diff --git a/goformation/cloudformation/timestream/aws-timestream-scheduledquery_multimeasureattributemapping.go b/pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_multimeasureattributemapping.go
similarity index 94%
rename from goformation/cloudformation/timestream/aws-timestream-scheduledquery_multimeasureattributemapping.go
rename to pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_multimeasureattributemapping.go
index abbfff949d..ac6946936f 100644
--- a/goformation/cloudformation/timestream/aws-timestream-scheduledquery_multimeasureattributemapping.go
+++ b/pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_multimeasureattributemapping.go
@@ -1,9 +1,9 @@
 package timestream
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScheduledQuery_MultiMeasureAttributeMapping AWS CloudFormation Resource (AWS::Timestream::ScheduledQuery.MultiMeasureAttributeMapping)
diff --git a/goformation/cloudformation/timestream/aws-timestream-scheduledquery_multimeasuremappings.go b/pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_multimeasuremappings.go
similarity index 93%
rename from goformation/cloudformation/timestream/aws-timestream-scheduledquery_multimeasuremappings.go
rename to pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_multimeasuremappings.go
index f2cba7f0a2..bcc2e897ab 100644
--- a/goformation/cloudformation/timestream/aws-timestream-scheduledquery_multimeasuremappings.go
+++ b/pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_multimeasuremappings.go
@@ -1,9 +1,9 @@
 package timestream
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScheduledQuery_MultiMeasureMappings AWS CloudFormation Resource (AWS::Timestream::ScheduledQuery.MultiMeasureMappings)
diff --git a/goformation/cloudformation/timestream/aws-timestream-scheduledquery_notificationconfiguration.go b/pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_notificationconfiguration.go
similarity index 96%
rename from goformation/cloudformation/timestream/aws-timestream-scheduledquery_notificationconfiguration.go
rename to pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_notificationconfiguration.go
index 8b10827705..808c680ab9 100644
--- a/goformation/cloudformation/timestream/aws-timestream-scheduledquery_notificationconfiguration.go
+++ b/pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_notificationconfiguration.go
@@ -1,7 +1,7 @@
 package timestream
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScheduledQuery_NotificationConfiguration AWS CloudFormation Resource (AWS::Timestream::ScheduledQuery.NotificationConfiguration)
diff --git a/goformation/cloudformation/timestream/aws-timestream-scheduledquery_s3configuration.go b/pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_s3configuration.go
similarity index 94%
rename from goformation/cloudformation/timestream/aws-timestream-scheduledquery_s3configuration.go
rename to pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_s3configuration.go
index 59c46c2e77..4c394768bf 100644
--- a/goformation/cloudformation/timestream/aws-timestream-scheduledquery_s3configuration.go
+++ b/pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_s3configuration.go
@@ -1,9 +1,9 @@
 package timestream
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScheduledQuery_S3Configuration AWS CloudFormation Resource (AWS::Timestream::ScheduledQuery.S3Configuration)
diff --git a/goformation/cloudformation/timestream/aws-timestream-scheduledquery_scheduleconfiguration.go b/pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_scheduleconfiguration.go
similarity index 92%
rename from goformation/cloudformation/timestream/aws-timestream-scheduledquery_scheduleconfiguration.go
rename to pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_scheduleconfiguration.go
index 33f35ce5f0..7a360e000e 100644
--- a/goformation/cloudformation/timestream/aws-timestream-scheduledquery_scheduleconfiguration.go
+++ b/pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_scheduleconfiguration.go
@@ -1,9 +1,9 @@
 package timestream
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScheduledQuery_ScheduleConfiguration AWS CloudFormation Resource (AWS::Timestream::ScheduledQuery.ScheduleConfiguration)
diff --git a/goformation/cloudformation/timestream/aws-timestream-scheduledquery_snsconfiguration.go b/pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_snsconfiguration.go
similarity index 92%
rename from goformation/cloudformation/timestream/aws-timestream-scheduledquery_snsconfiguration.go
rename to pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_snsconfiguration.go
index 01102b252a..27f9ebfbe7 100644
--- a/goformation/cloudformation/timestream/aws-timestream-scheduledquery_snsconfiguration.go
+++ b/pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_snsconfiguration.go
@@ -1,9 +1,9 @@
 package timestream
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScheduledQuery_SnsConfiguration AWS CloudFormation Resource (AWS::Timestream::ScheduledQuery.SnsConfiguration)
diff --git a/goformation/cloudformation/timestream/aws-timestream-scheduledquery_targetconfiguration.go b/pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_targetconfiguration.go
similarity index 96%
rename from goformation/cloudformation/timestream/aws-timestream-scheduledquery_targetconfiguration.go
rename to pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_targetconfiguration.go
index d9adf130a3..03c1377a3a 100644
--- a/goformation/cloudformation/timestream/aws-timestream-scheduledquery_targetconfiguration.go
+++ b/pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_targetconfiguration.go
@@ -1,7 +1,7 @@
 package timestream
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScheduledQuery_TargetConfiguration AWS CloudFormation Resource (AWS::Timestream::ScheduledQuery.TargetConfiguration)
diff --git a/goformation/cloudformation/timestream/aws-timestream-scheduledquery_timestreamconfiguration.go b/pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_timestreamconfiguration.go
similarity index 96%
rename from goformation/cloudformation/timestream/aws-timestream-scheduledquery_timestreamconfiguration.go
rename to pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_timestreamconfiguration.go
index 350a536242..f871e55208 100644
--- a/goformation/cloudformation/timestream/aws-timestream-scheduledquery_timestreamconfiguration.go
+++ b/pkg/goformation/cloudformation/timestream/aws-timestream-scheduledquery_timestreamconfiguration.go
@@ -1,9 +1,9 @@
 package timestream
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ScheduledQuery_TimestreamConfiguration AWS CloudFormation Resource (AWS::Timestream::ScheduledQuery.TimestreamConfiguration)
diff --git a/goformation/cloudformation/timestream/aws-timestream-table.go b/pkg/goformation/cloudformation/timestream/aws-timestream-table.go
similarity index 95%
rename from goformation/cloudformation/timestream/aws-timestream-table.go
rename to pkg/goformation/cloudformation/timestream/aws-timestream-table.go
index 9f29650394..4ce1c52d64 100644
--- a/goformation/cloudformation/timestream/aws-timestream-table.go
+++ b/pkg/goformation/cloudformation/timestream/aws-timestream-table.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Table AWS CloudFormation Resource (AWS::Timestream::Table)
diff --git a/goformation/cloudformation/transfer/aws-transfer-server.go b/pkg/goformation/cloudformation/transfer/aws-transfer-server.go
similarity index 96%
rename from goformation/cloudformation/transfer/aws-transfer-server.go
rename to pkg/goformation/cloudformation/transfer/aws-transfer-server.go
index 46d0299946..502c4d9dbc 100644
--- a/goformation/cloudformation/transfer/aws-transfer-server.go
+++ b/pkg/goformation/cloudformation/transfer/aws-transfer-server.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Server AWS CloudFormation Resource (AWS::Transfer::Server)
diff --git a/goformation/cloudformation/transfer/aws-transfer-server_endpointdetails.go b/pkg/goformation/cloudformation/transfer/aws-transfer-server_endpointdetails.go
similarity index 95%
rename from goformation/cloudformation/transfer/aws-transfer-server_endpointdetails.go
rename to pkg/goformation/cloudformation/transfer/aws-transfer-server_endpointdetails.go
index 76e4348a66..7cf252584f 100644
--- a/goformation/cloudformation/transfer/aws-transfer-server_endpointdetails.go
+++ b/pkg/goformation/cloudformation/transfer/aws-transfer-server_endpointdetails.go
@@ -1,9 +1,9 @@
 package transfer
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Server_EndpointDetails AWS CloudFormation Resource (AWS::Transfer::Server.EndpointDetails)
diff --git a/goformation/cloudformation/transfer/aws-transfer-server_identityproviderdetails.go b/pkg/goformation/cloudformation/transfer/aws-transfer-server_identityproviderdetails.go
similarity index 94%
rename from goformation/cloudformation/transfer/aws-transfer-server_identityproviderdetails.go
rename to pkg/goformation/cloudformation/transfer/aws-transfer-server_identityproviderdetails.go
index 44ce1b9cb7..a3d1d66139 100644
--- a/goformation/cloudformation/transfer/aws-transfer-server_identityproviderdetails.go
+++ b/pkg/goformation/cloudformation/transfer/aws-transfer-server_identityproviderdetails.go
@@ -1,9 +1,9 @@
 package transfer
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Server_IdentityProviderDetails AWS CloudFormation Resource (AWS::Transfer::Server.IdentityProviderDetails)
diff --git a/goformation/cloudformation/transfer/aws-transfer-server_protocol.go b/pkg/goformation/cloudformation/transfer/aws-transfer-server_protocol.go
similarity index 93%
rename from goformation/cloudformation/transfer/aws-transfer-server_protocol.go
rename to pkg/goformation/cloudformation/transfer/aws-transfer-server_protocol.go
index 1aa3a9973b..b3fcb2fbdd 100644
--- a/goformation/cloudformation/transfer/aws-transfer-server_protocol.go
+++ b/pkg/goformation/cloudformation/transfer/aws-transfer-server_protocol.go
@@ -1,7 +1,7 @@
 package transfer
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Server_Protocol AWS CloudFormation Resource (AWS::Transfer::Server.Protocol)
diff --git a/goformation/cloudformation/transfer/aws-transfer-server_protocoldetails.go b/pkg/goformation/cloudformation/transfer/aws-transfer-server_protocoldetails.go
similarity index 91%
rename from goformation/cloudformation/transfer/aws-transfer-server_protocoldetails.go
rename to pkg/goformation/cloudformation/transfer/aws-transfer-server_protocoldetails.go
index 7d090f230a..bbd4b42a45 100644
--- a/goformation/cloudformation/transfer/aws-transfer-server_protocoldetails.go
+++ b/pkg/goformation/cloudformation/transfer/aws-transfer-server_protocoldetails.go
@@ -1,9 +1,9 @@
 package transfer
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Server_ProtocolDetails AWS CloudFormation Resource (AWS::Transfer::Server.ProtocolDetails)
diff --git a/goformation/cloudformation/transfer/aws-transfer-server_securitygroupid.go b/pkg/goformation/cloudformation/transfer/aws-transfer-server_securitygroupid.go
similarity index 94%
rename from goformation/cloudformation/transfer/aws-transfer-server_securitygroupid.go
rename to pkg/goformation/cloudformation/transfer/aws-transfer-server_securitygroupid.go
index 7c8eb91e90..770016a47a 100644
--- a/goformation/cloudformation/transfer/aws-transfer-server_securitygroupid.go
+++ b/pkg/goformation/cloudformation/transfer/aws-transfer-server_securitygroupid.go
@@ -1,7 +1,7 @@
 package transfer
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Server_SecurityGroupId AWS CloudFormation Resource (AWS::Transfer::Server.SecurityGroupId)
diff --git a/goformation/cloudformation/transfer/aws-transfer-server_workflowdetail.go b/pkg/goformation/cloudformation/transfer/aws-transfer-server_workflowdetail.go
similarity index 92%
rename from goformation/cloudformation/transfer/aws-transfer-server_workflowdetail.go
rename to pkg/goformation/cloudformation/transfer/aws-transfer-server_workflowdetail.go
index 13af9c2581..3525df661f 100644
--- a/goformation/cloudformation/transfer/aws-transfer-server_workflowdetail.go
+++ b/pkg/goformation/cloudformation/transfer/aws-transfer-server_workflowdetail.go
@@ -1,9 +1,9 @@
 package transfer
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Server_WorkflowDetail AWS CloudFormation Resource (AWS::Transfer::Server.WorkflowDetail)
diff --git a/goformation/cloudformation/transfer/aws-transfer-server_workflowdetails.go b/pkg/goformation/cloudformation/transfer/aws-transfer-server_workflowdetails.go
similarity index 95%
rename from goformation/cloudformation/transfer/aws-transfer-server_workflowdetails.go
rename to pkg/goformation/cloudformation/transfer/aws-transfer-server_workflowdetails.go
index 1312ec76ab..a2b33d0fc5 100644
--- a/goformation/cloudformation/transfer/aws-transfer-server_workflowdetails.go
+++ b/pkg/goformation/cloudformation/transfer/aws-transfer-server_workflowdetails.go
@@ -1,7 +1,7 @@
 package transfer
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Server_WorkflowDetails AWS CloudFormation Resource (AWS::Transfer::Server.WorkflowDetails)
diff --git a/goformation/cloudformation/transfer/aws-transfer-user.go b/pkg/goformation/cloudformation/transfer/aws-transfer-user.go
similarity index 96%
rename from goformation/cloudformation/transfer/aws-transfer-user.go
rename to pkg/goformation/cloudformation/transfer/aws-transfer-user.go
index 12f47dd515..4c6314525e 100644
--- a/goformation/cloudformation/transfer/aws-transfer-user.go
+++ b/pkg/goformation/cloudformation/transfer/aws-transfer-user.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // User AWS CloudFormation Resource (AWS::Transfer::User)
diff --git a/goformation/cloudformation/transfer/aws-transfer-user_homedirectorymapentry.go b/pkg/goformation/cloudformation/transfer/aws-transfer-user_homedirectorymapentry.go
similarity index 92%
rename from goformation/cloudformation/transfer/aws-transfer-user_homedirectorymapentry.go
rename to pkg/goformation/cloudformation/transfer/aws-transfer-user_homedirectorymapentry.go
index 3b8e2df8eb..a1c18c7d8f 100644
--- a/goformation/cloudformation/transfer/aws-transfer-user_homedirectorymapentry.go
+++ b/pkg/goformation/cloudformation/transfer/aws-transfer-user_homedirectorymapentry.go
@@ -1,9 +1,9 @@
 package transfer
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // User_HomeDirectoryMapEntry AWS CloudFormation Resource (AWS::Transfer::User.HomeDirectoryMapEntry)
diff --git a/goformation/cloudformation/transfer/aws-transfer-user_posixprofile.go b/pkg/goformation/cloudformation/transfer/aws-transfer-user_posixprofile.go
similarity index 93%
rename from goformation/cloudformation/transfer/aws-transfer-user_posixprofile.go
rename to pkg/goformation/cloudformation/transfer/aws-transfer-user_posixprofile.go
index d6429605d0..79c8af2f36 100644
--- a/goformation/cloudformation/transfer/aws-transfer-user_posixprofile.go
+++ b/pkg/goformation/cloudformation/transfer/aws-transfer-user_posixprofile.go
@@ -1,9 +1,9 @@
 package transfer
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // User_PosixProfile AWS CloudFormation Resource (AWS::Transfer::User.PosixProfile)
diff --git a/goformation/cloudformation/transfer/aws-transfer-user_sshpublickey.go b/pkg/goformation/cloudformation/transfer/aws-transfer-user_sshpublickey.go
similarity index 93%
rename from goformation/cloudformation/transfer/aws-transfer-user_sshpublickey.go
rename to pkg/goformation/cloudformation/transfer/aws-transfer-user_sshpublickey.go
index 42947e651d..5f856109f8 100644
--- a/goformation/cloudformation/transfer/aws-transfer-user_sshpublickey.go
+++ b/pkg/goformation/cloudformation/transfer/aws-transfer-user_sshpublickey.go
@@ -1,7 +1,7 @@
 package transfer
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // User_SshPublicKey AWS CloudFormation Resource (AWS::Transfer::User.SshPublicKey)
diff --git a/goformation/cloudformation/transfer/aws-transfer-workflow.go b/pkg/goformation/cloudformation/transfer/aws-transfer-workflow.go
similarity index 95%
rename from goformation/cloudformation/transfer/aws-transfer-workflow.go
rename to pkg/goformation/cloudformation/transfer/aws-transfer-workflow.go
index 98d9c21a2c..94ef37f379 100644
--- a/goformation/cloudformation/transfer/aws-transfer-workflow.go
+++ b/pkg/goformation/cloudformation/transfer/aws-transfer-workflow.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Workflow AWS CloudFormation Resource (AWS::Transfer::Workflow)
diff --git a/goformation/cloudformation/transfer/aws-transfer-workflow_workflowstep.go b/pkg/goformation/cloudformation/transfer/aws-transfer-workflow_workflowstep.go
similarity index 95%
rename from goformation/cloudformation/transfer/aws-transfer-workflow_workflowstep.go
rename to pkg/goformation/cloudformation/transfer/aws-transfer-workflow_workflowstep.go
index 01a118f7ef..0e74fc0449 100644
--- a/goformation/cloudformation/transfer/aws-transfer-workflow_workflowstep.go
+++ b/pkg/goformation/cloudformation/transfer/aws-transfer-workflow_workflowstep.go
@@ -1,9 +1,9 @@
 package transfer
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Workflow_WorkflowStep AWS CloudFormation Resource (AWS::Transfer::Workflow.WorkflowStep)
diff --git a/goformation/cloudformation/types/intrinsics.go b/pkg/goformation/cloudformation/types/intrinsics.go
similarity index 100%
rename from goformation/cloudformation/types/intrinsics.go
rename to pkg/goformation/cloudformation/types/intrinsics.go
diff --git a/goformation/cloudformation/types/types.go b/pkg/goformation/cloudformation/types/types.go
similarity index 100%
rename from goformation/cloudformation/types/types.go
rename to pkg/goformation/cloudformation/types/types.go
diff --git a/goformation/cloudformation/utils/utils.go b/pkg/goformation/cloudformation/utils/utils.go
similarity index 100%
rename from goformation/cloudformation/utils/utils.go
rename to pkg/goformation/cloudformation/utils/utils.go
diff --git a/goformation/cloudformation/waf/aws-waf-bytematchset.go b/pkg/goformation/cloudformation/waf/aws-waf-bytematchset.go
similarity index 96%
rename from goformation/cloudformation/waf/aws-waf-bytematchset.go
rename to pkg/goformation/cloudformation/waf/aws-waf-bytematchset.go
index 6f5e54650c..eb64c8b193 100644
--- a/goformation/cloudformation/waf/aws-waf-bytematchset.go
+++ b/pkg/goformation/cloudformation/waf/aws-waf-bytematchset.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ByteMatchSet AWS CloudFormation Resource (AWS::WAF::ByteMatchSet)
diff --git a/goformation/cloudformation/waf/aws-waf-bytematchset_bytematchtuple.go b/pkg/goformation/cloudformation/waf/aws-waf-bytematchset_bytematchtuple.go
similarity index 95%
rename from goformation/cloudformation/waf/aws-waf-bytematchset_bytematchtuple.go
rename to pkg/goformation/cloudformation/waf/aws-waf-bytematchset_bytematchtuple.go
index d976d6e692..affc930bea 100644
--- a/goformation/cloudformation/waf/aws-waf-bytematchset_bytematchtuple.go
+++ b/pkg/goformation/cloudformation/waf/aws-waf-bytematchset_bytematchtuple.go
@@ -1,9 +1,9 @@
 package waf
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ByteMatchSet_ByteMatchTuple AWS CloudFormation Resource (AWS::WAF::ByteMatchSet.ByteMatchTuple)
diff --git a/goformation/cloudformation/waf/aws-waf-bytematchset_fieldtomatch.go b/pkg/goformation/cloudformation/waf/aws-waf-bytematchset_fieldtomatch.go
similarity index 92%
rename from goformation/cloudformation/waf/aws-waf-bytematchset_fieldtomatch.go
rename to pkg/goformation/cloudformation/waf/aws-waf-bytematchset_fieldtomatch.go
index cd0b0a3969..7ab47edf5b 100644
--- a/goformation/cloudformation/waf/aws-waf-bytematchset_fieldtomatch.go
+++ b/pkg/goformation/cloudformation/waf/aws-waf-bytematchset_fieldtomatch.go
@@ -1,9 +1,9 @@
 package waf
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ByteMatchSet_FieldToMatch AWS CloudFormation Resource (AWS::WAF::ByteMatchSet.FieldToMatch)
diff --git a/goformation/cloudformation/waf/aws-waf-ipset.go b/pkg/goformation/cloudformation/waf/aws-waf-ipset.go
similarity index 96%
rename from goformation/cloudformation/waf/aws-waf-ipset.go
rename to pkg/goformation/cloudformation/waf/aws-waf-ipset.go
index 61c81ade1d..492fced7fa 100644
--- a/goformation/cloudformation/waf/aws-waf-ipset.go
+++ b/pkg/goformation/cloudformation/waf/aws-waf-ipset.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // IPSet AWS CloudFormation Resource (AWS::WAF::IPSet)
diff --git a/goformation/cloudformation/waf/aws-waf-ipset_ipsetdescriptor.go b/pkg/goformation/cloudformation/waf/aws-waf-ipset_ipsetdescriptor.go
similarity index 92%
rename from goformation/cloudformation/waf/aws-waf-ipset_ipsetdescriptor.go
rename to pkg/goformation/cloudformation/waf/aws-waf-ipset_ipsetdescriptor.go
index bee4b50ea3..7d78ea28f3 100644
--- a/goformation/cloudformation/waf/aws-waf-ipset_ipsetdescriptor.go
+++ b/pkg/goformation/cloudformation/waf/aws-waf-ipset_ipsetdescriptor.go
@@ -1,9 +1,9 @@
 package waf
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // IPSet_IPSetDescriptor AWS CloudFormation Resource (AWS::WAF::IPSet.IPSetDescriptor)
diff --git a/goformation/cloudformation/waf/aws-waf-rule.go b/pkg/goformation/cloudformation/waf/aws-waf-rule.go
similarity index 96%
rename from goformation/cloudformation/waf/aws-waf-rule.go
rename to pkg/goformation/cloudformation/waf/aws-waf-rule.go
index 41868456d0..bade9431d6 100644
--- a/goformation/cloudformation/waf/aws-waf-rule.go
+++ b/pkg/goformation/cloudformation/waf/aws-waf-rule.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Rule AWS CloudFormation Resource (AWS::WAF::Rule)
diff --git a/goformation/cloudformation/waf/aws-waf-rule_predicate.go b/pkg/goformation/cloudformation/waf/aws-waf-rule_predicate.go
similarity index 93%
rename from goformation/cloudformation/waf/aws-waf-rule_predicate.go
rename to pkg/goformation/cloudformation/waf/aws-waf-rule_predicate.go
index 422ab63611..7085e6ba04 100644
--- a/goformation/cloudformation/waf/aws-waf-rule_predicate.go
+++ b/pkg/goformation/cloudformation/waf/aws-waf-rule_predicate.go
@@ -1,9 +1,9 @@
 package waf
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Rule_Predicate AWS CloudFormation Resource (AWS::WAF::Rule.Predicate)
diff --git a/goformation/cloudformation/waf/aws-waf-sizeconstraintset.go b/pkg/goformation/cloudformation/waf/aws-waf-sizeconstraintset.go
similarity index 96%
rename from goformation/cloudformation/waf/aws-waf-sizeconstraintset.go
rename to pkg/goformation/cloudformation/waf/aws-waf-sizeconstraintset.go
index 6f3bc61276..a24f8f0de9 100644
--- a/goformation/cloudformation/waf/aws-waf-sizeconstraintset.go
+++ b/pkg/goformation/cloudformation/waf/aws-waf-sizeconstraintset.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SizeConstraintSet AWS CloudFormation Resource (AWS::WAF::SizeConstraintSet)
diff --git a/goformation/cloudformation/waf/aws-waf-sizeconstraintset_fieldtomatch.go b/pkg/goformation/cloudformation/waf/aws-waf-sizeconstraintset_fieldtomatch.go
similarity index 93%
rename from goformation/cloudformation/waf/aws-waf-sizeconstraintset_fieldtomatch.go
rename to pkg/goformation/cloudformation/waf/aws-waf-sizeconstraintset_fieldtomatch.go
index 494307d4cb..6b130d24e1 100644
--- a/goformation/cloudformation/waf/aws-waf-sizeconstraintset_fieldtomatch.go
+++ b/pkg/goformation/cloudformation/waf/aws-waf-sizeconstraintset_fieldtomatch.go
@@ -1,9 +1,9 @@
 package waf
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SizeConstraintSet_FieldToMatch AWS CloudFormation Resource (AWS::WAF::SizeConstraintSet.FieldToMatch)
diff --git a/goformation/cloudformation/waf/aws-waf-sizeconstraintset_sizeconstraint.go b/pkg/goformation/cloudformation/waf/aws-waf-sizeconstraintset_sizeconstraint.go
similarity index 94%
rename from goformation/cloudformation/waf/aws-waf-sizeconstraintset_sizeconstraint.go
rename to pkg/goformation/cloudformation/waf/aws-waf-sizeconstraintset_sizeconstraint.go
index f52ade69f4..32cb7c6d2c 100644
--- a/goformation/cloudformation/waf/aws-waf-sizeconstraintset_sizeconstraint.go
+++ b/pkg/goformation/cloudformation/waf/aws-waf-sizeconstraintset_sizeconstraint.go
@@ -1,9 +1,9 @@
 package waf
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SizeConstraintSet_SizeConstraint AWS CloudFormation Resource (AWS::WAF::SizeConstraintSet.SizeConstraint)
diff --git a/goformation/cloudformation/waf/aws-waf-sqlinjectionmatchset.go b/pkg/goformation/cloudformation/waf/aws-waf-sqlinjectionmatchset.go
similarity index 96%
rename from goformation/cloudformation/waf/aws-waf-sqlinjectionmatchset.go
rename to pkg/goformation/cloudformation/waf/aws-waf-sqlinjectionmatchset.go
index a8dfcf1c1f..54819415bf 100644
--- a/goformation/cloudformation/waf/aws-waf-sqlinjectionmatchset.go
+++ b/pkg/goformation/cloudformation/waf/aws-waf-sqlinjectionmatchset.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SqlInjectionMatchSet AWS CloudFormation Resource (AWS::WAF::SqlInjectionMatchSet)
diff --git a/goformation/cloudformation/waf/aws-waf-sqlinjectionmatchset_fieldtomatch.go b/pkg/goformation/cloudformation/waf/aws-waf-sqlinjectionmatchset_fieldtomatch.go
similarity index 93%
rename from goformation/cloudformation/waf/aws-waf-sqlinjectionmatchset_fieldtomatch.go
rename to pkg/goformation/cloudformation/waf/aws-waf-sqlinjectionmatchset_fieldtomatch.go
index afee979d31..60a092bde3 100644
--- a/goformation/cloudformation/waf/aws-waf-sqlinjectionmatchset_fieldtomatch.go
+++ b/pkg/goformation/cloudformation/waf/aws-waf-sqlinjectionmatchset_fieldtomatch.go
@@ -1,9 +1,9 @@
 package waf
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SqlInjectionMatchSet_FieldToMatch AWS CloudFormation Resource (AWS::WAF::SqlInjectionMatchSet.FieldToMatch)
diff --git a/goformation/cloudformation/waf/aws-waf-sqlinjectionmatchset_sqlinjectionmatchtuple.go b/pkg/goformation/cloudformation/waf/aws-waf-sqlinjectionmatchset_sqlinjectionmatchtuple.go
similarity index 93%
rename from goformation/cloudformation/waf/aws-waf-sqlinjectionmatchset_sqlinjectionmatchtuple.go
rename to pkg/goformation/cloudformation/waf/aws-waf-sqlinjectionmatchset_sqlinjectionmatchtuple.go
index ddec12e114..dc132d8e37 100644
--- a/goformation/cloudformation/waf/aws-waf-sqlinjectionmatchset_sqlinjectionmatchtuple.go
+++ b/pkg/goformation/cloudformation/waf/aws-waf-sqlinjectionmatchset_sqlinjectionmatchtuple.go
@@ -1,9 +1,9 @@
 package waf
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SqlInjectionMatchSet_SqlInjectionMatchTuple AWS CloudFormation Resource (AWS::WAF::SqlInjectionMatchSet.SqlInjectionMatchTuple)
diff --git a/goformation/cloudformation/waf/aws-waf-webacl.go b/pkg/goformation/cloudformation/waf/aws-waf-webacl.go
similarity index 96%
rename from goformation/cloudformation/waf/aws-waf-webacl.go
rename to pkg/goformation/cloudformation/waf/aws-waf-webacl.go
index 0a1dd06a5a..2edf1ea52b 100644
--- a/goformation/cloudformation/waf/aws-waf-webacl.go
+++ b/pkg/goformation/cloudformation/waf/aws-waf-webacl.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL AWS CloudFormation Resource (AWS::WAF::WebACL)
diff --git a/goformation/cloudformation/waf/aws-waf-webacl_activatedrule.go b/pkg/goformation/cloudformation/waf/aws-waf-webacl_activatedrule.go
similarity index 93%
rename from goformation/cloudformation/waf/aws-waf-webacl_activatedrule.go
rename to pkg/goformation/cloudformation/waf/aws-waf-webacl_activatedrule.go
index 5ff4673f1f..82149b64cd 100644
--- a/goformation/cloudformation/waf/aws-waf-webacl_activatedrule.go
+++ b/pkg/goformation/cloudformation/waf/aws-waf-webacl_activatedrule.go
@@ -1,9 +1,9 @@
 package waf
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_ActivatedRule AWS CloudFormation Resource (AWS::WAF::WebACL.ActivatedRule)
diff --git a/goformation/cloudformation/waf/aws-waf-webacl_wafaction.go b/pkg/goformation/cloudformation/waf/aws-waf-webacl_wafaction.go
similarity index 91%
rename from goformation/cloudformation/waf/aws-waf-webacl_wafaction.go
rename to pkg/goformation/cloudformation/waf/aws-waf-webacl_wafaction.go
index de9b02630f..a983989127 100644
--- a/goformation/cloudformation/waf/aws-waf-webacl_wafaction.go
+++ b/pkg/goformation/cloudformation/waf/aws-waf-webacl_wafaction.go
@@ -1,9 +1,9 @@
 package waf
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_WafAction AWS CloudFormation Resource (AWS::WAF::WebACL.WafAction)
diff --git a/goformation/cloudformation/waf/aws-waf-xssmatchset.go b/pkg/goformation/cloudformation/waf/aws-waf-xssmatchset.go
similarity index 96%
rename from goformation/cloudformation/waf/aws-waf-xssmatchset.go
rename to pkg/goformation/cloudformation/waf/aws-waf-xssmatchset.go
index 0ed07904cb..feae70a3bc 100644
--- a/goformation/cloudformation/waf/aws-waf-xssmatchset.go
+++ b/pkg/goformation/cloudformation/waf/aws-waf-xssmatchset.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // XssMatchSet AWS CloudFormation Resource (AWS::WAF::XssMatchSet)
diff --git a/goformation/cloudformation/waf/aws-waf-xssmatchset_fieldtomatch.go b/pkg/goformation/cloudformation/waf/aws-waf-xssmatchset_fieldtomatch.go
similarity index 92%
rename from goformation/cloudformation/waf/aws-waf-xssmatchset_fieldtomatch.go
rename to pkg/goformation/cloudformation/waf/aws-waf-xssmatchset_fieldtomatch.go
index b587a316f1..cbc409a262 100644
--- a/goformation/cloudformation/waf/aws-waf-xssmatchset_fieldtomatch.go
+++ b/pkg/goformation/cloudformation/waf/aws-waf-xssmatchset_fieldtomatch.go
@@ -1,9 +1,9 @@
 package waf
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // XssMatchSet_FieldToMatch AWS CloudFormation Resource (AWS::WAF::XssMatchSet.FieldToMatch)
diff --git a/goformation/cloudformation/waf/aws-waf-xssmatchset_xssmatchtuple.go b/pkg/goformation/cloudformation/waf/aws-waf-xssmatchset_xssmatchtuple.go
similarity index 93%
rename from goformation/cloudformation/waf/aws-waf-xssmatchset_xssmatchtuple.go
rename to pkg/goformation/cloudformation/waf/aws-waf-xssmatchset_xssmatchtuple.go
index 8c50eb171b..9a7bb5a004 100644
--- a/goformation/cloudformation/waf/aws-waf-xssmatchset_xssmatchtuple.go
+++ b/pkg/goformation/cloudformation/waf/aws-waf-xssmatchset_xssmatchtuple.go
@@ -1,9 +1,9 @@
 package waf
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // XssMatchSet_XssMatchTuple AWS CloudFormation Resource (AWS::WAF::XssMatchSet.XssMatchTuple)
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-bytematchset.go b/pkg/goformation/cloudformation/wafregional/aws-wafregional-bytematchset.go
similarity index 96%
rename from goformation/cloudformation/wafregional/aws-wafregional-bytematchset.go
rename to pkg/goformation/cloudformation/wafregional/aws-wafregional-bytematchset.go
index edf2be861c..375c7b592e 100644
--- a/goformation/cloudformation/wafregional/aws-wafregional-bytematchset.go
+++ b/pkg/goformation/cloudformation/wafregional/aws-wafregional-bytematchset.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ByteMatchSet AWS CloudFormation Resource (AWS::WAFRegional::ByteMatchSet)
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-bytematchset_bytematchtuple.go b/pkg/goformation/cloudformation/wafregional/aws-wafregional-bytematchset_bytematchtuple.go
similarity index 95%
rename from goformation/cloudformation/wafregional/aws-wafregional-bytematchset_bytematchtuple.go
rename to pkg/goformation/cloudformation/wafregional/aws-wafregional-bytematchset_bytematchtuple.go
index 131a96a957..e80d172eb1 100644
--- a/goformation/cloudformation/wafregional/aws-wafregional-bytematchset_bytematchtuple.go
+++ b/pkg/goformation/cloudformation/wafregional/aws-wafregional-bytematchset_bytematchtuple.go
@@ -1,9 +1,9 @@
 package wafregional
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ByteMatchSet_ByteMatchTuple AWS CloudFormation Resource (AWS::WAFRegional::ByteMatchSet.ByteMatchTuple)
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-bytematchset_fieldtomatch.go b/pkg/goformation/cloudformation/wafregional/aws-wafregional-bytematchset_fieldtomatch.go
similarity index 92%
rename from goformation/cloudformation/wafregional/aws-wafregional-bytematchset_fieldtomatch.go
rename to pkg/goformation/cloudformation/wafregional/aws-wafregional-bytematchset_fieldtomatch.go
index d38093567e..b2f987745a 100644
--- a/goformation/cloudformation/wafregional/aws-wafregional-bytematchset_fieldtomatch.go
+++ b/pkg/goformation/cloudformation/wafregional/aws-wafregional-bytematchset_fieldtomatch.go
@@ -1,9 +1,9 @@
 package wafregional
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ByteMatchSet_FieldToMatch AWS CloudFormation Resource (AWS::WAFRegional::ByteMatchSet.FieldToMatch)
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-geomatchset.go b/pkg/goformation/cloudformation/wafregional/aws-wafregional-geomatchset.go
similarity index 96%
rename from goformation/cloudformation/wafregional/aws-wafregional-geomatchset.go
rename to pkg/goformation/cloudformation/wafregional/aws-wafregional-geomatchset.go
index 88dff73ea9..d14b5d6056 100644
--- a/goformation/cloudformation/wafregional/aws-wafregional-geomatchset.go
+++ b/pkg/goformation/cloudformation/wafregional/aws-wafregional-geomatchset.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GeoMatchSet AWS CloudFormation Resource (AWS::WAFRegional::GeoMatchSet)
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-geomatchset_geomatchconstraint.go b/pkg/goformation/cloudformation/wafregional/aws-wafregional-geomatchset_geomatchconstraint.go
similarity index 93%
rename from goformation/cloudformation/wafregional/aws-wafregional-geomatchset_geomatchconstraint.go
rename to pkg/goformation/cloudformation/wafregional/aws-wafregional-geomatchset_geomatchconstraint.go
index 7b346a4e27..0e07f99eb3 100644
--- a/goformation/cloudformation/wafregional/aws-wafregional-geomatchset_geomatchconstraint.go
+++ b/pkg/goformation/cloudformation/wafregional/aws-wafregional-geomatchset_geomatchconstraint.go
@@ -1,9 +1,9 @@
 package wafregional
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // GeoMatchSet_GeoMatchConstraint AWS CloudFormation Resource (AWS::WAFRegional::GeoMatchSet.GeoMatchConstraint)
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-ipset.go b/pkg/goformation/cloudformation/wafregional/aws-wafregional-ipset.go
similarity index 96%
rename from goformation/cloudformation/wafregional/aws-wafregional-ipset.go
rename to pkg/goformation/cloudformation/wafregional/aws-wafregional-ipset.go
index e719bd1841..d0bc884c04 100644
--- a/goformation/cloudformation/wafregional/aws-wafregional-ipset.go
+++ b/pkg/goformation/cloudformation/wafregional/aws-wafregional-ipset.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // IPSet AWS CloudFormation Resource (AWS::WAFRegional::IPSet)
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-ipset_ipsetdescriptor.go b/pkg/goformation/cloudformation/wafregional/aws-wafregional-ipset_ipsetdescriptor.go
similarity index 92%
rename from goformation/cloudformation/wafregional/aws-wafregional-ipset_ipsetdescriptor.go
rename to pkg/goformation/cloudformation/wafregional/aws-wafregional-ipset_ipsetdescriptor.go
index e13934a5b4..91e8de3e26 100644
--- a/goformation/cloudformation/wafregional/aws-wafregional-ipset_ipsetdescriptor.go
+++ b/pkg/goformation/cloudformation/wafregional/aws-wafregional-ipset_ipsetdescriptor.go
@@ -1,9 +1,9 @@
 package wafregional
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // IPSet_IPSetDescriptor AWS CloudFormation Resource (AWS::WAFRegional::IPSet.IPSetDescriptor)
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-ratebasedrule.go b/pkg/goformation/cloudformation/wafregional/aws-wafregional-ratebasedrule.go
similarity index 97%
rename from goformation/cloudformation/wafregional/aws-wafregional-ratebasedrule.go
rename to pkg/goformation/cloudformation/wafregional/aws-wafregional-ratebasedrule.go
index aa30fef1c8..eb2028cfbb 100644
--- a/goformation/cloudformation/wafregional/aws-wafregional-ratebasedrule.go
+++ b/pkg/goformation/cloudformation/wafregional/aws-wafregional-ratebasedrule.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RateBasedRule AWS CloudFormation Resource (AWS::WAFRegional::RateBasedRule)
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-ratebasedrule_predicate.go b/pkg/goformation/cloudformation/wafregional/aws-wafregional-ratebasedrule_predicate.go
similarity index 93%
rename from goformation/cloudformation/wafregional/aws-wafregional-ratebasedrule_predicate.go
rename to pkg/goformation/cloudformation/wafregional/aws-wafregional-ratebasedrule_predicate.go
index 79b678113b..86cd83e0bd 100644
--- a/goformation/cloudformation/wafregional/aws-wafregional-ratebasedrule_predicate.go
+++ b/pkg/goformation/cloudformation/wafregional/aws-wafregional-ratebasedrule_predicate.go
@@ -1,9 +1,9 @@
 package wafregional
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RateBasedRule_Predicate AWS CloudFormation Resource (AWS::WAFRegional::RateBasedRule.Predicate)
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-regexpatternset.go b/pkg/goformation/cloudformation/wafregional/aws-wafregional-regexpatternset.go
similarity index 96%
rename from goformation/cloudformation/wafregional/aws-wafregional-regexpatternset.go
rename to pkg/goformation/cloudformation/wafregional/aws-wafregional-regexpatternset.go
index 29e937b278..8927959bce 100644
--- a/goformation/cloudformation/wafregional/aws-wafregional-regexpatternset.go
+++ b/pkg/goformation/cloudformation/wafregional/aws-wafregional-regexpatternset.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RegexPatternSet AWS CloudFormation Resource (AWS::WAFRegional::RegexPatternSet)
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-rule.go b/pkg/goformation/cloudformation/wafregional/aws-wafregional-rule.go
similarity index 96%
rename from goformation/cloudformation/wafregional/aws-wafregional-rule.go
rename to pkg/goformation/cloudformation/wafregional/aws-wafregional-rule.go
index 523847d87f..a11837b132 100644
--- a/goformation/cloudformation/wafregional/aws-wafregional-rule.go
+++ b/pkg/goformation/cloudformation/wafregional/aws-wafregional-rule.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Rule AWS CloudFormation Resource (AWS::WAFRegional::Rule)
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-rule_predicate.go b/pkg/goformation/cloudformation/wafregional/aws-wafregional-rule_predicate.go
similarity index 93%
rename from goformation/cloudformation/wafregional/aws-wafregional-rule_predicate.go
rename to pkg/goformation/cloudformation/wafregional/aws-wafregional-rule_predicate.go
index 39669d8b51..922494980f 100644
--- a/goformation/cloudformation/wafregional/aws-wafregional-rule_predicate.go
+++ b/pkg/goformation/cloudformation/wafregional/aws-wafregional-rule_predicate.go
@@ -1,9 +1,9 @@
 package wafregional
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Rule_Predicate AWS CloudFormation Resource (AWS::WAFRegional::Rule.Predicate)
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-sizeconstraintset.go b/pkg/goformation/cloudformation/wafregional/aws-wafregional-sizeconstraintset.go
similarity index 96%
rename from goformation/cloudformation/wafregional/aws-wafregional-sizeconstraintset.go
rename to pkg/goformation/cloudformation/wafregional/aws-wafregional-sizeconstraintset.go
index da6de74a3b..7eaaf8e501 100644
--- a/goformation/cloudformation/wafregional/aws-wafregional-sizeconstraintset.go
+++ b/pkg/goformation/cloudformation/wafregional/aws-wafregional-sizeconstraintset.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SizeConstraintSet AWS CloudFormation Resource (AWS::WAFRegional::SizeConstraintSet)
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-sizeconstraintset_fieldtomatch.go b/pkg/goformation/cloudformation/wafregional/aws-wafregional-sizeconstraintset_fieldtomatch.go
similarity index 93%
rename from goformation/cloudformation/wafregional/aws-wafregional-sizeconstraintset_fieldtomatch.go
rename to pkg/goformation/cloudformation/wafregional/aws-wafregional-sizeconstraintset_fieldtomatch.go
index f472cf691c..3232bc0906 100644
--- a/goformation/cloudformation/wafregional/aws-wafregional-sizeconstraintset_fieldtomatch.go
+++ b/pkg/goformation/cloudformation/wafregional/aws-wafregional-sizeconstraintset_fieldtomatch.go
@@ -1,9 +1,9 @@
 package wafregional
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SizeConstraintSet_FieldToMatch AWS CloudFormation Resource (AWS::WAFRegional::SizeConstraintSet.FieldToMatch)
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-sizeconstraintset_sizeconstraint.go b/pkg/goformation/cloudformation/wafregional/aws-wafregional-sizeconstraintset_sizeconstraint.go
similarity index 94%
rename from goformation/cloudformation/wafregional/aws-wafregional-sizeconstraintset_sizeconstraint.go
rename to pkg/goformation/cloudformation/wafregional/aws-wafregional-sizeconstraintset_sizeconstraint.go
index 682847b962..576273533e 100644
--- a/goformation/cloudformation/wafregional/aws-wafregional-sizeconstraintset_sizeconstraint.go
+++ b/pkg/goformation/cloudformation/wafregional/aws-wafregional-sizeconstraintset_sizeconstraint.go
@@ -1,9 +1,9 @@
 package wafregional
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SizeConstraintSet_SizeConstraint AWS CloudFormation Resource (AWS::WAFRegional::SizeConstraintSet.SizeConstraint)
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset.go b/pkg/goformation/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset.go
similarity index 96%
rename from goformation/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset.go
rename to pkg/goformation/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset.go
index aa4184898a..5ca7e16ef4 100644
--- a/goformation/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset.go
+++ b/pkg/goformation/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SqlInjectionMatchSet AWS CloudFormation Resource (AWS::WAFRegional::SqlInjectionMatchSet)
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset_fieldtomatch.go b/pkg/goformation/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset_fieldtomatch.go
similarity index 93%
rename from goformation/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset_fieldtomatch.go
rename to pkg/goformation/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset_fieldtomatch.go
index ac7c88ec89..090be1b3ca 100644
--- a/goformation/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset_fieldtomatch.go
+++ b/pkg/goformation/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset_fieldtomatch.go
@@ -1,9 +1,9 @@
 package wafregional
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SqlInjectionMatchSet_FieldToMatch AWS CloudFormation Resource (AWS::WAFRegional::SqlInjectionMatchSet.FieldToMatch)
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset_sqlinjectionmatchtuple.go b/pkg/goformation/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset_sqlinjectionmatchtuple.go
similarity index 93%
rename from goformation/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset_sqlinjectionmatchtuple.go
rename to pkg/goformation/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset_sqlinjectionmatchtuple.go
index a31b014b5b..22bacaed9d 100644
--- a/goformation/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset_sqlinjectionmatchtuple.go
+++ b/pkg/goformation/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset_sqlinjectionmatchtuple.go
@@ -1,9 +1,9 @@
 package wafregional
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SqlInjectionMatchSet_SqlInjectionMatchTuple AWS CloudFormation Resource (AWS::WAFRegional::SqlInjectionMatchSet.SqlInjectionMatchTuple)
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-webacl.go b/pkg/goformation/cloudformation/wafregional/aws-wafregional-webacl.go
similarity index 97%
rename from goformation/cloudformation/wafregional/aws-wafregional-webacl.go
rename to pkg/goformation/cloudformation/wafregional/aws-wafregional-webacl.go
index 95a80611f3..67f587d3c4 100644
--- a/goformation/cloudformation/wafregional/aws-wafregional-webacl.go
+++ b/pkg/goformation/cloudformation/wafregional/aws-wafregional-webacl.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL AWS CloudFormation Resource (AWS::WAFRegional::WebACL)
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-webacl_action.go b/pkg/goformation/cloudformation/wafregional/aws-wafregional-webacl_action.go
similarity index 91%
rename from goformation/cloudformation/wafregional/aws-wafregional-webacl_action.go
rename to pkg/goformation/cloudformation/wafregional/aws-wafregional-webacl_action.go
index adaced80b1..02e8d9335a 100644
--- a/goformation/cloudformation/wafregional/aws-wafregional-webacl_action.go
+++ b/pkg/goformation/cloudformation/wafregional/aws-wafregional-webacl_action.go
@@ -1,9 +1,9 @@
 package wafregional
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_Action AWS CloudFormation Resource (AWS::WAFRegional::WebACL.Action)
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-webacl_rule.go b/pkg/goformation/cloudformation/wafregional/aws-wafregional-webacl_rule.go
similarity index 93%
rename from goformation/cloudformation/wafregional/aws-wafregional-webacl_rule.go
rename to pkg/goformation/cloudformation/wafregional/aws-wafregional-webacl_rule.go
index 3edebfaa51..d7e4c33e31 100644
--- a/goformation/cloudformation/wafregional/aws-wafregional-webacl_rule.go
+++ b/pkg/goformation/cloudformation/wafregional/aws-wafregional-webacl_rule.go
@@ -1,9 +1,9 @@
 package wafregional
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_Rule AWS CloudFormation Resource (AWS::WAFRegional::WebACL.Rule)
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-webaclassociation.go b/pkg/goformation/cloudformation/wafregional/aws-wafregional-webaclassociation.go
similarity index 96%
rename from goformation/cloudformation/wafregional/aws-wafregional-webaclassociation.go
rename to pkg/goformation/cloudformation/wafregional/aws-wafregional-webaclassociation.go
index fed06fceb1..a6a51aafe1 100644
--- a/goformation/cloudformation/wafregional/aws-wafregional-webaclassociation.go
+++ b/pkg/goformation/cloudformation/wafregional/aws-wafregional-webaclassociation.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACLAssociation AWS CloudFormation Resource (AWS::WAFRegional::WebACLAssociation)
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-xssmatchset.go b/pkg/goformation/cloudformation/wafregional/aws-wafregional-xssmatchset.go
similarity index 96%
rename from goformation/cloudformation/wafregional/aws-wafregional-xssmatchset.go
rename to pkg/goformation/cloudformation/wafregional/aws-wafregional-xssmatchset.go
index 1ee5ce551b..ea1e106ba9 100644
--- a/goformation/cloudformation/wafregional/aws-wafregional-xssmatchset.go
+++ b/pkg/goformation/cloudformation/wafregional/aws-wafregional-xssmatchset.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // XssMatchSet AWS CloudFormation Resource (AWS::WAFRegional::XssMatchSet)
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-xssmatchset_fieldtomatch.go b/pkg/goformation/cloudformation/wafregional/aws-wafregional-xssmatchset_fieldtomatch.go
similarity index 92%
rename from goformation/cloudformation/wafregional/aws-wafregional-xssmatchset_fieldtomatch.go
rename to pkg/goformation/cloudformation/wafregional/aws-wafregional-xssmatchset_fieldtomatch.go
index 4bef298622..f42482113b 100644
--- a/goformation/cloudformation/wafregional/aws-wafregional-xssmatchset_fieldtomatch.go
+++ b/pkg/goformation/cloudformation/wafregional/aws-wafregional-xssmatchset_fieldtomatch.go
@@ -1,9 +1,9 @@
 package wafregional
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // XssMatchSet_FieldToMatch AWS CloudFormation Resource (AWS::WAFRegional::XssMatchSet.FieldToMatch)
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-xssmatchset_xssmatchtuple.go b/pkg/goformation/cloudformation/wafregional/aws-wafregional-xssmatchset_xssmatchtuple.go
similarity index 93%
rename from goformation/cloudformation/wafregional/aws-wafregional-xssmatchset_xssmatchtuple.go
rename to pkg/goformation/cloudformation/wafregional/aws-wafregional-xssmatchset_xssmatchtuple.go
index 53c5e43de5..283e2bf14e 100644
--- a/goformation/cloudformation/wafregional/aws-wafregional-xssmatchset_xssmatchtuple.go
+++ b/pkg/goformation/cloudformation/wafregional/aws-wafregional-xssmatchset_xssmatchtuple.go
@@ -1,9 +1,9 @@
 package wafregional
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // XssMatchSet_XssMatchTuple AWS CloudFormation Resource (AWS::WAFRegional::XssMatchSet.XssMatchTuple)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-ipset.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-ipset.go
similarity index 95%
rename from goformation/cloudformation/wafv2/aws-wafv2-ipset.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-ipset.go
index de650a37a2..e159ef0e8f 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-ipset.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-ipset.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // IPSet AWS CloudFormation Resource (AWS::WAFv2::IPSet)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-loggingconfiguration.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-loggingconfiguration.go
similarity index 97%
rename from goformation/cloudformation/wafv2/aws-wafv2-loggingconfiguration.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-loggingconfiguration.go
index d4fc08cd27..0949ab8c46 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-loggingconfiguration.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-loggingconfiguration.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LoggingConfiguration AWS CloudFormation Resource (AWS::WAFv2::LoggingConfiguration)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-loggingconfiguration_fieldtomatch.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-loggingconfiguration_fieldtomatch.go
similarity index 97%
rename from goformation/cloudformation/wafv2/aws-wafv2-loggingconfiguration_fieldtomatch.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-loggingconfiguration_fieldtomatch.go
index faf193decb..b389e37226 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-loggingconfiguration_fieldtomatch.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-loggingconfiguration_fieldtomatch.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // LoggingConfiguration_FieldToMatch AWS CloudFormation Resource (AWS::WAFv2::LoggingConfiguration.FieldToMatch)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-regexpatternset.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-regexpatternset.go
similarity index 95%
rename from goformation/cloudformation/wafv2/aws-wafv2-regexpatternset.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-regexpatternset.go
index 7a67070c67..527a93a6f0 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-regexpatternset.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-regexpatternset.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RegexPatternSet AWS CloudFormation Resource (AWS::WAFv2::RegexPatternSet)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup.go
similarity index 96%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup.go
index 067f571197..a6a0818eb8 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup AWS CloudFormation Resource (AWS::WAFv2::RuleGroup)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_andstatement.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_andstatement.go
similarity index 95%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_andstatement.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_andstatement.go
index 694d1df534..7908248549 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_andstatement.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_andstatement.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_AndStatement AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.AndStatement)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_andstatementone.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_andstatementone.go
similarity index 95%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_andstatementone.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_andstatementone.go
index 5c3e4eadad..8eae3bb817 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_andstatementone.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_andstatementone.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_AndStatementOne AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.AndStatementOne)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_andstatementtwo.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_andstatementtwo.go
similarity index 95%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_andstatementtwo.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_andstatementtwo.go
index 7c250e744b..e150da8941 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_andstatementtwo.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_andstatementtwo.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_AndStatementTwo AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.AndStatementTwo)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_bytematchstatement.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_bytematchstatement.go
similarity index 95%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_bytematchstatement.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_bytematchstatement.go
index aba6d6f0df..35f8f8bdbc 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_bytematchstatement.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_bytematchstatement.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_ByteMatchStatement AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.ByteMatchStatement)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_customresponsebody.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_customresponsebody.go
similarity index 92%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_customresponsebody.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_customresponsebody.go
index 66890b885e..39242ab3d6 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_customresponsebody.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_customresponsebody.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_CustomResponseBody AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.CustomResponseBody)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_fieldtomatch.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_fieldtomatch.go
similarity index 97%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_fieldtomatch.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_fieldtomatch.go
index 2aa941068b..5bc8cf4db4 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_fieldtomatch.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_fieldtomatch.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_FieldToMatch AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.FieldToMatch)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_forwardedipconfiguration.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_forwardedipconfiguration.go
similarity index 93%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_forwardedipconfiguration.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_forwardedipconfiguration.go
index dad845e6af..a2775aadeb 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_forwardedipconfiguration.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_forwardedipconfiguration.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_ForwardedIPConfiguration AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.ForwardedIPConfiguration)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_geomatchstatement.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_geomatchstatement.go
similarity index 93%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_geomatchstatement.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_geomatchstatement.go
index 49e26f25fc..9612bc947a 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_geomatchstatement.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_geomatchstatement.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_GeoMatchStatement AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.GeoMatchStatement)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ipsetforwardedipconfiguration.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ipsetforwardedipconfiguration.go
similarity index 94%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ipsetforwardedipconfiguration.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ipsetforwardedipconfiguration.go
index cd0c2082ab..912eb91df1 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ipsetforwardedipconfiguration.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ipsetforwardedipconfiguration.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_IPSetForwardedIPConfiguration AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.IPSetForwardedIPConfiguration)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ipsetreferencestatement.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ipsetreferencestatement.go
similarity index 93%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ipsetreferencestatement.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ipsetreferencestatement.go
index 46fab32452..6e814517c6 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ipsetreferencestatement.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ipsetreferencestatement.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_IPSetReferenceStatement AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.IPSetReferenceStatement)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_jsonbody.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_jsonbody.go
similarity index 93%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_jsonbody.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_jsonbody.go
index 157187e365..415001349d 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_jsonbody.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_jsonbody.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_JsonBody AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.JsonBody)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_jsonmatchpattern.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_jsonmatchpattern.go
similarity index 92%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_jsonmatchpattern.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_jsonmatchpattern.go
index fdb9566a0d..8f92fa5556 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_jsonmatchpattern.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_jsonmatchpattern.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_JsonMatchPattern AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.JsonMatchPattern)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_label.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_label.go
similarity index 91%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_label.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_label.go
index d596f4c02f..fff77ffa00 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_label.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_label.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_Label AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.Label)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_labelmatchstatement.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_labelmatchstatement.go
similarity index 92%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_labelmatchstatement.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_labelmatchstatement.go
index b121ef274a..219a655e40 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_labelmatchstatement.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_labelmatchstatement.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_LabelMatchStatement AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.LabelMatchStatement)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_labelsummary.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_labelsummary.go
similarity index 91%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_labelsummary.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_labelsummary.go
index f198e7781e..aff719a388 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_labelsummary.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_labelsummary.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_LabelSummary AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.LabelSummary)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_notstatement.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_notstatement.go
similarity index 95%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_notstatement.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_notstatement.go
index 1d5034330e..a301f057bb 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_notstatement.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_notstatement.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_NotStatement AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.NotStatement)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_notstatementone.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_notstatementone.go
similarity index 95%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_notstatementone.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_notstatementone.go
index 64978805ed..d0fe64719a 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_notstatementone.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_notstatementone.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_NotStatementOne AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.NotStatementOne)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_notstatementtwo.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_notstatementtwo.go
similarity index 95%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_notstatementtwo.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_notstatementtwo.go
index e4da7a5b7b..c765c11881 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_notstatementtwo.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_notstatementtwo.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_NotStatementTwo AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.NotStatementTwo)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_orstatement.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_orstatement.go
similarity index 95%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_orstatement.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_orstatement.go
index 5bc07740df..67b65f50b4 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_orstatement.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_orstatement.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_OrStatement AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.OrStatement)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_orstatementone.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_orstatementone.go
similarity index 95%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_orstatementone.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_orstatementone.go
index 386428013e..02d9c7bca8 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_orstatementone.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_orstatementone.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_OrStatementOne AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.OrStatementOne)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_orstatementtwo.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_orstatementtwo.go
similarity index 95%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_orstatementtwo.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_orstatementtwo.go
index 34d4d4a24f..2b6358d2b0 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_orstatementtwo.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_orstatementtwo.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_OrStatementTwo AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.OrStatementTwo)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatement.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatement.go
similarity index 94%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatement.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatement.go
index 6f1d972643..1d6c1c69d6 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatement.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatement.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_RateBasedStatement AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.RateBasedStatement)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatementone.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatementone.go
similarity index 94%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatementone.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatementone.go
index a511a1be33..031f48cb0f 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatementone.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatementone.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_RateBasedStatementOne AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.RateBasedStatementOne)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatementtwo.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatementtwo.go
similarity index 94%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatementtwo.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatementtwo.go
index 75540b13e9..f353810298 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatementtwo.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatementtwo.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_RateBasedStatementTwo AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.RateBasedStatementTwo)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_regexpatternsetreferencestatement.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_regexpatternsetreferencestatement.go
similarity index 94%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_regexpatternsetreferencestatement.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_regexpatternsetreferencestatement.go
index 8139da7c06..8006787f30 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_regexpatternsetreferencestatement.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_regexpatternsetreferencestatement.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_RegexPatternSetReferenceStatement AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.RegexPatternSetReferenceStatement)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_rule.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_rule.go
similarity index 95%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_rule.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_rule.go
index 8112402eb0..3b27fe0dce 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_rule.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_rule.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_Rule AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.Rule)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ruleaction.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ruleaction.go
similarity index 96%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ruleaction.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ruleaction.go
index 9db83be0a9..40b6a197f2 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ruleaction.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ruleaction.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_RuleAction AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.RuleAction)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_sizeconstraintstatement.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_sizeconstraintstatement.go
similarity index 94%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_sizeconstraintstatement.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_sizeconstraintstatement.go
index 44a08f8d3b..bb148c1f72 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_sizeconstraintstatement.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_sizeconstraintstatement.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_SizeConstraintStatement AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.SizeConstraintStatement)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_sqlimatchstatement.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_sqlimatchstatement.go
similarity index 96%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_sqlimatchstatement.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_sqlimatchstatement.go
index b5624c504c..8dd0067360 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_sqlimatchstatement.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_sqlimatchstatement.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_SqliMatchStatement AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.SqliMatchStatement)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statement.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statement.go
similarity index 98%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statement.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statement.go
index 0369000328..8e253a3a26 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statement.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statement.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_Statement AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.Statement)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statementone.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statementone.go
similarity index 98%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statementone.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statementone.go
index d58eb6b584..7dc6c4bfea 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statementone.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statementone.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_StatementOne AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.StatementOne)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statementthree.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statementthree.go
similarity index 98%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statementthree.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statementthree.go
index 9eedd94e2b..2976dbd8b1 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statementthree.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statementthree.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_StatementThree AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.StatementThree)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statementtwo.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statementtwo.go
similarity index 98%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statementtwo.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statementtwo.go
index ad11ccac6b..56c8ef4538 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statementtwo.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statementtwo.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_StatementTwo AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.StatementTwo)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_texttransformation.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_texttransformation.go
similarity index 92%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_texttransformation.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_texttransformation.go
index 63cda6b48f..3e3ead9a75 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_texttransformation.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_texttransformation.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_TextTransformation AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.TextTransformation)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_visibilityconfig.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_visibilityconfig.go
similarity index 94%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_visibilityconfig.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_visibilityconfig.go
index 3950e5a603..0829a4167f 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_visibilityconfig.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_visibilityconfig.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_VisibilityConfig AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.VisibilityConfig)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_xssmatchstatement.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_xssmatchstatement.go
similarity index 96%
rename from goformation/cloudformation/wafv2/aws-wafv2-rulegroup_xssmatchstatement.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_xssmatchstatement.go
index c03e0de78b..58d64a3bff 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_xssmatchstatement.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_xssmatchstatement.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // RuleGroup_XssMatchStatement AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.XssMatchStatement)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl.go
similarity index 96%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl.go
index e4a18838f5..e388a9d665 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL AWS CloudFormation Resource (AWS::WAFv2::WebACL)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_allowaction.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_allowaction.go
similarity index 95%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_allowaction.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_allowaction.go
index 9ba8a614d4..9e121d2879 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_allowaction.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_allowaction.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_AllowAction AWS CloudFormation Resource (AWS::WAFv2::WebACL.AllowAction)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_andstatement.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_andstatement.go
similarity index 95%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_andstatement.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_andstatement.go
index 4161d583ae..dfa21f80fb 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_andstatement.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_andstatement.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_AndStatement AWS CloudFormation Resource (AWS::WAFv2::WebACL.AndStatement)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_andstatementone.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_andstatementone.go
similarity index 95%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_andstatementone.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_andstatementone.go
index 987e009e2c..254bb67272 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_andstatementone.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_andstatementone.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_AndStatementOne AWS CloudFormation Resource (AWS::WAFv2::WebACL.AndStatementOne)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_andstatementtwo.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_andstatementtwo.go
similarity index 95%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_andstatementtwo.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_andstatementtwo.go
index f36d85b3e6..03e0d7b80d 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_andstatementtwo.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_andstatementtwo.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_AndStatementTwo AWS CloudFormation Resource (AWS::WAFv2::WebACL.AndStatementTwo)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_blockaction.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_blockaction.go
similarity index 95%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_blockaction.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_blockaction.go
index 1af727444b..f4251a3413 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_blockaction.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_blockaction.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_BlockAction AWS CloudFormation Resource (AWS::WAFv2::WebACL.BlockAction)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_bytematchstatement.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_bytematchstatement.go
similarity index 95%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_bytematchstatement.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_bytematchstatement.go
index 90d15d8d1e..e85a6229d9 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_bytematchstatement.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_bytematchstatement.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_ByteMatchStatement AWS CloudFormation Resource (AWS::WAFv2::WebACL.ByteMatchStatement)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_countaction.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_countaction.go
similarity index 95%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_countaction.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_countaction.go
index c366bb667e..059b262551 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_countaction.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_countaction.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_CountAction AWS CloudFormation Resource (AWS::WAFv2::WebACL.CountAction)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_customhttpheader.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_customhttpheader.go
similarity index 92%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_customhttpheader.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_customhttpheader.go
index d4879531bf..7868ff224d 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_customhttpheader.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_customhttpheader.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_CustomHTTPHeader AWS CloudFormation Resource (AWS::WAFv2::WebACL.CustomHTTPHeader)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_customrequesthandling.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_customrequesthandling.go
similarity index 95%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_customrequesthandling.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_customrequesthandling.go
index 63b6b3a34e..92a16a7ed9 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_customrequesthandling.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_customrequesthandling.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_CustomRequestHandling AWS CloudFormation Resource (AWS::WAFv2::WebACL.CustomRequestHandling)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_customresponse.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_customresponse.go
similarity index 93%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_customresponse.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_customresponse.go
index 15a2a0caba..b34390e0d6 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_customresponse.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_customresponse.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_CustomResponse AWS CloudFormation Resource (AWS::WAFv2::WebACL.CustomResponse)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_customresponsebody.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_customresponsebody.go
similarity index 92%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_customresponsebody.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_customresponsebody.go
index 8a63825c82..d52afd6fc7 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_customresponsebody.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_customresponsebody.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_CustomResponseBody AWS CloudFormation Resource (AWS::WAFv2::WebACL.CustomResponseBody)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_defaultaction.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_defaultaction.go
similarity index 96%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_defaultaction.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_defaultaction.go
index da621a1bd9..ed7903fc0e 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_defaultaction.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_defaultaction.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_DefaultAction AWS CloudFormation Resource (AWS::WAFv2::WebACL.DefaultAction)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_excludedrule.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_excludedrule.go
similarity index 91%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_excludedrule.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_excludedrule.go
index fbbd66b2de..a607745d06 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_excludedrule.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_excludedrule.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_ExcludedRule AWS CloudFormation Resource (AWS::WAFv2::WebACL.ExcludedRule)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_fieldtomatch.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_fieldtomatch.go
similarity index 97%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_fieldtomatch.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_fieldtomatch.go
index a529789b47..f5ca22ecc5 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_fieldtomatch.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_fieldtomatch.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_FieldToMatch AWS CloudFormation Resource (AWS::WAFv2::WebACL.FieldToMatch)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_forwardedipconfiguration.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_forwardedipconfiguration.go
similarity index 93%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_forwardedipconfiguration.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_forwardedipconfiguration.go
index 6544338c86..e7ea21b6c4 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_forwardedipconfiguration.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_forwardedipconfiguration.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_ForwardedIPConfiguration AWS CloudFormation Resource (AWS::WAFv2::WebACL.ForwardedIPConfiguration)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_geomatchstatement.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_geomatchstatement.go
similarity index 93%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_geomatchstatement.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_geomatchstatement.go
index 8a04d54634..1e7a24cb72 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_geomatchstatement.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_geomatchstatement.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_GeoMatchStatement AWS CloudFormation Resource (AWS::WAFv2::WebACL.GeoMatchStatement)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_ipsetforwardedipconfiguration.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_ipsetforwardedipconfiguration.go
similarity index 94%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_ipsetforwardedipconfiguration.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_ipsetforwardedipconfiguration.go
index c11983a669..9d47831849 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_ipsetforwardedipconfiguration.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_ipsetforwardedipconfiguration.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_IPSetForwardedIPConfiguration AWS CloudFormation Resource (AWS::WAFv2::WebACL.IPSetForwardedIPConfiguration)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_ipsetreferencestatement.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_ipsetreferencestatement.go
similarity index 93%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_ipsetreferencestatement.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_ipsetreferencestatement.go
index 04ea6e4578..6b27c0a6ec 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_ipsetreferencestatement.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_ipsetreferencestatement.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_IPSetReferenceStatement AWS CloudFormation Resource (AWS::WAFv2::WebACL.IPSetReferenceStatement)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_jsonbody.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_jsonbody.go
similarity index 93%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_jsonbody.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_jsonbody.go
index dfd076d66e..bbe2d918e6 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_jsonbody.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_jsonbody.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_JsonBody AWS CloudFormation Resource (AWS::WAFv2::WebACL.JsonBody)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_jsonmatchpattern.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_jsonmatchpattern.go
similarity index 92%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_jsonmatchpattern.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_jsonmatchpattern.go
index 5223ca4914..7ed2a6c074 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_jsonmatchpattern.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_jsonmatchpattern.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_JsonMatchPattern AWS CloudFormation Resource (AWS::WAFv2::WebACL.JsonMatchPattern)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_label.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_label.go
similarity index 91%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_label.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_label.go
index 741227a87e..478435b203 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_label.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_label.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_Label AWS CloudFormation Resource (AWS::WAFv2::WebACL.Label)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_labelmatchstatement.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_labelmatchstatement.go
similarity index 92%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_labelmatchstatement.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_labelmatchstatement.go
index 14ae21d491..1cebb50b14 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_labelmatchstatement.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_labelmatchstatement.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_LabelMatchStatement AWS CloudFormation Resource (AWS::WAFv2::WebACL.LabelMatchStatement)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_managedrulegroupstatement.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_managedrulegroupstatement.go
similarity index 95%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_managedrulegroupstatement.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_managedrulegroupstatement.go
index 2f7d48ef7d..f3b8b6db46 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_managedrulegroupstatement.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_managedrulegroupstatement.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_ManagedRuleGroupStatement AWS CloudFormation Resource (AWS::WAFv2::WebACL.ManagedRuleGroupStatement)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_notstatement.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_notstatement.go
similarity index 95%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_notstatement.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_notstatement.go
index a01148a0d5..44e2f1b22a 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_notstatement.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_notstatement.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_NotStatement AWS CloudFormation Resource (AWS::WAFv2::WebACL.NotStatement)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_notstatementone.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_notstatementone.go
similarity index 95%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_notstatementone.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_notstatementone.go
index af168cf308..4b0eef12e4 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_notstatementone.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_notstatementone.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_NotStatementOne AWS CloudFormation Resource (AWS::WAFv2::WebACL.NotStatementOne)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_notstatementtwo.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_notstatementtwo.go
similarity index 95%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_notstatementtwo.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_notstatementtwo.go
index 670fb168e0..13b904a686 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_notstatementtwo.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_notstatementtwo.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_NotStatementTwo AWS CloudFormation Resource (AWS::WAFv2::WebACL.NotStatementTwo)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_orstatement.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_orstatement.go
similarity index 95%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_orstatement.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_orstatement.go
index bd5706d6c8..b331948e31 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_orstatement.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_orstatement.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_OrStatement AWS CloudFormation Resource (AWS::WAFv2::WebACL.OrStatement)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_orstatementone.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_orstatementone.go
similarity index 95%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_orstatementone.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_orstatementone.go
index 585440d062..a15bd510ee 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_orstatementone.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_orstatementone.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_OrStatementOne AWS CloudFormation Resource (AWS::WAFv2::WebACL.OrStatementOne)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_orstatementtwo.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_orstatementtwo.go
similarity index 95%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_orstatementtwo.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_orstatementtwo.go
index 38dd23d16e..ff9ee1370b 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_orstatementtwo.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_orstatementtwo.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_OrStatementTwo AWS CloudFormation Resource (AWS::WAFv2::WebACL.OrStatementTwo)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_overrideaction.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_overrideaction.go
similarity index 96%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_overrideaction.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_overrideaction.go
index 249375a5c4..50d39fb1e5 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_overrideaction.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_overrideaction.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_OverrideAction AWS CloudFormation Resource (AWS::WAFv2::WebACL.OverrideAction)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatement.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatement.go
similarity index 94%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatement.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatement.go
index 751a185d24..52d78fcc6f 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatement.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatement.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_RateBasedStatement AWS CloudFormation Resource (AWS::WAFv2::WebACL.RateBasedStatement)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatementone.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatementone.go
similarity index 94%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatementone.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatementone.go
index 6db60664de..e5b24b0a68 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatementone.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatementone.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_RateBasedStatementOne AWS CloudFormation Resource (AWS::WAFv2::WebACL.RateBasedStatementOne)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatementtwo.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatementtwo.go
similarity index 94%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatementtwo.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatementtwo.go
index 2dc07639d4..999f08be87 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatementtwo.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatementtwo.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_RateBasedStatementTwo AWS CloudFormation Resource (AWS::WAFv2::WebACL.RateBasedStatementTwo)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_regexpatternsetreferencestatement.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_regexpatternsetreferencestatement.go
similarity index 94%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_regexpatternsetreferencestatement.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_regexpatternsetreferencestatement.go
index 65f462832c..4606c9851c 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_regexpatternsetreferencestatement.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_regexpatternsetreferencestatement.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_RegexPatternSetReferenceStatement AWS CloudFormation Resource (AWS::WAFv2::WebACL.RegexPatternSetReferenceStatement)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_rule.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_rule.go
similarity index 95%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_rule.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_rule.go
index 3df2745cae..baa4035454 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_rule.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_rule.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_Rule AWS CloudFormation Resource (AWS::WAFv2::WebACL.Rule)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_ruleaction.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_ruleaction.go
similarity index 96%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_ruleaction.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_ruleaction.go
index 9131d6394c..81b0ab74a6 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_ruleaction.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_ruleaction.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_RuleAction AWS CloudFormation Resource (AWS::WAFv2::WebACL.RuleAction)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_rulegroupreferencestatement.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_rulegroupreferencestatement.go
similarity index 93%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_rulegroupreferencestatement.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_rulegroupreferencestatement.go
index 91930e63fa..5b75a4aac4 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_rulegroupreferencestatement.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_rulegroupreferencestatement.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_RuleGroupReferenceStatement AWS CloudFormation Resource (AWS::WAFv2::WebACL.RuleGroupReferenceStatement)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_sizeconstraintstatement.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_sizeconstraintstatement.go
similarity index 94%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_sizeconstraintstatement.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_sizeconstraintstatement.go
index 4e8a6daef2..3d6d72ea6d 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_sizeconstraintstatement.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_sizeconstraintstatement.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_SizeConstraintStatement AWS CloudFormation Resource (AWS::WAFv2::WebACL.SizeConstraintStatement)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_sqlimatchstatement.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_sqlimatchstatement.go
similarity index 96%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_sqlimatchstatement.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_sqlimatchstatement.go
index 2930cac9e7..99fc899e9d 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_sqlimatchstatement.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_sqlimatchstatement.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_SqliMatchStatement AWS CloudFormation Resource (AWS::WAFv2::WebACL.SqliMatchStatement)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_statement.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_statement.go
similarity index 98%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_statement.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_statement.go
index a5233eb5d3..831894378c 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_statement.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_statement.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_Statement AWS CloudFormation Resource (AWS::WAFv2::WebACL.Statement)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_statementone.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_statementone.go
similarity index 98%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_statementone.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_statementone.go
index 32d40f4d90..f57276e941 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_statementone.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_statementone.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_StatementOne AWS CloudFormation Resource (AWS::WAFv2::WebACL.StatementOne)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_statementthree.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_statementthree.go
similarity index 98%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_statementthree.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_statementthree.go
index 3ad176960a..15832b0dc9 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_statementthree.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_statementthree.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_StatementThree AWS CloudFormation Resource (AWS::WAFv2::WebACL.StatementThree)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_statementtwo.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_statementtwo.go
similarity index 98%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_statementtwo.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_statementtwo.go
index 414278aa81..9cf07a2bee 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_statementtwo.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_statementtwo.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_StatementTwo AWS CloudFormation Resource (AWS::WAFv2::WebACL.StatementTwo)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_texttransformation.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_texttransformation.go
similarity index 92%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_texttransformation.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_texttransformation.go
index 69eb934077..9774947b87 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_texttransformation.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_texttransformation.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_TextTransformation AWS CloudFormation Resource (AWS::WAFv2::WebACL.TextTransformation)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_visibilityconfig.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_visibilityconfig.go
similarity index 93%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_visibilityconfig.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_visibilityconfig.go
index 90a3ea9561..4c8a0ba6bf 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_visibilityconfig.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_visibilityconfig.go
@@ -1,9 +1,9 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_VisibilityConfig AWS CloudFormation Resource (AWS::WAFv2::WebACL.VisibilityConfig)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_xssmatchstatement.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_xssmatchstatement.go
similarity index 96%
rename from goformation/cloudformation/wafv2/aws-wafv2-webacl_xssmatchstatement.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_xssmatchstatement.go
index 580184979f..d81722f61c 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webacl_xssmatchstatement.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webacl_xssmatchstatement.go
@@ -1,7 +1,7 @@
 package wafv2
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACL_XssMatchStatement AWS CloudFormation Resource (AWS::WAFv2::WebACL.XssMatchStatement)
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webaclassociation.go b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webaclassociation.go
similarity index 96%
rename from goformation/cloudformation/wafv2/aws-wafv2-webaclassociation.go
rename to pkg/goformation/cloudformation/wafv2/aws-wafv2-webaclassociation.go
index fee16c743e..3e882e5378 100644
--- a/goformation/cloudformation/wafv2/aws-wafv2-webaclassociation.go
+++ b/pkg/goformation/cloudformation/wafv2/aws-wafv2-webaclassociation.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // WebACLAssociation AWS CloudFormation Resource (AWS::WAFv2::WebACLAssociation)
diff --git a/goformation/cloudformation/wisdom/aws-wisdom-assistant.go b/pkg/goformation/cloudformation/wisdom/aws-wisdom-assistant.go
similarity index 95%
rename from goformation/cloudformation/wisdom/aws-wisdom-assistant.go
rename to pkg/goformation/cloudformation/wisdom/aws-wisdom-assistant.go
index 21bb2b60fb..cbf9a0a65a 100644
--- a/goformation/cloudformation/wisdom/aws-wisdom-assistant.go
+++ b/pkg/goformation/cloudformation/wisdom/aws-wisdom-assistant.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Assistant AWS CloudFormation Resource (AWS::Wisdom::Assistant)
diff --git a/goformation/cloudformation/wisdom/aws-wisdom-assistant_serversideencryptionconfiguration.go b/pkg/goformation/cloudformation/wisdom/aws-wisdom-assistant_serversideencryptionconfiguration.go
similarity index 92%
rename from goformation/cloudformation/wisdom/aws-wisdom-assistant_serversideencryptionconfiguration.go
rename to pkg/goformation/cloudformation/wisdom/aws-wisdom-assistant_serversideencryptionconfiguration.go
index d670c2ff39..004b5faf9b 100644
--- a/goformation/cloudformation/wisdom/aws-wisdom-assistant_serversideencryptionconfiguration.go
+++ b/pkg/goformation/cloudformation/wisdom/aws-wisdom-assistant_serversideencryptionconfiguration.go
@@ -1,9 +1,9 @@
 package wisdom
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Assistant_ServerSideEncryptionConfiguration AWS CloudFormation Resource (AWS::Wisdom::Assistant.ServerSideEncryptionConfiguration)
diff --git a/goformation/cloudformation/wisdom/aws-wisdom-assistantassociation.go b/pkg/goformation/cloudformation/wisdom/aws-wisdom-assistantassociation.go
similarity index 95%
rename from goformation/cloudformation/wisdom/aws-wisdom-assistantassociation.go
rename to pkg/goformation/cloudformation/wisdom/aws-wisdom-assistantassociation.go
index b91a09f869..593077de77 100644
--- a/goformation/cloudformation/wisdom/aws-wisdom-assistantassociation.go
+++ b/pkg/goformation/cloudformation/wisdom/aws-wisdom-assistantassociation.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AssistantAssociation AWS CloudFormation Resource (AWS::Wisdom::AssistantAssociation)
diff --git a/goformation/cloudformation/wisdom/aws-wisdom-assistantassociation_associationdata.go b/pkg/goformation/cloudformation/wisdom/aws-wisdom-assistantassociation_associationdata.go
similarity index 92%
rename from goformation/cloudformation/wisdom/aws-wisdom-assistantassociation_associationdata.go
rename to pkg/goformation/cloudformation/wisdom/aws-wisdom-assistantassociation_associationdata.go
index a4d7e820c0..2bb47be64d 100644
--- a/goformation/cloudformation/wisdom/aws-wisdom-assistantassociation_associationdata.go
+++ b/pkg/goformation/cloudformation/wisdom/aws-wisdom-assistantassociation_associationdata.go
@@ -1,9 +1,9 @@
 package wisdom
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // AssistantAssociation_AssociationData AWS CloudFormation Resource (AWS::Wisdom::AssistantAssociation.AssociationData)
diff --git a/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase.go b/pkg/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase.go
similarity index 96%
rename from goformation/cloudformation/wisdom/aws-wisdom-knowledgebase.go
rename to pkg/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase.go
index efc6d081ff..de7383ba8f 100644
--- a/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase.go
+++ b/pkg/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // KnowledgeBase AWS CloudFormation Resource (AWS::Wisdom::KnowledgeBase)
diff --git a/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_appintegrationsconfiguration.go b/pkg/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_appintegrationsconfiguration.go
similarity index 93%
rename from goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_appintegrationsconfiguration.go
rename to pkg/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_appintegrationsconfiguration.go
index 62e0529eb4..e53b410053 100644
--- a/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_appintegrationsconfiguration.go
+++ b/pkg/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_appintegrationsconfiguration.go
@@ -1,9 +1,9 @@
 package wisdom
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // KnowledgeBase_AppIntegrationsConfiguration AWS CloudFormation Resource (AWS::Wisdom::KnowledgeBase.AppIntegrationsConfiguration)
diff --git a/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_renderingconfiguration.go b/pkg/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_renderingconfiguration.go
similarity index 92%
rename from goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_renderingconfiguration.go
rename to pkg/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_renderingconfiguration.go
index 95b59eed7c..7bbecb4f56 100644
--- a/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_renderingconfiguration.go
+++ b/pkg/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_renderingconfiguration.go
@@ -1,9 +1,9 @@
 package wisdom
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // KnowledgeBase_RenderingConfiguration AWS CloudFormation Resource (AWS::Wisdom::KnowledgeBase.RenderingConfiguration)
diff --git a/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_serversideencryptionconfiguration.go b/pkg/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_serversideencryptionconfiguration.go
similarity index 92%
rename from goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_serversideencryptionconfiguration.go
rename to pkg/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_serversideencryptionconfiguration.go
index c3c85107cf..7379592b35 100644
--- a/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_serversideencryptionconfiguration.go
+++ b/pkg/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_serversideencryptionconfiguration.go
@@ -1,9 +1,9 @@
 package wisdom
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // KnowledgeBase_ServerSideEncryptionConfiguration AWS CloudFormation Resource (AWS::Wisdom::KnowledgeBase.ServerSideEncryptionConfiguration)
diff --git a/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_sourceconfiguration.go b/pkg/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_sourceconfiguration.go
similarity index 95%
rename from goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_sourceconfiguration.go
rename to pkg/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_sourceconfiguration.go
index 9f3bd36258..e9f13a4128 100644
--- a/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_sourceconfiguration.go
+++ b/pkg/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_sourceconfiguration.go
@@ -1,7 +1,7 @@
 package wisdom
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // KnowledgeBase_SourceConfiguration AWS CloudFormation Resource (AWS::Wisdom::KnowledgeBase.SourceConfiguration)
diff --git a/goformation/cloudformation/workspaces/aws-workspaces-connectionalias.go b/pkg/goformation/cloudformation/workspaces/aws-workspaces-connectionalias.go
similarity index 95%
rename from goformation/cloudformation/workspaces/aws-workspaces-connectionalias.go
rename to pkg/goformation/cloudformation/workspaces/aws-workspaces-connectionalias.go
index 7a395280f8..b82101e3ed 100644
--- a/goformation/cloudformation/workspaces/aws-workspaces-connectionalias.go
+++ b/pkg/goformation/cloudformation/workspaces/aws-workspaces-connectionalias.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectionAlias AWS CloudFormation Resource (AWS::WorkSpaces::ConnectionAlias)
diff --git a/goformation/cloudformation/workspaces/aws-workspaces-connectionalias_connectionaliasassociation.go b/pkg/goformation/cloudformation/workspaces/aws-workspaces-connectionalias_connectionaliasassociation.go
similarity index 95%
rename from goformation/cloudformation/workspaces/aws-workspaces-connectionalias_connectionaliasassociation.go
rename to pkg/goformation/cloudformation/workspaces/aws-workspaces-connectionalias_connectionaliasassociation.go
index a355aa434b..257bfd5fda 100644
--- a/goformation/cloudformation/workspaces/aws-workspaces-connectionalias_connectionaliasassociation.go
+++ b/pkg/goformation/cloudformation/workspaces/aws-workspaces-connectionalias_connectionaliasassociation.go
@@ -1,9 +1,9 @@
 package workspaces
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // ConnectionAlias_ConnectionAliasAssociation AWS CloudFormation Resource (AWS::WorkSpaces::ConnectionAlias.ConnectionAliasAssociation)
diff --git a/goformation/cloudformation/workspaces/aws-workspaces-workspace.go b/pkg/goformation/cloudformation/workspaces/aws-workspaces-workspace.go
similarity index 96%
rename from goformation/cloudformation/workspaces/aws-workspaces-workspace.go
rename to pkg/goformation/cloudformation/workspaces/aws-workspaces-workspace.go
index 88dfe8cbfc..8134f30e3d 100644
--- a/goformation/cloudformation/workspaces/aws-workspaces-workspace.go
+++ b/pkg/goformation/cloudformation/workspaces/aws-workspaces-workspace.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Workspace AWS CloudFormation Resource (AWS::WorkSpaces::Workspace)
diff --git a/goformation/cloudformation/workspaces/aws-workspaces-workspace_workspaceproperties.go b/pkg/goformation/cloudformation/workspaces/aws-workspaces-workspace_workspaceproperties.go
similarity index 95%
rename from goformation/cloudformation/workspaces/aws-workspaces-workspace_workspaceproperties.go
rename to pkg/goformation/cloudformation/workspaces/aws-workspaces-workspace_workspaceproperties.go
index 7d9be165a6..16e9979216 100644
--- a/goformation/cloudformation/workspaces/aws-workspaces-workspace_workspaceproperties.go
+++ b/pkg/goformation/cloudformation/workspaces/aws-workspaces-workspace_workspaceproperties.go
@@ -1,9 +1,9 @@
 package workspaces
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Workspace_WorkspaceProperties AWS CloudFormation Resource (AWS::WorkSpaces::Workspace.WorkspaceProperties)
diff --git a/goformation/cloudformation/xray/aws-xray-group.go b/pkg/goformation/cloudformation/xray/aws-xray-group.go
similarity index 97%
rename from goformation/cloudformation/xray/aws-xray-group.go
rename to pkg/goformation/cloudformation/xray/aws-xray-group.go
index ca929d4360..1d266ba4c3 100644
--- a/goformation/cloudformation/xray/aws-xray-group.go
+++ b/pkg/goformation/cloudformation/xray/aws-xray-group.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Group AWS CloudFormation Resource (AWS::XRay::Group)
diff --git a/goformation/cloudformation/xray/aws-xray-group_insightsconfiguration.go b/pkg/goformation/cloudformation/xray/aws-xray-group_insightsconfiguration.go
similarity index 93%
rename from goformation/cloudformation/xray/aws-xray-group_insightsconfiguration.go
rename to pkg/goformation/cloudformation/xray/aws-xray-group_insightsconfiguration.go
index f6687c9ce7..e235866631 100644
--- a/goformation/cloudformation/xray/aws-xray-group_insightsconfiguration.go
+++ b/pkg/goformation/cloudformation/xray/aws-xray-group_insightsconfiguration.go
@@ -1,9 +1,9 @@
 package xray
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // Group_InsightsConfiguration AWS CloudFormation Resource (AWS::XRay::Group.InsightsConfiguration)
diff --git a/goformation/cloudformation/xray/aws-xray-samplingrule.go b/pkg/goformation/cloudformation/xray/aws-xray-samplingrule.go
similarity index 97%
rename from goformation/cloudformation/xray/aws-xray-samplingrule.go
rename to pkg/goformation/cloudformation/xray/aws-xray-samplingrule.go
index dee1df8714..9a0a3604d8 100644
--- a/goformation/cloudformation/xray/aws-xray-samplingrule.go
+++ b/pkg/goformation/cloudformation/xray/aws-xray-samplingrule.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SamplingRule AWS CloudFormation Resource (AWS::XRay::SamplingRule)
diff --git a/goformation/cloudformation/xray/aws-xray-samplingrule_samplingrule.go b/pkg/goformation/cloudformation/xray/aws-xray-samplingrule_samplingrule.go
similarity index 97%
rename from goformation/cloudformation/xray/aws-xray-samplingrule_samplingrule.go
rename to pkg/goformation/cloudformation/xray/aws-xray-samplingrule_samplingrule.go
index 320cc461be..17831f76a0 100644
--- a/goformation/cloudformation/xray/aws-xray-samplingrule_samplingrule.go
+++ b/pkg/goformation/cloudformation/xray/aws-xray-samplingrule_samplingrule.go
@@ -1,9 +1,9 @@
 package xray
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SamplingRule_SamplingRule AWS CloudFormation Resource (AWS::XRay::SamplingRule.SamplingRule)
diff --git a/goformation/cloudformation/xray/aws-xray-samplingrule_samplingrulerecord.go b/pkg/goformation/cloudformation/xray/aws-xray-samplingrule_samplingrulerecord.go
similarity index 94%
rename from goformation/cloudformation/xray/aws-xray-samplingrule_samplingrulerecord.go
rename to pkg/goformation/cloudformation/xray/aws-xray-samplingrule_samplingrulerecord.go
index c41dc5c1d4..a8b78789a5 100644
--- a/goformation/cloudformation/xray/aws-xray-samplingrule_samplingrulerecord.go
+++ b/pkg/goformation/cloudformation/xray/aws-xray-samplingrule_samplingrulerecord.go
@@ -1,9 +1,9 @@
 package xray
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SamplingRule_SamplingRuleRecord AWS CloudFormation Resource (AWS::XRay::SamplingRule.SamplingRuleRecord)
diff --git a/goformation/cloudformation/xray/aws-xray-samplingrule_samplingruleupdate.go b/pkg/goformation/cloudformation/xray/aws-xray-samplingrule_samplingruleupdate.go
similarity index 97%
rename from goformation/cloudformation/xray/aws-xray-samplingrule_samplingruleupdate.go
rename to pkg/goformation/cloudformation/xray/aws-xray-samplingrule_samplingruleupdate.go
index 9bc6415701..ca5bd8ced6 100644
--- a/goformation/cloudformation/xray/aws-xray-samplingrule_samplingruleupdate.go
+++ b/pkg/goformation/cloudformation/xray/aws-xray-samplingrule_samplingruleupdate.go
@@ -1,9 +1,9 @@
 package xray
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
 )
 
 // SamplingRule_SamplingRuleUpdate AWS CloudFormation Resource (AWS::XRay::SamplingRule.SamplingRuleUpdate)
diff --git a/goformation/example/go-to-yaml/main.go b/pkg/goformation/example/go-to-yaml/main.go
similarity index 83%
rename from goformation/example/go-to-yaml/main.go
rename to pkg/goformation/example/go-to-yaml/main.go
index b77f2b88c0..9e536c7e3f 100644
--- a/goformation/example/go-to-yaml/main.go
+++ b/pkg/goformation/example/go-to-yaml/main.go
@@ -5,9 +5,9 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/awslabs/goformation/v4/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/sns"
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/sns"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 )
 
 func main() {
diff --git a/goformation/example/yaml-to-go/main.go b/pkg/goformation/example/yaml-to-go/main.go
similarity index 95%
rename from goformation/example/yaml-to-go/main.go
rename to pkg/goformation/example/yaml-to-go/main.go
index 43bc6413a3..18b67410fc 100644
--- a/goformation/example/yaml-to-go/main.go
+++ b/pkg/goformation/example/yaml-to-go/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"github.com/awslabs/goformation/v4"
+	"github.com/weaveworks/eksctl/pkg/goformation"
 )
 
 func main() {
diff --git a/goformation/example/yaml-to-go/template.yaml b/pkg/goformation/example/yaml-to-go/template.yaml
similarity index 100%
rename from goformation/example/yaml-to-go/template.yaml
rename to pkg/goformation/example/yaml-to-go/template.yaml
diff --git a/goformation/generate/create-pull-request.sh b/pkg/goformation/generate/create-pull-request.sh
similarity index 100%
rename from goformation/generate/create-pull-request.sh
rename to pkg/goformation/generate/create-pull-request.sh
diff --git a/goformation/generate/generate.go b/pkg/goformation/generate/generate.go
similarity index 100%
rename from goformation/generate/generate.go
rename to pkg/goformation/generate/generate.go
diff --git a/goformation/generate/generate.sh b/pkg/goformation/generate/generate.sh
similarity index 100%
rename from goformation/generate/generate.sh
rename to pkg/goformation/generate/generate.sh
diff --git a/goformation/generate/generate_suite_test.go b/pkg/goformation/generate/generate_suite_test.go
similarity index 100%
rename from goformation/generate/generate_suite_test.go
rename to pkg/goformation/generate/generate_suite_test.go
diff --git a/goformation/generate/main.go b/pkg/goformation/generate/main.go
similarity index 100%
rename from goformation/generate/main.go
rename to pkg/goformation/generate/main.go
diff --git a/goformation/generate/naming.go b/pkg/goformation/generate/naming.go
similarity index 100%
rename from goformation/generate/naming.go
rename to pkg/goformation/generate/naming.go
diff --git a/goformation/generate/property.go b/pkg/goformation/generate/property.go
similarity index 100%
rename from goformation/generate/property.go
rename to pkg/goformation/generate/property.go
diff --git a/goformation/generate/property_test.go b/pkg/goformation/generate/property_test.go
similarity index 97%
rename from goformation/generate/property_test.go
rename to pkg/goformation/generate/property_test.go
index db024ce92c..5386c1fd78 100644
--- a/goformation/generate/property_test.go
+++ b/pkg/goformation/generate/property_test.go
@@ -3,8 +3,8 @@ package main_test
 import (
 	"encoding/json"
 
-	"github.com/awslabs/goformation/v4/cloudformation/serverless"
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/serverless"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/goformation/generate/resource.go b/pkg/goformation/generate/resource.go
similarity index 100%
rename from goformation/generate/resource.go
rename to pkg/goformation/generate/resource.go
diff --git a/goformation/generate/resource_test.go b/pkg/goformation/generate/resource_test.go
similarity index 94%
rename from goformation/generate/resource_test.go
rename to pkg/goformation/generate/resource_test.go
index 91f93b546c..1339b1e5fd 100644
--- a/goformation/generate/resource_test.go
+++ b/pkg/goformation/generate/resource_test.go
@@ -3,12 +3,12 @@ package main_test
 import (
 	"encoding/json"
 
-	"github.com/awslabs/goformation/v4/cloudformation/rds"
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/rds"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
-	"github.com/awslabs/goformation/v4/cloudformation/ec2"
-	"github.com/awslabs/goformation/v4/cloudformation/s3"
-	"github.com/awslabs/goformation/v4/cloudformation/serverless"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/ec2"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/s3"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/serverless"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/goformation/generate/sam-2016-10-31.json b/pkg/goformation/generate/sam-2016-10-31.json
similarity index 100%
rename from goformation/generate/sam-2016-10-31.json
rename to pkg/goformation/generate/sam-2016-10-31.json
diff --git a/goformation/generate/spec.go b/pkg/goformation/generate/spec.go
similarity index 100%
rename from goformation/generate/spec.go
rename to pkg/goformation/generate/spec.go
diff --git a/goformation/generate/templates/all.template b/pkg/goformation/generate/templates/all.template
similarity index 100%
rename from goformation/generate/templates/all.template
rename to pkg/goformation/generate/templates/all.template
diff --git a/goformation/generate/templates/polymorphic-property.template b/pkg/goformation/generate/templates/polymorphic-property.template
similarity index 100%
rename from goformation/generate/templates/polymorphic-property.template
rename to pkg/goformation/generate/templates/polymorphic-property.template
diff --git a/goformation/generate/templates/resource.template b/pkg/goformation/generate/templates/resource.template
similarity index 100%
rename from goformation/generate/templates/resource.template
rename to pkg/goformation/generate/templates/resource.template
diff --git a/goformation/generate/templates/schema-property.template b/pkg/goformation/generate/templates/schema-property.template
similarity index 100%
rename from goformation/generate/templates/schema-property.template
rename to pkg/goformation/generate/templates/schema-property.template
diff --git a/goformation/generate/templates/schema-resource.template b/pkg/goformation/generate/templates/schema-resource.template
similarity index 100%
rename from goformation/generate/templates/schema-resource.template
rename to pkg/goformation/generate/templates/schema-resource.template
diff --git a/goformation/generate/templates/schema.template b/pkg/goformation/generate/templates/schema.template
similarity index 100%
rename from goformation/generate/templates/schema.template
rename to pkg/goformation/generate/templates/schema.template
diff --git a/goformation/goformation.go b/pkg/goformation/goformation.go
similarity index 94%
rename from goformation/goformation.go
rename to pkg/goformation/goformation.go
index 5f62978981..0bd5d97b35 100644
--- a/goformation/goformation.go
+++ b/pkg/goformation/goformation.go
@@ -5,8 +5,8 @@ import (
 	"io/ioutil"
 	"strings"
 
-	"github.com/awslabs/goformation/v4/cloudformation"
-	"github.com/awslabs/goformation/v4/intrinsics"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/intrinsics"
 )
 
 //go:generate generate/generate.sh
diff --git a/goformation/goformation_schema_test.go b/pkg/goformation/goformation_schema_test.go
similarity index 100%
rename from goformation/goformation_schema_test.go
rename to pkg/goformation/goformation_schema_test.go
diff --git a/goformation/goformation_suite_test.go b/pkg/goformation/goformation_suite_test.go
similarity index 100%
rename from goformation/goformation_suite_test.go
rename to pkg/goformation/goformation_suite_test.go
diff --git a/goformation/goformation_test.go b/pkg/goformation/goformation_test.go
similarity index 98%
rename from goformation/goformation_test.go
rename to pkg/goformation/goformation_test.go
index dfb58ccf3a..1a58b78b3f 100644
--- a/goformation/goformation_test.go
+++ b/pkg/goformation/goformation_test.go
@@ -7,17 +7,17 @@ import (
 
 	"github.com/sanathkr/yaml"
 
-	"github.com/awslabs/goformation/v4"
-	"github.com/awslabs/goformation/v4/cloudformation"
+	"github.com/weaveworks/eksctl/pkg/goformation"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation"
 
-	"github.com/awslabs/goformation/v4/cloudformation/lambda"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
-	"github.com/awslabs/goformation/v4/cloudformation/route53"
-	"github.com/awslabs/goformation/v4/cloudformation/s3"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/lambda"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/policies"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/route53"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/s3"
 
-	"github.com/awslabs/goformation/v4/cloudformation/serverless"
-	"github.com/awslabs/goformation/v4/cloudformation/sns"
-	. "github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/serverless"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/sns"
+	. "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/goformation/intrinsics/intrinsics.go b/pkg/goformation/intrinsics/intrinsics.go
similarity index 100%
rename from goformation/intrinsics/intrinsics.go
rename to pkg/goformation/intrinsics/intrinsics.go
diff --git a/goformation/intrinsics/intrinsics_suite_test.go b/pkg/goformation/intrinsics/intrinsics_suite_test.go
similarity index 100%
rename from goformation/intrinsics/intrinsics_suite_test.go
rename to pkg/goformation/intrinsics/intrinsics_suite_test.go
diff --git a/goformation/intrinsics/tags.go b/pkg/goformation/intrinsics/tags.go
similarity index 100%
rename from goformation/intrinsics/tags.go
rename to pkg/goformation/intrinsics/tags.go
diff --git a/goformation/schema/README.md b/pkg/goformation/schema/README.md
similarity index 100%
rename from goformation/schema/README.md
rename to pkg/goformation/schema/README.md
diff --git a/goformation/schema/cloudformation.go b/pkg/goformation/schema/cloudformation.go
similarity index 100%
rename from goformation/schema/cloudformation.go
rename to pkg/goformation/schema/cloudformation.go
diff --git a/goformation/schema/cloudformation.schema.json b/pkg/goformation/schema/cloudformation.schema.json
similarity index 100%
rename from goformation/schema/cloudformation.schema.json
rename to pkg/goformation/schema/cloudformation.schema.json
diff --git a/goformation/schema/sam.go b/pkg/goformation/schema/sam.go
similarity index 100%
rename from goformation/schema/sam.go
rename to pkg/goformation/schema/sam.go
diff --git a/goformation/schema/sam.schema.json b/pkg/goformation/schema/sam.schema.json
similarity index 100%
rename from goformation/schema/sam.schema.json
rename to pkg/goformation/schema/sam.schema.json
diff --git a/goformation/static/logo.png b/pkg/goformation/static/logo.png
similarity index 100%
rename from goformation/static/logo.png
rename to pkg/goformation/static/logo.png
diff --git a/goformation/test.go b/pkg/goformation/test.go
similarity index 100%
rename from goformation/test.go
rename to pkg/goformation/test.go
diff --git a/goformation/test/json/invalid-sam-template-no-transform.json b/pkg/goformation/test/json/invalid-sam-template-no-transform.json
similarity index 100%
rename from goformation/test/json/invalid-sam-template-no-transform.json
rename to pkg/goformation/test/json/invalid-sam-template-no-transform.json
diff --git a/goformation/test/json/invalid-sam-template-wrong-transform.json b/pkg/goformation/test/json/invalid-sam-template-wrong-transform.json
similarity index 100%
rename from goformation/test/json/invalid-sam-template-wrong-transform.json
rename to pkg/goformation/test/json/invalid-sam-template-wrong-transform.json
diff --git a/goformation/test/json/invalid-template-additional-property.json b/pkg/goformation/test/json/invalid-template-additional-property.json
similarity index 100%
rename from goformation/test/json/invalid-template-additional-property.json
rename to pkg/goformation/test/json/invalid-template-additional-property.json
diff --git a/goformation/test/json/invalid-template-additional-resource-property.json b/pkg/goformation/test/json/invalid-template-additional-resource-property.json
similarity index 100%
rename from goformation/test/json/invalid-template-additional-resource-property.json
rename to pkg/goformation/test/json/invalid-template-additional-resource-property.json
diff --git a/goformation/test/json/invalid-template-empty-resource-properties.json b/pkg/goformation/test/json/invalid-template-empty-resource-properties.json
similarity index 100%
rename from goformation/test/json/invalid-template-empty-resource-properties.json
rename to pkg/goformation/test/json/invalid-template-empty-resource-properties.json
diff --git a/goformation/test/json/invalid-template-invalid-resource-name.json b/pkg/goformation/test/json/invalid-template-invalid-resource-name.json
similarity index 100%
rename from goformation/test/json/invalid-template-invalid-resource-name.json
rename to pkg/goformation/test/json/invalid-template-invalid-resource-name.json
diff --git a/goformation/test/json/invalid-template-invalid-resource-subproperty.json b/pkg/goformation/test/json/invalid-template-invalid-resource-subproperty.json
similarity index 100%
rename from goformation/test/json/invalid-template-invalid-resource-subproperty.json
rename to pkg/goformation/test/json/invalid-template-invalid-resource-subproperty.json
diff --git a/goformation/test/json/invalid-template-missing-resource-properties.json b/pkg/goformation/test/json/invalid-template-missing-resource-properties.json
similarity index 100%
rename from goformation/test/json/invalid-template-missing-resource-properties.json
rename to pkg/goformation/test/json/invalid-template-missing-resource-properties.json
diff --git a/goformation/test/json/invalid-template-missing-resource-type.json b/pkg/goformation/test/json/invalid-template-missing-resource-type.json
similarity index 100%
rename from goformation/test/json/invalid-template-missing-resource-type.json
rename to pkg/goformation/test/json/invalid-template-missing-resource-type.json
diff --git a/goformation/test/json/invalid-template-missing-resources.json b/pkg/goformation/test/json/invalid-template-missing-resources.json
similarity index 100%
rename from goformation/test/json/invalid-template-missing-resources.json
rename to pkg/goformation/test/json/invalid-template-missing-resources.json
diff --git a/goformation/test/json/invalid-template-subproperty-missing-property.json b/pkg/goformation/test/json/invalid-template-subproperty-missing-property.json
similarity index 100%
rename from goformation/test/json/invalid-template-subproperty-missing-property.json
rename to pkg/goformation/test/json/invalid-template-subproperty-missing-property.json
diff --git a/goformation/test/json/invalid-template-unknown-resource-type.json b/pkg/goformation/test/json/invalid-template-unknown-resource-type.json
similarity index 100%
rename from goformation/test/json/invalid-template-unknown-resource-type.json
rename to pkg/goformation/test/json/invalid-template-unknown-resource-type.json
diff --git a/goformation/test/json/invalid-template-unknown-subproperty-property.json b/pkg/goformation/test/json/invalid-template-unknown-subproperty-property.json
similarity index 100%
rename from goformation/test/json/invalid-template-unknown-subproperty-property.json
rename to pkg/goformation/test/json/invalid-template-unknown-subproperty-property.json
diff --git a/goformation/test/json/resource-with-tags.json b/pkg/goformation/test/json/resource-with-tags.json
similarity index 100%
rename from goformation/test/json/resource-with-tags.json
rename to pkg/goformation/test/json/resource-with-tags.json
diff --git a/goformation/test/json/valid-sam-template.json b/pkg/goformation/test/json/valid-sam-template.json
similarity index 100%
rename from goformation/test/json/valid-sam-template.json
rename to pkg/goformation/test/json/valid-sam-template.json
diff --git a/goformation/test/json/valid-template-resource-attributes.json b/pkg/goformation/test/json/valid-template-resource-attributes.json
similarity index 100%
rename from goformation/test/json/valid-template-resource-attributes.json
rename to pkg/goformation/test/json/valid-template-resource-attributes.json
diff --git a/goformation/test/json/valid-template-with-fns.json b/pkg/goformation/test/json/valid-template-with-fns.json
similarity index 100%
rename from goformation/test/json/valid-template-with-fns.json
rename to pkg/goformation/test/json/valid-template-with-fns.json
diff --git a/goformation/test/json/valid-template.json b/pkg/goformation/test/json/valid-template.json
similarity index 100%
rename from goformation/test/json/valid-template.json
rename to pkg/goformation/test/json/valid-template.json
diff --git a/goformation/test/yaml/api-swagger-plain.yaml b/pkg/goformation/test/yaml/api-swagger-plain.yaml
similarity index 100%
rename from goformation/test/yaml/api-swagger-plain.yaml
rename to pkg/goformation/test/yaml/api-swagger-plain.yaml
diff --git a/goformation/test/yaml/aws-serverless-api-string-or-cors-configuration.yaml b/pkg/goformation/test/yaml/aws-serverless-api-string-or-cors-configuration.yaml
similarity index 100%
rename from goformation/test/yaml/aws-serverless-api-string-or-cors-configuration.yaml
rename to pkg/goformation/test/yaml/aws-serverless-api-string-or-cors-configuration.yaml
diff --git a/goformation/test/yaml/aws-serverless-api-swagger.yaml b/pkg/goformation/test/yaml/aws-serverless-api-swagger.yaml
similarity index 100%
rename from goformation/test/yaml/aws-serverless-api-swagger.yaml
rename to pkg/goformation/test/yaml/aws-serverless-api-swagger.yaml
diff --git a/goformation/test/yaml/aws-serverless-api.yaml b/pkg/goformation/test/yaml/aws-serverless-api.yaml
similarity index 100%
rename from goformation/test/yaml/aws-serverless-api.yaml
rename to pkg/goformation/test/yaml/aws-serverless-api.yaml
diff --git a/goformation/test/yaml/aws-serverless-function-2016-10-31.yaml b/pkg/goformation/test/yaml/aws-serverless-function-2016-10-31.yaml
similarity index 100%
rename from goformation/test/yaml/aws-serverless-function-2016-10-31.yaml
rename to pkg/goformation/test/yaml/aws-serverless-function-2016-10-31.yaml
diff --git a/goformation/test/yaml/aws-serverless-function-api-event.yaml b/pkg/goformation/test/yaml/aws-serverless-function-api-event.yaml
similarity index 100%
rename from goformation/test/yaml/aws-serverless-function-api-event.yaml
rename to pkg/goformation/test/yaml/aws-serverless-function-api-event.yaml
diff --git a/goformation/test/yaml/aws-serverless-function-env-vars.yaml b/pkg/goformation/test/yaml/aws-serverless-function-env-vars.yaml
similarity index 100%
rename from goformation/test/yaml/aws-serverless-function-env-vars.yaml
rename to pkg/goformation/test/yaml/aws-serverless-function-env-vars.yaml
diff --git a/goformation/test/yaml/aws-serverless-function-string-or-s3-location.yaml b/pkg/goformation/test/yaml/aws-serverless-function-string-or-s3-location.yaml
similarity index 100%
rename from goformation/test/yaml/aws-serverless-function-string-or-s3-location.yaml
rename to pkg/goformation/test/yaml/aws-serverless-function-string-or-s3-location.yaml
diff --git a/goformation/test/yaml/aws-serverless-simpletable.yaml b/pkg/goformation/test/yaml/aws-serverless-simpletable.yaml
similarity index 100%
rename from goformation/test/yaml/aws-serverless-simpletable.yaml
rename to pkg/goformation/test/yaml/aws-serverless-simpletable.yaml
diff --git a/goformation/test/yaml/codestar/java.yml b/pkg/goformation/test/yaml/codestar/java.yml
similarity index 100%
rename from goformation/test/yaml/codestar/java.yml
rename to pkg/goformation/test/yaml/codestar/java.yml
diff --git a/goformation/test/yaml/codestar/nodejs.yml b/pkg/goformation/test/yaml/codestar/nodejs.yml
similarity index 100%
rename from goformation/test/yaml/codestar/nodejs.yml
rename to pkg/goformation/test/yaml/codestar/nodejs.yml
diff --git a/goformation/test/yaml/codestar/python.yml b/pkg/goformation/test/yaml/codestar/python.yml
similarity index 100%
rename from goformation/test/yaml/codestar/python.yml
rename to pkg/goformation/test/yaml/codestar/python.yml
diff --git a/goformation/test/yaml/custom-resource.yaml b/pkg/goformation/test/yaml/custom-resource.yaml
similarity index 100%
rename from goformation/test/yaml/custom-resource.yaml
rename to pkg/goformation/test/yaml/custom-resource.yaml
diff --git a/goformation/test/yaml/output_section.yaml b/pkg/goformation/test/yaml/output_section.yaml
similarity index 100%
rename from goformation/test/yaml/output_section.yaml
rename to pkg/goformation/test/yaml/output_section.yaml
diff --git a/goformation/test/yaml/sam-official-samples/alexa_skill/index.js b/pkg/goformation/test/yaml/sam-official-samples/alexa_skill/index.js
similarity index 100%
rename from goformation/test/yaml/sam-official-samples/alexa_skill/index.js
rename to pkg/goformation/test/yaml/sam-official-samples/alexa_skill/index.js
diff --git a/goformation/test/yaml/sam-official-samples/alexa_skill/template.yaml b/pkg/goformation/test/yaml/sam-official-samples/alexa_skill/template.yaml
similarity index 100%
rename from goformation/test/yaml/sam-official-samples/alexa_skill/template.yaml
rename to pkg/goformation/test/yaml/sam-official-samples/alexa_skill/template.yaml
diff --git a/goformation/test/yaml/sam-official-samples/api-swagger-intrinsic.yaml b/pkg/goformation/test/yaml/sam-official-samples/api-swagger-intrinsic.yaml
similarity index 100%
rename from goformation/test/yaml/sam-official-samples/api-swagger-intrinsic.yaml
rename to pkg/goformation/test/yaml/sam-official-samples/api-swagger-intrinsic.yaml
diff --git a/goformation/test/yaml/sam-official-samples/api-swagger-plain.yaml b/pkg/goformation/test/yaml/sam-official-samples/api-swagger-plain.yaml
similarity index 100%
rename from goformation/test/yaml/sam-official-samples/api-swagger-plain.yaml
rename to pkg/goformation/test/yaml/sam-official-samples/api-swagger-plain.yaml
diff --git a/goformation/test/yaml/sam-official-samples/api_backend/index.js b/pkg/goformation/test/yaml/sam-official-samples/api_backend/index.js
similarity index 100%
rename from goformation/test/yaml/sam-official-samples/api_backend/index.js
rename to pkg/goformation/test/yaml/sam-official-samples/api_backend/index.js
diff --git a/goformation/test/yaml/sam-official-samples/api_backend/template.yaml b/pkg/goformation/test/yaml/sam-official-samples/api_backend/template.yaml
similarity index 100%
rename from goformation/test/yaml/sam-official-samples/api_backend/template.yaml
rename to pkg/goformation/test/yaml/sam-official-samples/api_backend/template.yaml
diff --git a/goformation/test/yaml/sam-official-samples/api_swagger_cors/index.js b/pkg/goformation/test/yaml/sam-official-samples/api_swagger_cors/index.js
similarity index 100%
rename from goformation/test/yaml/sam-official-samples/api_swagger_cors/index.js
rename to pkg/goformation/test/yaml/sam-official-samples/api_swagger_cors/index.js
diff --git a/goformation/test/yaml/sam-official-samples/api_swagger_cors/swagger.yaml b/pkg/goformation/test/yaml/sam-official-samples/api_swagger_cors/swagger.yaml
similarity index 100%
rename from goformation/test/yaml/sam-official-samples/api_swagger_cors/swagger.yaml
rename to pkg/goformation/test/yaml/sam-official-samples/api_swagger_cors/swagger.yaml
diff --git a/goformation/test/yaml/sam-official-samples/api_swagger_cors/template.yaml b/pkg/goformation/test/yaml/sam-official-samples/api_swagger_cors/template.yaml
similarity index 100%
rename from goformation/test/yaml/sam-official-samples/api_swagger_cors/template.yaml
rename to pkg/goformation/test/yaml/sam-official-samples/api_swagger_cors/template.yaml
diff --git a/goformation/test/yaml/sam-official-samples/codestar-node4.3.yaml b/pkg/goformation/test/yaml/sam-official-samples/codestar-node4.3.yaml
similarity index 100%
rename from goformation/test/yaml/sam-official-samples/codestar-node4.3.yaml
rename to pkg/goformation/test/yaml/sam-official-samples/codestar-node4.3.yaml
diff --git a/goformation/test/yaml/sam-official-samples/encryption_proxy/README.MD b/pkg/goformation/test/yaml/sam-official-samples/encryption_proxy/README.MD
similarity index 100%
rename from goformation/test/yaml/sam-official-samples/encryption_proxy/README.MD
rename to pkg/goformation/test/yaml/sam-official-samples/encryption_proxy/README.MD
diff --git a/goformation/test/yaml/sam-official-samples/encryption_proxy/decryption.py b/pkg/goformation/test/yaml/sam-official-samples/encryption_proxy/decryption.py
similarity index 100%
rename from goformation/test/yaml/sam-official-samples/encryption_proxy/decryption.py
rename to pkg/goformation/test/yaml/sam-official-samples/encryption_proxy/decryption.py
diff --git a/goformation/test/yaml/sam-official-samples/encryption_proxy/encryption.py b/pkg/goformation/test/yaml/sam-official-samples/encryption_proxy/encryption.py
similarity index 100%
rename from goformation/test/yaml/sam-official-samples/encryption_proxy/encryption.py
rename to pkg/goformation/test/yaml/sam-official-samples/encryption_proxy/encryption.py
diff --git a/goformation/test/yaml/sam-official-samples/encryption_proxy/template.yaml b/pkg/goformation/test/yaml/sam-official-samples/encryption_proxy/template.yaml
similarity index 100%
rename from goformation/test/yaml/sam-official-samples/encryption_proxy/template.yaml
rename to pkg/goformation/test/yaml/sam-official-samples/encryption_proxy/template.yaml
diff --git a/goformation/test/yaml/sam-official-samples/function.yaml b/pkg/goformation/test/yaml/sam-official-samples/function.yaml
similarity index 100%
rename from goformation/test/yaml/sam-official-samples/function.yaml
rename to pkg/goformation/test/yaml/sam-official-samples/function.yaml
diff --git a/goformation/test/yaml/sam-official-samples/hello_world/index.js b/pkg/goformation/test/yaml/sam-official-samples/hello_world/index.js
similarity index 100%
rename from goformation/test/yaml/sam-official-samples/hello_world/index.js
rename to pkg/goformation/test/yaml/sam-official-samples/hello_world/index.js
diff --git a/goformation/test/yaml/sam-official-samples/hello_world/template.yaml b/pkg/goformation/test/yaml/sam-official-samples/hello_world/template.yaml
similarity index 100%
rename from goformation/test/yaml/sam-official-samples/hello_world/template.yaml
rename to pkg/goformation/test/yaml/sam-official-samples/hello_world/template.yaml
diff --git a/goformation/test/yaml/sam-official-samples/inline_swagger/index.js b/pkg/goformation/test/yaml/sam-official-samples/inline_swagger/index.js
similarity index 100%
rename from goformation/test/yaml/sam-official-samples/inline_swagger/index.js
rename to pkg/goformation/test/yaml/sam-official-samples/inline_swagger/index.js
diff --git a/goformation/test/yaml/sam-official-samples/inline_swagger/template.yaml b/pkg/goformation/test/yaml/sam-official-samples/inline_swagger/template.yaml
similarity index 100%
rename from goformation/test/yaml/sam-official-samples/inline_swagger/template.yaml
rename to pkg/goformation/test/yaml/sam-official-samples/inline_swagger/template.yaml
diff --git a/goformation/test/yaml/sam-official-samples/iot_backend/index.js b/pkg/goformation/test/yaml/sam-official-samples/iot_backend/index.js
similarity index 100%
rename from goformation/test/yaml/sam-official-samples/iot_backend/index.js
rename to pkg/goformation/test/yaml/sam-official-samples/iot_backend/index.js
diff --git a/goformation/test/yaml/sam-official-samples/iot_backend/template.yaml b/pkg/goformation/test/yaml/sam-official-samples/iot_backend/template.yaml
similarity index 100%
rename from goformation/test/yaml/sam-official-samples/iot_backend/template.yaml
rename to pkg/goformation/test/yaml/sam-official-samples/iot_backend/template.yaml
diff --git a/goformation/test/yaml/sam-official-samples/s3_processor/index.js b/pkg/goformation/test/yaml/sam-official-samples/s3_processor/index.js
similarity index 100%
rename from goformation/test/yaml/sam-official-samples/s3_processor/index.js
rename to pkg/goformation/test/yaml/sam-official-samples/s3_processor/index.js
diff --git a/goformation/test/yaml/sam-official-samples/s3_processor/template.yaml b/pkg/goformation/test/yaml/sam-official-samples/s3_processor/template.yaml
similarity index 100%
rename from goformation/test/yaml/sam-official-samples/s3_processor/template.yaml
rename to pkg/goformation/test/yaml/sam-official-samples/s3_processor/template.yaml
diff --git a/goformation/test/yaml/sam-official-samples/schedule/index.js b/pkg/goformation/test/yaml/sam-official-samples/schedule/index.js
similarity index 100%
rename from goformation/test/yaml/sam-official-samples/schedule/index.js
rename to pkg/goformation/test/yaml/sam-official-samples/schedule/index.js
diff --git a/goformation/test/yaml/sam-official-samples/schedule/template.yaml b/pkg/goformation/test/yaml/sam-official-samples/schedule/template.yaml
similarity index 100%
rename from goformation/test/yaml/sam-official-samples/schedule/template.yaml
rename to pkg/goformation/test/yaml/sam-official-samples/schedule/template.yaml
diff --git a/goformation/test/yaml/sam-official-samples/stream_processor/index.js b/pkg/goformation/test/yaml/sam-official-samples/stream_processor/index.js
similarity index 100%
rename from goformation/test/yaml/sam-official-samples/stream_processor/index.js
rename to pkg/goformation/test/yaml/sam-official-samples/stream_processor/index.js
diff --git a/goformation/test/yaml/sam-official-samples/stream_processor/template.yaml b/pkg/goformation/test/yaml/sam-official-samples/stream_processor/template.yaml
similarity index 100%
rename from goformation/test/yaml/sam-official-samples/stream_processor/template.yaml
rename to pkg/goformation/test/yaml/sam-official-samples/stream_processor/template.yaml
diff --git a/goformation/test/yaml/sam-official-samples/templates/basic.yaml b/pkg/goformation/test/yaml/sam-official-samples/templates/basic.yaml
similarity index 100%
rename from goformation/test/yaml/sam-official-samples/templates/basic.yaml
rename to pkg/goformation/test/yaml/sam-official-samples/templates/basic.yaml
diff --git a/goformation/test/yaml/sam-official-samples/templates/intrinsic.yaml b/pkg/goformation/test/yaml/sam-official-samples/templates/intrinsic.yaml
similarity index 100%
rename from goformation/test/yaml/sam-official-samples/templates/intrinsic.yaml
rename to pkg/goformation/test/yaml/sam-official-samples/templates/intrinsic.yaml
diff --git a/goformation/test/yaml/sam-official-samples/templates/wrong.yaml b/pkg/goformation/test/yaml/sam-official-samples/templates/wrong.yaml
similarity index 100%
rename from goformation/test/yaml/sam-official-samples/templates/wrong.yaml
rename to pkg/goformation/test/yaml/sam-official-samples/templates/wrong.yaml
diff --git a/goformation/test/yaml/transform-multiple.yaml b/pkg/goformation/test/yaml/transform-multiple.yaml
similarity index 100%
rename from goformation/test/yaml/transform-multiple.yaml
rename to pkg/goformation/test/yaml/transform-multiple.yaml
diff --git a/goformation/test/yaml/transform-single.yaml b/pkg/goformation/test/yaml/transform-single.yaml
similarity index 100%
rename from goformation/test/yaml/transform-single.yaml
rename to pkg/goformation/test/yaml/transform-single.yaml
diff --git a/goformation/test/yaml/validation-errors/no-resources-section.yaml b/pkg/goformation/test/yaml/validation-errors/no-resources-section.yaml
similarity index 100%
rename from goformation/test/yaml/validation-errors/no-resources-section.yaml
rename to pkg/goformation/test/yaml/validation-errors/no-resources-section.yaml
diff --git a/goformation/test/yaml/yaml-intrinsic-tags.yaml b/pkg/goformation/test/yaml/yaml-intrinsic-tags.yaml
similarity index 100%
rename from goformation/test/yaml/yaml-intrinsic-tags.yaml
rename to pkg/goformation/test/yaml/yaml-intrinsic-tags.yaml
diff --git a/pkg/vpc/fakes/fake_vpc_importer.go b/pkg/vpc/fakes/fake_vpc_importer.go
index 25337717f8..fedb1a745b 100644
--- a/pkg/vpc/fakes/fake_vpc_importer.go
+++ b/pkg/vpc/fakes/fake_vpc_importer.go
@@ -4,7 +4,7 @@ package fakes
 import (
 	"sync"
 
-	"github.com/awslabs/goformation/v4/cloudformation/types"
+	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 	"github.com/weaveworks/eksctl/pkg/vpc"
 )
 
diff --git a/pkg/vpc/importer.go b/pkg/vpc/importer.go
index 2e3d57a468..c63c0ca8f3 100644
--- a/pkg/vpc/importer.go
+++ b/pkg/vpc/importer.go
@@ -3,7 +3,7 @@ package vpc
 import (
 	"fmt"
 
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/cfn/outputs"
diff --git a/pkg/vpc/importer_test.go b/pkg/vpc/importer_test.go
index 0a3d62dc48..10c5a39737 100644
--- a/pkg/vpc/importer_test.go
+++ b/pkg/vpc/importer_test.go
@@ -1,7 +1,7 @@
 package vpc
 
 import (
-	gfnt "github.com/awslabs/goformation/v4/cloudformation/types"
+	gfnt "github.com/weaveworks/eksctl/pkg/goformation/cloudformation/types"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"