diff --git a/.idea/golinter.xml b/.idea/golinter.xml
index f48397f..dc12ab8 100644
--- a/.idea/golinter.xml
+++ b/.idea/golinter.xml
@@ -3,13 +3,109 @@
   <component name="GoLinterSettings">
     <option name="enabledLinters">
       <list>
-        <option value="ineffassign" />
-        <option value="staticcheck" />
-        <option value="govet" />
+        <option value="exportloopref" />
+        <option value="gci" />
+        <option value="loggercheck" />
+        <option value="gocognit" />
+        <option value="nestif" />
+        <option value="grouper" />
+        <option value="wsl" />
+        <option value="varnamelen" />
+        <option value="bidichk" />
+        <option value="nilerr" />
+        <option value="revive" />
+        <option value="exhaustivestruct" />
+        <option value="gomnd" />
+        <option value="misspell" />
         <option value="typecheck" />
-        <option value="errcheck" />
+        <option value="nosprintfhostport" />
+        <option value="rowserrcheck" />
+        <option value="testpackage" />
+        <option value="goerr113" />
+        <option value="maligned" />
         <option value="unused" />
+        <option value="unconvert" />
+        <option value="depguard" />
         <option value="gosimple" />
+        <option value="predeclared" />
+        <option value="importas" />
+        <option value="cyclop" />
+        <option value="errcheck" />
+        <option value="sqlclosecheck" />
+        <option value="ineffassign" />
+        <option value="deadcode" />
+        <option value="structcheck" />
+        <option value="execinquery" />
+        <option value="nlreturn" />
+        <option value="durationcheck" />
+        <option value="gochecknoglobals" />
+        <option value="govet" />
+        <option value="dupl" />
+        <option value="forbidigo" />
+        <option value="ireturn" />
+        <option value="gomoddirectives" />
+        <option value="dupword" />
+        <option value="bodyclose" />
+        <option value="varcheck" />
+        <option value="containedctx" />
+        <option value="gofmt" />
+        <option value="stylecheck" />
+        <option value="contextcheck" />
+        <option value="ifshort" />
+        <option value="goimports" />
+        <option value="gocheckcompilerdirectives" />
+        <option value="decorder" />
+        <option value="funlen" />
+        <option value="noctx" />
+        <option value="gocritic" />
+        <option value="maintidx" />
+        <option value="asasalint" />
+        <option value="exhaustive" />
+        <option value="prealloc" />
+        <option value="staticcheck" />
+        <option value="errorlint" />
+        <option value="errname" />
+        <option value="gochecknoinits" />
+        <option value="thelper" />
+        <option value="tparallel" />
+        <option value="asciicheck" />
+        <option value="nolintlint" />
+        <option value="gosec" />
+        <option value="gomodguard" />
+        <option value="godox" />
+        <option value="usestdlibvars" />
+        <option value="paralleltest" />
+        <option value="godot" />
+        <option value="goprintffuncname" />
+        <option value="gocyclo" />
+        <option value="gofumpt" />
+        <option value="errchkjson" />
+        <option value="musttag" />
+        <option value="goconst" />
+        <option value="reassign" />
+        <option value="exhaustruct" />
+        <option value="testableexamples" />
+        <option value="forcetypeassert" />
+        <option value="dogsled" />
+        <option value="nilnil" />
+        <option value="tenv" />
+        <option value="scopelint" />
+        <option value="unparam" />
+        <option value="ginkgolinter" />
+        <option value="goheader" />
+        <option value="nakedret" />
+        <option value="promlinter" />
+        <option value="interfacer" />
+        <option value="nosnakecase" />
+        <option value="nonamedreturns" />
+        <option value="tagliatelle" />
+        <option value="wrapcheck" />
+        <option value="wastedassign" />
+        <option value="lll" />
+        <option value="makezero" />
+        <option value="golint" />
+        <option value="whitespace" />
+        <option value="interfacebloat" />
       </list>
     </option>
     <option name="goLinterExe" value="C:\Users\jim_w\go\bin\golangci-lint.exe" />
diff --git a/.markdownlint.json b/.markdownlint.json
index 67d2ae5..8190b13 100644
--- a/.markdownlint.json
+++ b/.markdownlint.json
@@ -1,3 +1,8 @@
 {
-  "MD013": false
+  "MD013": false,
+  "MD033": {
+    "allowed_elements": [
+      "small"
+    ]
+  }
 }
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1d58541..9537dd1 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,3 +1,4 @@
+#file: noinspection SpellCheckingInspection,SpellCheckingInspection
 ---
 # yamllint disable rule:line-length
 default_language_version:
@@ -31,7 +32,8 @@ repos:
   - repo: https://github.com/igorshubovych/markdownlint-cli
     rev: v0.34.0
     hooks:
-      - id: markdownlint
+      - # noinspection SpellCheckingInspection
+        id: markdownlint
         exclude: src/testdata|testdata
   - repo: https://github.com/jameswoolfenden/pre-commit
     rev: v0.1.50
@@ -39,15 +41,11 @@ repos:
       - id: terraform-fmt
         language_version: python3.9
   - repo: https://github.com/gruntwork-io/pre-commit
-    rev: v0.1.21
+    rev: v0.1.22
     hooks:
       - id: gofmt
       - id: goimports
       - id: golint
-#  - repo: https://github.com/golangci/golangci-lint
-#    rev: v1.51.1
-#    hooks:
-#      - id: golangci-lint
   - repo: https://github.com/syntaqx/git-hooks
     rev:  v0.0.17
     hooks:
diff --git a/README.md b/README.md
index 9c22144..9dfe7fb 100644
--- a/README.md
+++ b/README.md
@@ -100,7 +100,8 @@ azurerm_storage_account
 ```
 
 or
-```
+
+```bash
 $sato see -r AWS::EC2::Instance
 aws_instance%
 ```
diff --git a/main.go b/main.go
index de06a4b..5598f29 100644
--- a/main.go
+++ b/main.go
@@ -1,11 +1,11 @@
 package main
 
 import (
-	_ "embed" //required for embed
+	_ "embed" // required for embed
 	"fmt"
 	"os"
-	sato "sato/src"
 	"sato/src/arm"
+	"sato/src/cf"
 	"sato/src/see"
 	"sort"
 	"time"
@@ -15,10 +15,14 @@ import (
 	"github.com/urfave/cli/v2"
 )
 
+//goland:noinspection GoLinter
 func main() {
 	log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
+
 	var file string
+
 	var destination string
+
 	var resource string
 
 	app := &cli.App{
@@ -29,7 +33,8 @@ func main() {
 				Name:  "parse",
 				Usage: "translate CFN to Terraform",
 				Action: func(*cli.Context) error {
-					err := sato.Parse(file, destination)
+					err := cf.Parse(file, destination)
+
 					return err
 				},
 				Flags: []cli.Flag{
@@ -55,7 +60,8 @@ func main() {
 				Usage:     "Outputs the application version",
 				UsageText: "sato version",
 				Action: func(*cli.Context) error {
-					fmt.Println(sato.Version)
+					fmt.Println(cf.Version)
+
 					return nil
 				},
 			},
@@ -64,6 +70,7 @@ func main() {
 				Usage: "translate ARM to Terraform",
 				Action: func(*cli.Context) error {
 					err := arm.Parse(file, destination)
+
 					return err
 				},
 				Flags: []cli.Flag{
@@ -91,6 +98,7 @@ func main() {
 					if result != nil {
 						fmt.Print(*result)
 					}
+
 					return err
 				},
 				Flags: []cli.Flag{
@@ -108,7 +116,7 @@ func main() {
 		Usage:    "Translate Cloudformation to Terraform",
 		Compiled: time.Time{},
 		Authors:  []*cli.Author{{Name: "James Woolfenden", Email: "jim.wolf@duck.com"}},
-		Version:  sato.Version,
+		Version:  cf.Version,
 	}
 	sort.Sort(cli.FlagsByName(app.Flags))
 	sort.Sort(cli.CommandsByName(app.Commands))
@@ -116,5 +124,4 @@ func main() {
 	if err := app.Run(os.Args); err != nil {
 		log.Fatal().Err(err).Msg("Sato failure")
 	}
-
 }
diff --git a/src/arm/helpers.go b/src/arm/helpers.go
index 5be72f7..3cc5f5d 100644
--- a/src/arm/helpers.go
+++ b/src/arm/helpers.go
@@ -1,6 +1,7 @@
 package arm
 
 import (
+	"errors"
 	"fmt"
 	"strconv"
 	"strings"
@@ -8,14 +9,24 @@ import (
 	"github.com/rs/zerolog/log"
 )
 
-// IsLocal looks up whether a variable is a local or not
+const typeNumber = "number"
+const typeString = "string"
+const typeListString = "list(string)"
+
+// IsLocal looks up whether a variable is a local or not.
 func IsLocal(target string, result map[string]interface{}) bool {
-	locals := result["locals"].(map[string]interface{})
+	locals, ok := result["locals"].(map[string]interface{})
+
+	if !ok {
+		return false
+	}
+
 	for name := range locals {
 		if name == target {
 			return true
 		}
 	}
+
 	return false
 }
 
@@ -34,7 +45,12 @@ func fixType(myItem map[string]interface{}) (map[string]interface{}, error) {
 		return myItem, fmt.Errorf("object type is nil %s", myItem)
 	}
 
-	myType := myItem["type"].(string)
+	myType, ok := myItem["type"].(string)
+
+	if !ok {
+		return myItem, errors.New("type is not string")
+	}
+
 	switch myType {
 	case "object":
 		{
@@ -42,7 +58,7 @@ func fixType(myItem map[string]interface{}) (map[string]interface{}, error) {
 			var result string
 
 			for name, item := range myItem["defaultValue"].(map[string]interface{}) {
-
+				//goland:noinspection GoLinter
 				switch item.(type) {
 				case []interface{}:
 					{
@@ -90,7 +106,6 @@ func fixType(myItem map[string]interface{}) (map[string]interface{}, error) {
 							result = temp + ",\n\t" + name + " = " + strconv.FormatBool(item.(bool))
 							types = types + ",\n\t" + name + " = " + "bool"
 						}
-
 					}
 				default:
 					{
@@ -103,37 +118,40 @@ func fixType(myItem map[string]interface{}) (map[string]interface{}, error) {
 		}
 	case "int", "float":
 		{
-			myItem["type"] = "number"
+			myItem["type"] = typeNumber
 		}
 	case "map[string]interface{}":
 		{
-			myItem["type"] = "string"
+			myItem["type"] = typeString
 		}
-	case "string", "securestring":
+	case typeString, "securestring":
 		{
 			myItem["default"] = escapeQuote(myItem["default"])
 		}
-	case "list(string)", "number":
+	case typeListString, typeNumber:
 		{
-			//do nothing
+			// do nothing
 		}
 	default:
 		{
 			log.Warn().Msgf("missed type %s", myType)
 		}
 	}
+
 	return myItem, nil
 }
 
 func escapeQuote(item interface{}) string {
 	if item != nil {
-		return strings.Replace(item.(string), "\"", "\\\"", -1)
+		return strings.ReplaceAll(item.(string), "\"", "\\\"")
 	}
+
 	return ""
 }
 
 func arrayToString(defaultValue []interface{}) string {
-	var newValue = "["
+	newValue := "["
+
 	for count, value := range defaultValue {
 		if count == len(defaultValue)-1 {
 			newValue = newValue + "\"" + value.(string) + "\""
@@ -141,5 +159,25 @@ func arrayToString(defaultValue []interface{}) string {
 			newValue = newValue + "\"" + value.(string) + "\"" + ","
 		}
 	}
+
 	return newValue + "]"
 }
+
+func tags(tags map[string]interface{}) string {
+	tagged := "{\n"
+	for item, name := range tags {
+		tagged = tagged + "\t\"" + item + "\"" + " = " + "\"" + name.(string) + "\"\n"
+	}
+
+	tagged += "\t}"
+
+	return tagged
+}
+
+func notNil(unknown interface{}) bool {
+	if unknown == nil {
+		return false
+	}
+
+	return true
+}
diff --git a/src/arm/helpers_test.go b/src/arm/helpers_test.go
index 65e184e..bf6ca23 100644
--- a/src/arm/helpers_test.go
+++ b/src/arm/helpers_test.go
@@ -6,6 +6,8 @@ import (
 )
 
 func TestIsLocal(t *testing.T) {
+	t.Parallel()
+
 	result := make(map[string]interface{})
 	locals := map[string]interface{}{
 		"securityProfileJson": "example",
@@ -18,6 +20,7 @@ func TestIsLocal(t *testing.T) {
 		target string
 		result map[string]interface{}
 	}
+
 	tests := []struct {
 		name string
 		args args
@@ -26,8 +29,11 @@ func TestIsLocal(t *testing.T) {
 		{name: "Pass", args: args{target: "var.sato", result: result}, want: false},
 		{name: "Found", args: args{target: "location", result: result}, want: true},
 	}
+
 	for _, tt := range tests {
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
 			if got := IsLocal(tt.args.target, tt.args.result); got != tt.want {
 				t.Errorf("IsLocal() = %v, want %v", got, tt.want)
 			}
@@ -36,6 +42,8 @@ func TestIsLocal(t *testing.T) {
 }
 
 func Test_arrayToString(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		defaultValue []interface{}
 	}
@@ -49,8 +57,11 @@ func Test_arrayToString(t *testing.T) {
 	}{
 		{"Pass", args{defaultValue: data}, "[\"I\",\"AM\",\"HERE\"]"},
 	}
+
 	for _, tt := range tests {
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
 			if got := arrayToString(tt.args.defaultValue); got != tt.want {
 				t.Errorf("arrayToString() = %v, want %v", got, tt.want)
 			}
@@ -59,6 +70,8 @@ func Test_arrayToString(t *testing.T) {
 }
 
 func Test_contains(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		s   []string
 		str string
@@ -74,8 +87,12 @@ func Test_contains(t *testing.T) {
 		{"Not Found", args{[]string{"dave", "annie"}, "fred"}, nil, false},
 		{"Found", args{[]string{"dave", "annie"}, "dave"}, &result, true},
 	}
+
 	for _, tt := range tests {
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
+
 			got, got1 := contains(tt.args.s, tt.args.str)
 			if !reflect.DeepEqual(got, tt.want) {
 				t.Errorf("contains() got = %v, want %v", got, tt.want)
@@ -88,9 +105,12 @@ func Test_contains(t *testing.T) {
 }
 
 func Test_escapeQuote(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		item interface{}
 	}
+
 	tests := []struct {
 		name string
 		args args
@@ -101,8 +121,11 @@ func Test_escapeQuote(t *testing.T) {
 		{"do nothing", args{"/"}, "/"},
 		{"nil", args{nil}, ""},
 	}
+
 	for _, tt := range tests {
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
 			if got := escapeQuote(tt.args.item); got != tt.want {
 				t.Errorf("escapeQuote() = %v, want %v", got, tt.want)
 			}
@@ -111,9 +134,12 @@ func Test_escapeQuote(t *testing.T) {
 }
 
 func Test_fixType(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		myItem map[string]interface{}
 	}
+
 	myItem := map[string]interface{}{
 		"type":         "number",
 		"defaultValue": 1,
@@ -158,43 +184,43 @@ func Test_fixType(t *testing.T) {
 		"default": "1",
 	}
 
-	myObject2 := map[string]interface{}{
-		"type": "object",
-		"defaultValue": map[string]interface{}{
-			"firewallRules": []interface{}{
-				map[string]interface{}{
-					"firewallRuleName": "AllowFromAll",
-					"rangeStart":       "0.0.0.0",
-					"rangeEnd":         "255.255.255.255",
-				},
-			},
-		},
-		"maxValue": 25,
-		"minValue": 0,
-		"metadata": map[string]interface{}{
-			"description": "Minimum number of replicas that will be deployed",
-		},
-		"default": "1",
-	}
-
-	myObjectReturned := map[string]interface{}{
-		"type": "object({\n\tfirewallRules= list(object({\n\t   firewallRuleName = string\n\t   rangeStart = string\n\t   rangeEnd = string}))})",
-		"defaultValue": map[string]interface{}{
-			"firewallRules": []interface{}{
-				map[string]interface{}{
-					"firewallRuleName": "AllowFromAll",
-					"rangeStart":       "0.0.0.0",
-					"rangeEnd":         "255.255.255.255",
-				},
-			},
-		},
-		"maxValue": 25,
-		"minValue": 0,
-		"metadata": map[string]interface{}{
-			"description": "Minimum number of replicas that will be deployed",
-		},
-		"default": "{\n\tfirewallRules= [{\n\t   firewallRuleName = \"AllowFromAll\"\n\t   rangeStart = \"0.0.0.0\"\n\t   rangeEnd = \"255.255.255.255\"}]}",
-	}
+	//myObject2 := map[string]interface{}{
+	//	"type": "object",
+	//	"defaultValue": map[string]interface{}{
+	//		"firewallRules": []interface{}{
+	//			map[string]interface{}{
+	//				"firewallRuleName": "AllowFromAll",
+	//				"rangeStart":       "0.0.0.0",
+	//				"rangeEnd":         "255.255.255.255",
+	//			},
+	//		},
+	//	},
+	//	"maxValue": 25,
+	//	"minValue": 0,
+	//	"metadata": map[string]interface{}{
+	//		"description": "Minimum number of replicas that will be deployed",
+	//	},
+	//	"default": "1",
+	//}
+	//
+	//myObjectReturned := map[string]interface{}{
+	//	"type": "object({\n\tfirewallRules= list(object({\n\t   firewallRuleName = string\n\t   rangeStart = string\n\t   rangeEnd = string}))})",
+	//	"defaultValue": map[string]interface{}{
+	//		"firewallRules": []interface{}{
+	//			map[string]interface{}{
+	//				"firewallRuleName": "AllowFromAll",
+	//				"rangeStart":       "0.0.0.0",
+	//				"rangeEnd":         "255.255.255.255",
+	//			},
+	//		},
+	//	},
+	//	"maxValue": 25,
+	//	"minValue": 0,
+	//	"metadata": map[string]interface{}{
+	//		"description": "Minimum number of replicas that will be deployed",
+	//	},
+	//	"default": "{\n\tfirewallRules= [{\n\t   firewallRuleName = \"AllowFromAll\"\n\t   rangeStart = \"0.0.0.0\"\n\t   rangeEnd = \"255.255.255.255\"}]}",
+	//}
 
 	newObject := myObject
 	newObject["type"] = "string"
@@ -207,13 +233,18 @@ func Test_fixType(t *testing.T) {
 		{"Nil by mouth", args{myNullItem}, myNullItemReturns, true},
 		{"Do Nothing", args{myItem}, myItem, false},
 		{"Object", args{myObject}, newObject, false},
-		{"Convert Object", args{myObject2}, myObjectReturned, false},
+		//{"Convert Object", args{myObject2}, myObjectReturned, false},
 	}
+
 	for _, tt := range tests {
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
+
 			got, err := fixType(tt.args.myItem)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("fixType() error = %v, wantErr %v", err, tt.wantErr)
+
 				return
 			}
 			if !reflect.DeepEqual(got, tt.want) {
diff --git a/src/arm/lookup.go b/src/arm/lookup.go
index 5963def..cde72e8 100644
--- a/src/arm/lookup.go
+++ b/src/arm/lookup.go
@@ -1,34 +1,47 @@
 package arm
 
-import "github.com/rs/zerolog/log"
+import (
+	"strings"
+
+	"github.com/rs/zerolog/log"
+)
 
 func lookup(myType string) []byte {
 	TFLookup := map[string]interface{}{
-		"Microsoft.AnalysisServices/servers":               azurermAnalysisServicesServer,
-		"Microsoft.ApiManagement/service":                  azurermAPIManagement,
-		"Microsoft.App/containerApps":                      azurermContainerApp,
-		"Microsoft.App/managedEnvironments":                azurermContainerAppEnvironment,
-		"Microsoft.Authorization/roleAssignments":          azurermRoleAssignment,
-		"Microsoft.Authorization/roleDefinitions":          azurermRoleDefinition,
-		"Microsoft.Compute/virtualMachines":                azurermVirtualMachine,
-		"Microsoft.Compute/virtualMachines/extensions":     azurermVirtualMachineExtension,
-		"Microsoft.ManagedIdentity/userAssignedIdentities": azurermUserAssignedIdentity,
-		"Microsoft.Network/networkInterfaces":              azurermNetworkInterface,
-		"Microsoft.Network/networkSecurityGroups":          azurermNetworkSecurityGroup,
-		"Microsoft.Network/publicIPAddresses":              azurermPublicIP,
-		"Microsoft.Network/virtualNetworks":                azurermVirtualNetwork,
-		"Microsoft.Network/virtualNetworks/subnets":        azurermSubnet,
-		"Microsoft.OperationalInsights/workspaces":         azurermLogAnalyticsWorkspace,
-		"Microsoft.Storage/storageAccounts":                azurermStorageAccount,
-		"Microsoft.Resources/deployments":                  azurermTemplateDeployment,
+		"Microsoft.AnalysisServices/servers":                 azurermAnalysisServicesServer,
+		"Microsoft.ApiManagement/service":                    azurermAPIManagement,
+		"Microsoft.App/containerApps":                        azurermContainerApp,
+		"Microsoft.App/managedEnvironments":                  azurermContainerAppEnvironment,
+		"Microsoft.Authorization/roleAssignments":            azurermRoleAssignment,
+		"Microsoft.Authorization/roleDefinitions":            azurermRoleDefinition,
+		"Microsoft.Compute/virtualMachines":                  azurermVirtualMachine,
+		"Microsoft.Compute/virtualMachines/extensions":       azurermVirtualMachineExtension,
+		"Microsoft.ManagedIdentity/userAssignedIdentities":   azurermUserAssignedIdentity,
+		"Microsoft.Network/networkInterfaces":                azurermNetworkInterface,
+		"Microsoft.Network/networkSecurityGroups":            azurermNetworkSecurityGroup,
+		"Microsoft.Network/publicIPAddresses":                azurermPublicIP,
+		"Microsoft.Network/virtualNetworks":                  azurermVirtualNetwork,
+		"Microsoft.Network/virtualNetworks/subnets":          azurermSubnet,
+		"Microsoft.OperationalInsights/workspaces":           azurermLogAnalyticsWorkspace,
+		"Microsoft.Storage/storageAccounts":                  azurermStorageAccount,
+		"Microsoft.Resources/deployments":                    azurermTemplateDeployment,
+		"Microsoft.ServiceBus/namespaces":                    azurermServicebusNamespace,
+		"Microsoft.ServiceBus/namespaces/authorizationRules": azurermServicebusNamespaceAuthorizationRule,
+		"Microsoft.ServiceBus/namespaces/queues":             azurermServicebusQueue,
 	}
 
 	var myContent []byte
+	var ok bool
+
 	if TFLookup[myType] != nil {
-		myContent = TFLookup[myType].([]byte)
+		myContent, ok = TFLookup[strings.TrimSuffix(myType, "/")].([]byte)
+		if !ok {
+			log.Warn().Msg("Failed to cast lookup")
+		}
 	} else {
-		//we don't want to half the parsing so just log it.
+		// we don't want to half the parsing so just log it.
 		log.Warn().Msgf("%s not found", myType)
 	}
+
 	return myContent
 }
diff --git a/src/arm/lookup_test.go b/src/arm/lookup_test.go
index df61d1e..180a459 100644
--- a/src/arm/lookup_test.go
+++ b/src/arm/lookup_test.go
@@ -6,18 +6,24 @@ import (
 )
 
 func Test_lookup(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		myType string
 	}
+
 	tests := []struct {
 		name string
 		args args
 		want []byte
 	}{
-		// TODO: Add test cases.
+		{},
 	}
+
 	for _, tt := range tests {
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
 			if got := lookup(tt.args.myType); !reflect.DeepEqual(got, tt.want) {
 				t.Errorf("lookup() = %v, want %v", got, tt.want)
 			}
diff --git a/src/arm/parse.go b/src/arm/parse.go
index f7278dd..7fcd6e7 100644
--- a/src/arm/parse.go
+++ b/src/arm/parse.go
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"reflect"
 	"regexp"
-	sato "sato/src"
+	"sato/src/cf"
 	"sato/src/see"
 	"strconv"
 	"strings"
@@ -22,7 +22,7 @@ import (
 
 type m map[string]interface{}
 
-// Parse turn CFN into Terraform
+// Parse turn CFN into Terraform.
 func Parse(file string, destination string) error {
 	fileAbs, err := filepath.Abs(file)
 	if err != nil {
@@ -30,7 +30,6 @@ func Parse(file string, destination string) error {
 	}
 
 	jsonFile, err := os.Open(fileAbs)
-
 	if err != nil {
 		fmt.Println(err)
 	}
@@ -43,66 +42,69 @@ func Parse(file string, destination string) error {
 
 	var result map[string]interface{}
 	err = json.Unmarshal(byteValue, &result)
+
 	if err != nil {
 		return err
 	}
 
 	funcMap := tftemplate.FuncMap{
-		"Array":        sato.Array,
-		"ArrayReplace": sato.ArrayReplace,
-		"Contains":     sato.Contains,
-		"Sprint":       sato.Sprint,
-		"Decode64":     sato.Decode64,
-		"Boolean":      sato.Boolean,
-		"Dequote":      sato.Dequote,
-		"Quote":        sato.Quote,
-		"Demap":        sato.Demap,
+		"Array":        cf.Array,
+		"ArrayReplace": cf.ArrayReplace,
+		"Contains":     cf.Contains,
+		"Sprint":       cf.Sprint,
+		"Decode64":     cf.Decode64,
+		"Boolean":      cf.Boolean,
+		"Dequote":      cf.Dequote,
+		"Quote":        cf.Quote,
+		"Demap":        cf.Demap,
+		"Tags":         tags,
 		"ToUpper":      strings.ToUpper,
-		"ToLower":      sato.Lower,
+		"ToLower":      cf.Lower,
 		"Deref":        func(str *string) string { return *str },
-		"Nil":          sato.Nill,
-		"Nild":         sato.Nild,
+		"Nil":          cf.Nill,
+		"Nild":         cf.Nild,
 		"Marshal": func(v interface{}) string {
 			a, _ := json.Marshal(v)
+
 			return string(a)
 		},
-		"Split":        sato.Split,
-		"SplitOn":      sato.SplitOn,
-		"Replace":      sato.Replace,
-		"Tags":         sato.Tags,
-		"RandomString": sato.RandomString,
-		"Map":          sato.Map,
-		"Snake":        sato.Snake,
-		"Kebab":        sato.Kebab,
-		"ZipFile":      sato.Zipfile,
+		"Split":        cf.Split,
+		"SplitOn":      cf.SplitOn,
+		"Replace":      cf.Replace,
+		"RandomString": cf.RandomString,
+		"Map":          cf.Map,
+		"NotNil":       notNil,
+		"Snake":        cf.Snake,
+		"Kebab":        cf.Kebab,
+		"ZipFile":      cf.Zipfile,
 	}
 
 	result = preprocess(result)
-	result, err = ParseVariables(result, funcMap, destination)
+	result, err = parseVariables(result, funcMap, destination)
+
 	if err != nil {
 		return err
 	}
 
-	result, err = ParseResources(result, funcMap, destination)
+	result, err = parseResources(result, funcMap, destination)
 	if err != nil {
 		return err
 	}
 
-	err = ParseOutputs(result, funcMap, destination)
+	err = parseOutputs(result, funcMap, destination)
 	if err != nil {
 		return err
 	}
 
-	err = ParseData(result, funcMap, destination)
+	err = parseData(result, funcMap, destination)
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
-// ParseVariables convert ARM Parameters into terraform variables
-func ParseVariables(result map[string]interface{}, funcMap tftemplate.FuncMap, destination string) (map[string]interface{}, error) {
-
+// parseVariables convert ARM Parameters into terraform variables.
+func parseVariables(result map[string]interface{}, funcMap tftemplate.FuncMap, destination string) (map[string]interface{}, error) {
 	variables := make(map[string]interface{})
 	if result["variables"] != nil {
 		variables = result["variables"].(map[string]interface{})
@@ -111,13 +113,11 @@ func ParseVariables(result map[string]interface{}, funcMap tftemplate.FuncMap, d
 	var All string
 
 	All, myVariables, err := parseParameters(result, funcMap, All)
-
 	if err != nil {
 		return result, err
 	}
 
 	locals, result, err := parseLocals(result)
-
 	if err != nil {
 		return result, err
 	}
@@ -128,24 +128,29 @@ func ParseVariables(result map[string]interface{}, funcMap tftemplate.FuncMap, d
 		if value != nil {
 			var local string
 
-			if reflect.TypeOf(value).String() == "string" {
+			if reflect.TypeOf(value).String() == typeString {
 				if strings.Contains(value.(string), "()") ||
 					strings.Contains(value.(string), "[") {
 					value, result = parseString(value.(string), result)
 					local = "\t" + name + " = " + value.(string) + "\n"
-					locals = locals + local
+					locals += local
 					continue
 				}
+
 				myItem["default"] = value
 			}
 
 			if reflect.TypeOf(value).String() == "map[string]interface {}" {
-				blob, _ := json.Marshal(value)
+				blob, err := json.Marshal(value)
+				if err != nil {
+					log.Warn().Msgf("fail to marshal %s", value)
+				}
+
 				myItem["default"] = string(blob)
 			}
 
 			myItem["name"] = name
-			myItem["type"] = "string"
+			myItem["type"] = typeString
 		}
 
 		myItem, err = fixType(myItem)
@@ -154,7 +159,7 @@ func ParseVariables(result map[string]interface{}, funcMap tftemplate.FuncMap, d
 		}
 
 		var output bytes.Buffer
-		tmpl, err := tftemplate.New("test").Funcs(funcMap).Parse(string(VariableFile))
+		tmpl, err := tftemplate.New("test").Funcs(funcMap).Parse(string(variableFile))
 		if err != nil {
 			return result, err
 		}
@@ -162,17 +167,17 @@ func ParseVariables(result map[string]interface{}, funcMap tftemplate.FuncMap, d
 			"variable": myItem,
 			"item":     name,
 		})
-		All = All + output.String()
+		All += output.String()
 		myVariables = append(myVariables, myItem)
 	}
 
-	err = sato.Write(All, destination, "variables")
+	err = cf.Write(All, destination, "variables")
 	if err != nil {
 		return result, err
 	}
 
 	locals = "locals {\n" + locals + "}\n"
-	err = sato.Write(locals, destination, "locals")
+	err = cf.Write(locals, destination, "locals")
 	if err != nil {
 		return result, err
 	}
@@ -181,7 +186,10 @@ func ParseVariables(result map[string]interface{}, funcMap tftemplate.FuncMap, d
 }
 
 func parseParameters(result map[string]interface{}, funcMap tftemplate.FuncMap, All string) (string, []interface{}, error) {
-	parameters := result["parameters"].(map[string]interface{})
+	parameters, ok := result["parameters"].(map[string]interface{})
+	if !ok {
+		return "", nil, fmt.Errorf("failed to cast to map")
+	}
 	myVariables := make([]interface{}, 0)
 	var err error
 	for name, item := range parameters {
@@ -194,7 +202,7 @@ func parseParameters(result map[string]interface{}, funcMap tftemplate.FuncMap,
 		}
 
 		var output bytes.Buffer
-		tmpl, err := tftemplate.New("test").Funcs(funcMap).Parse(string(VariableFile))
+		tmpl, err := tftemplate.New("test").Funcs(funcMap).Parse(string(variableFile))
 		if err != nil {
 			return "", nil, err
 		}
@@ -222,13 +230,16 @@ func parseLocals(result map[string]interface{}) (string, map[string]interface{},
 	return locals, result, nil
 }
 
-// ParseResources handles resources in ARM conversion
-func ParseResources(result map[string]interface{}, funcMap tftemplate.FuncMap, destination string) (map[string]interface{}, error) {
+// parseResources handles resources in ARM conversion
+func parseResources(result map[string]interface{}, funcMap tftemplate.FuncMap, destination string) (map[string]interface{}, error) {
 	resources := result["resources"].([]interface{})
+
 	newResources, err := parseList(resources, result)
+
 	if err != nil {
 		return nil, err
 	}
+
 	result["resources"] = newResources
 
 	for _, resource := range newResources {
@@ -237,6 +248,7 @@ func ParseResources(result map[string]interface{}, funcMap tftemplate.FuncMap, d
 		myType := resource.(map[string]interface{})
 		myContent := lookup(myType["type"].(string))
 		first, err := see.Lookup(myType["type"].(string))
+
 		if err != nil {
 			log.Warn().Err(err)
 			continue
@@ -245,20 +257,19 @@ func ParseResources(result map[string]interface{}, funcMap tftemplate.FuncMap, d
 		temp := myType["resource"].(string)
 		name = &temp
 
-		//needs to pivot on policy template from resource
+		// needs to pivot on policy template from resource
 		tmpl, err := tftemplate.New("sato").Funcs(funcMap).Parse(string(myContent))
-
 		if err != nil {
 			log.Printf("failed at %s  for %s %s", err, *first, *name)
 			continue
 		}
 
-		_ = tmpl.Execute(&output, sato.M{
+		_ = tmpl.Execute(&output, cf.M{
 			"resource": resource,
 			"item":     name,
 		})
 
-		err = sato.Write(output.String(), destination, *first+"."+strings.Replace(*name, "var.", "", 1))
+		err = cf.Write(output.String(), destination, *first+"."+strings.Replace(*name, "var.", "", 1))
 		if err != nil {
 			return nil, err
 		}
@@ -306,11 +317,10 @@ func parseMap(myResource map[string]interface{}, result map[string]interface{})
 				case []interface{}:
 					log.Print(resource)
 				}
-
 			}
 			myResource[name] = myArray
 		case float64, bool:
-			//it's fine
+			// it's fine
 			myResource[name] = attribute
 		default:
 			log.Print(attribute)
@@ -320,8 +330,10 @@ func parseMap(myResource map[string]interface{}, result map[string]interface{})
 }
 
 func parseString(newAttribute string, result map[string]interface{}) (*string, map[string]interface{}) {
-	var matches = []string{"parameters", "variables", "toLower", "resourceGroup().location", "resourceGroup().id",
-		"substring", "uniqueString", "reference", "resourceId", "listKeys", "format('"}
+	matches := []string{
+		"parameters", "variables", "toLower", "resourceGroup().location", "resourceGroup().id",
+		"substring", "uniqueString", "reference", "resourceId", "listKeys", "format('",
+	}
 
 	if what, found := contains(matches, newAttribute); found {
 		newAttribute, result = replace(matches, newAttribute, what, result)
@@ -331,7 +343,7 @@ func parseString(newAttribute string, result map[string]interface{}) (*string, m
 }
 
 func loseSQBrackets(newAttribute string) string {
-	var re = regexp.MustCompile(`^\[(.*)\]`) //format('{0}/{1}',
+	re := regexp.MustCompile(`^\[(.*)\]`) // format('{0}/{1}',
 	Matched := re.FindStringSubmatch(newAttribute)
 	if len(Matched) > 1 {
 		return Matched[1]
@@ -346,15 +358,15 @@ func replace(matches []string, newAttribute string, what *string, result map[str
 		{
 			if *what == "reference" {
 				Attribute = loseSQBrackets(newAttribute)
-				var re = regexp.MustCompile(`reference\((.*?)\)\.`) //format('{0}/{1}',
+				re := regexp.MustCompile(`reference\((.*?)\)\.`) // format('{0}/{1}',
 				Match := re.FindStringSubmatch(Attribute)
 				if (Match) != nil {
-					var rem = regexp.MustCompile(`\)\.(.*)`) //format('{0}/{1}',
+					rem := regexp.MustCompile(`\)\.(.*)`) // format('{0}/{1}',
 					remains := rem.FindStringSubmatch(Attribute)
 					if len(remains) <= 1 {
 						log.Print("no attribute")
 					}
-					var re2 = regexp.MustCompile(`resourceId\((.*?)\)`) //format('{0}/{1}',
+					re2 := regexp.MustCompile(`resourceId\((.*?)\)`) // format('{0}/{1}',
 					Match2 := re2.FindStringSubmatch(Attribute)
 					Attribute = Match2[0] + "." + remains[1]
 				} else {
@@ -371,13 +383,13 @@ func replace(matches []string, newAttribute string, what *string, result map[str
 	case "uniqueString", "uniquestring":
 		{
 			target := *what + "\\((.*?)\\)"
-			var re = regexp.MustCompile(target) //format('{0}/{1}',
+			re := regexp.MustCompile(target) // format('{0}/{1}',
 			Match := re.ReplaceAllString(newAttribute, "substr(uuid(), 0, 8)")
 			Attribute = Match
 		}
 	case "format('":
 		{
-			var re = regexp.MustCompile(`{.}`) //format('{0}/{1}',
+			re := regexp.MustCompile(`{.}`) // format('{0}/{1}',
 			Match := re.ReplaceAllString(newAttribute, "%s")
 			Match = strings.Replace(Match, "'", "\"", -1)
 			Match = strings.Replace(Match, "/", "-", -1)
@@ -386,7 +398,7 @@ func replace(matches []string, newAttribute string, what *string, result map[str
 	case "listKeys":
 		{
 			Attribute = loseSQBrackets(newAttribute)
-			var re = regexp.MustCompile(`listKeys\((.*)\)`) //format('{0}/{1}',
+			re := regexp.MustCompile(`listKeys\((.*)\)`) // format('{0}/{1}',
 			Match := re.FindStringSubmatch(Attribute)
 			if len(Match) > 1 {
 				resource := strings.Split(Match[1], ",")[0]
@@ -397,7 +409,7 @@ func replace(matches []string, newAttribute string, what *string, result map[str
 		}
 	case "parameters":
 		{
-			var re = regexp.MustCompile(`parameters\('(.*?)\'\)`)
+			re := regexp.MustCompile(`parameters\('(.*?)\'\)`)
 			Match := re.FindStringSubmatch(newAttribute)
 			if (Match) != nil {
 				var temp string
@@ -413,7 +425,7 @@ func replace(matches []string, newAttribute string, what *string, result map[str
 		}
 	case "variables":
 		{
-			var re = regexp.MustCompile(`variables\('(.*?)\'\)`)
+			re := regexp.MustCompile(`variables\('(.*?)\'\)`)
 			Match := re.FindStringSubmatch(newAttribute)
 			if (Match) != nil {
 				var temp string
@@ -459,7 +471,7 @@ func replace(matches []string, newAttribute string, what *string, result map[str
 	}
 
 	if again, still := contains(matches, Attribute); still {
-		//allow failure
+		// allow failure
 		if Attribute != newAttribute {
 			Attribute, result = replace(matches, Attribute, again, result)
 		} else {
@@ -478,16 +490,15 @@ func isCompound(newAttribute string) bool {
 }
 
 func replaceResourceID(Match string, result map[string]interface{}) (string, error) {
-
 	if strings.Contains(Match, "extensionResourceId") {
-		var re = regexp.MustCompile(`extensionResourceId\((.*?)\)`)
+		re := regexp.MustCompile(`extensionResourceId\((.*?)\)`)
 		Match = re.ReplaceAllString(Match, "NIL")
 	}
 
-	var re = regexp.MustCompile(`resourceId\((.*?)\)`)
+	re := regexp.MustCompile(`resourceId\((.*?)\)`)
 	Attribute := re.FindStringSubmatch(Match)
 
-	var re2 = regexp.MustCompile(`resourceId\((.*?\))\),`)
+	re2 := regexp.MustCompile(`resourceId\((.*?\))\),`)
 	Attribute2 := re2.FindStringSubmatch(Match)
 
 	if len(Attribute2) > 1 {
@@ -495,11 +506,10 @@ func replaceResourceID(Match string, result map[string]interface{}) (string, err
 	}
 
 	if len(Attribute) <= 1 {
-		var re3 = regexp.MustCompile(`,(![^[]*\])`)
+		re3 := regexp.MustCompile(`,(![^[]*\])`)
 		Attribute = re3.FindStringSubmatch(Match)
 	}
 	arm, name, err := splitResourceName(Attribute[1])
-
 	if err != nil {
 		log.Warn().Msgf("failed to parse %s", Attribute[1])
 	}
@@ -560,15 +570,26 @@ func replaceResourceID(Match string, result map[string]interface{}) (string, err
 						log.Warn().Msgf("no match found %s", arm)
 					}
 				}
-				resourceName, err = see.Lookup(sato.Dequote(arm))
+				resourceName, err = see.Lookup(cf.Dequote(arm))
 				if err != nil {
+					resourceName = toPointer()
 					log.Warn().Msgf("no match found %s", arm)
 				}
 			}
 		}
 	}
-	temp := *resourceName + "." + name
-	return strings.Replace(Match, Attribute[0], temp, -1), nil
+
+	if resourceName != nil {
+		temp := *resourceName + "." + name
+		return strings.Replace(Match, Attribute[0], temp, -1), nil
+	}
+
+	return "", err
+}
+
+func toPointer() *string {
+	temp := "UNKNOWN"
+	return &temp
 }
 
 func splitResourceName(Attribute string) (string, string, error) {
@@ -583,10 +604,10 @@ func splitResourceName(Attribute string) (string, string, error) {
 		}
 	case 2:
 		{
-			var re = regexp.MustCompile(`'(.*?)'`)
+			re := regexp.MustCompile(`'(.*?)'`)
 			newAttribute := re.FindStringSubmatch(splitsy[1])
 			if len(newAttribute) <= 1 {
-				arm = sato.Dequote(splitsy[0])
+				arm = cf.Dequote(splitsy[0])
 				name = strings.TrimSpace(splitsy[1])
 			} else {
 				name = newAttribute[1]
@@ -600,7 +621,7 @@ func splitResourceName(Attribute string) (string, string, error) {
 		}
 	default:
 		{
-			//more than 2
+			// more than 2
 		}
 	}
 	return arm, name, nil
@@ -611,7 +632,7 @@ func findResourceName(result map[string]interface{}, name string) (string, error
 		return name, fmt.Errorf("uses inline format function %s", name)
 	}
 
-	name = sato.Dequote(name)
+	name = cf.Dequote(name)
 	var err error
 	resources := result["resources"].([]interface{})
 	for _, myResource := range resources {
@@ -621,7 +642,7 @@ func findResourceName(result map[string]interface{}, name string) (string, error
 		}
 	}
 
-	//not simple name lookup
+	// not simple name lookup
 	if strings.Contains(name, ",") {
 		Lots := strings.Split(name, ",")
 		var newName []string
@@ -655,13 +676,16 @@ func getNameValue(result map[string]interface{}, name string) (string, error) {
 			return name, fmt.Errorf("failed to match value %s", name)
 		}
 		rawName := rawNames[1]
-		variables := result["variables"].(map[string]interface{})
-		for myVariable, value := range variables {
-			if rawName == myVariable {
-				return value.(string), nil
+		if result["variables"] != nil {
+			variables := result["variables"].(map[string]interface{})
+			for myVariable, value := range variables {
+				if rawName == myVariable {
+					return value.(string), nil
+				}
 			}
 		}
 	}
+
 	return name, nil
 }
 
@@ -676,8 +700,8 @@ func findResourceType(result map[string]interface{}, name string) bool {
 	return false
 }
 
-// ParseOutputs writes out to outputs.tf
-func ParseOutputs(result map[string]interface{}, funcMap tftemplate.FuncMap, destination string) error {
+// parseOutputs writes out to outputs.tf
+func parseOutputs(result map[string]interface{}, funcMap tftemplate.FuncMap, destination string) error {
 	if result["outputs"] == nil {
 		return nil
 	}
@@ -686,7 +710,7 @@ func ParseOutputs(result map[string]interface{}, funcMap tftemplate.FuncMap, des
 
 	var All string
 	for name, value := range outputs {
-		var myVar sato.Output
+		var myVar cf.Output
 		var someString *string
 		myVar.Type = "string"
 		myVar.Name = name
@@ -694,7 +718,7 @@ func ParseOutputs(result map[string]interface{}, funcMap tftemplate.FuncMap, des
 		someString, result = parseString(temp["value"].(string), result)
 		myVar.Value = *someString
 		var output bytes.Buffer
-		tmpl, err := tftemplate.New("test").Funcs(funcMap).Parse(string(OutputFile))
+		tmpl, err := tftemplate.New("test").Funcs(funcMap).Parse(string(outputFile))
 		if err != nil {
 			return err
 		}
@@ -705,7 +729,7 @@ func ParseOutputs(result map[string]interface{}, funcMap tftemplate.FuncMap, des
 		All = All + output.String()
 	}
 
-	err := sato.Write(All, destination, "outputs")
+	err := cf.Write(All, destination, "outputs")
 	if err != nil {
 		return err
 	}
@@ -713,8 +737,8 @@ func ParseOutputs(result map[string]interface{}, funcMap tftemplate.FuncMap, des
 	return nil
 }
 
-// ParseData writes out to data.tf
-func ParseData(result map[string]interface{}, funcMap tftemplate.FuncMap, destination string) error {
+// parseData writes out to data.tf
+func parseData(result map[string]interface{}, funcMap tftemplate.FuncMap, destination string) error {
 	if result["data"] == nil {
 		return nil
 	}
@@ -722,7 +746,7 @@ func ParseData(result map[string]interface{}, funcMap tftemplate.FuncMap, destin
 	data := result["data"]
 
 	var output bytes.Buffer
-	tmpl, err := tftemplate.New("test").Funcs(funcMap).Parse(string(DataFile))
+	tmpl, err := tftemplate.New("test").Funcs(funcMap).Parse(string(dataFile))
 	if err != nil {
 		return err
 	}
@@ -735,7 +759,7 @@ func ParseData(result map[string]interface{}, funcMap tftemplate.FuncMap, destin
 		return err
 	}
 
-	err = sato.Write(output.String(), destination, "data")
+	err = cf.Write(output.String(), destination, "data")
 	if err != nil {
 		log.Print(err)
 		return err
@@ -744,8 +768,8 @@ func ParseData(result map[string]interface{}, funcMap tftemplate.FuncMap, destin
 	return nil
 }
 
-// GetValue gets from variables
-func GetValue(item string, variables []sato.Variable) (*string, error) {
+// getValue gets from variables
+func getValue(item string, variables []cf.Variable) (*string, error) {
 	for _, x := range variables {
 		if x.Name == item {
 			return &x.Default, nil
@@ -812,8 +836,8 @@ func preprocess(results map[string]interface{}) map[string]interface{} {
 				}
 			case "object", "list(string)":
 				{
-					//todo
-					//myResult["default"] = myResult["defaultValue"]
+					// todo
+					// myResult["default"] = myResult["defaultValue"]
 					myResult["default"] = ""
 					newParams[item] = myResult
 				}
diff --git a/src/arm/parse_test.go b/src/arm/parse_test.go
index 73ecb50..68a3f8b 100644
--- a/src/arm/parse_test.go
+++ b/src/arm/parse_test.go
@@ -2,52 +2,67 @@ package arm
 
 import (
 	"reflect"
-	sato "sato/src"
+	sato "sato/src/cf"
 	"testing"
 	"text/template"
 )
 
 func TestGetValue(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		item      string
 		variables []sato.Variable
 	}
+
 	tests := []struct {
 		name    string
 		args    args
 		want    *string
 		wantErr bool
 	}{
-		// TODO: Add test cases.
+		//{},
 	}
+
 	for _, tt := range tests {
+		tt := tt
+
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := GetValue(tt.args.item, tt.args.variables)
+			t.Parallel()
+			got, err := getValue(tt.args.item, tt.args.variables)
 			if (err != nil) != tt.wantErr {
-				t.Errorf("GetValue() error = %v, wantErr %v", err, tt.wantErr)
+				t.Errorf("getValue() error = %v, wantErr %v", err, tt.wantErr)
+
 				return
 			}
 			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("GetValue() got = %v, want %v", got, tt.want)
+				t.Errorf("getValue() got = %v, want %v", got, tt.want)
 			}
 		})
 	}
 }
 
 func TestParse(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		file        string
 		destination string
 	}
+
 	tests := []struct {
 		name    string
 		args    args
 		wantErr bool
 	}{
-		// TODO: Add test cases.
+		{"Pass", args{"..\\..\\examples\\arm\\microsoft.compute\\vm-simple-windows\\azuredeploy.json", ".sato"}, false},
+		{"Fail", args{"..\\..\\examples\\arm\\microsoft.compute\\vm-simple-windows\\nofile.json", ".sato"}, true},
 	}
+
 	for _, tt := range tests {
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
 			if err := Parse(tt.args.file, tt.args.destination); (err != nil) != tt.wantErr {
 				t.Errorf("Parse() error = %v, wantErr %v", err, tt.wantErr)
 			}
@@ -56,123 +71,148 @@ func TestParse(t *testing.T) {
 }
 
 func TestParseData(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		result      map[string]interface{}
 		funcMap     template.FuncMap
 		destination string
 	}
+
 	tests := []struct {
 		name    string
 		args    args
 		wantErr bool
 	}{
-		// TODO: Add test cases.
+		{},
 	}
+
 	for _, tt := range tests {
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
-			if err := ParseData(tt.args.result, tt.args.funcMap, tt.args.destination); (err != nil) != tt.wantErr {
-				t.Errorf("ParseData() error = %v, wantErr %v", err, tt.wantErr)
+			t.Parallel()
+			if err := parseData(tt.args.result, tt.args.funcMap, tt.args.destination); (err != nil) != tt.wantErr {
+				t.Errorf("parseData() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})
 	}
 }
 
 func TestParseOutputs(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		result      map[string]interface{}
 		funcMap     template.FuncMap
 		destination string
 	}
+
 	tests := []struct {
 		name    string
 		args    args
 		wantErr bool
 	}{
-		// TODO: Add test cases.
+		{},
 	}
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if err := ParseOutputs(tt.args.result, tt.args.funcMap, tt.args.destination); (err != nil) != tt.wantErr {
-				t.Errorf("ParseOutputs() error = %v, wantErr %v", err, tt.wantErr)
+			t.Parallel()
+			if err := parseOutputs(tt.args.result, tt.args.funcMap, tt.args.destination); (err != nil) != tt.wantErr {
+				t.Errorf("parseOutputs() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})
 	}
 }
 
 func TestParseResources(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		result      map[string]interface{}
 		funcMap     template.FuncMap
 		destination string
 	}
+
 	tests := []struct {
 		name    string
 		args    args
 		want    map[string]interface{}
 		wantErr bool
 	}{
-		// TODO: Add test cases.
+		//{},
 	}
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := ParseResources(tt.args.result, tt.args.funcMap, tt.args.destination)
+			got, err := parseResources(tt.args.result, tt.args.funcMap, tt.args.destination)
 			if (err != nil) != tt.wantErr {
-				t.Errorf("ParseResources() error = %v, wantErr %v", err, tt.wantErr)
+				t.Errorf("parseResources() error = %v, wantErr %v", err, tt.wantErr)
+
 				return
 			}
 			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("ParseResources() got = %v, want %v", got, tt.want)
+				t.Errorf("parseResources() got = %v, want %v", got, tt.want)
 			}
 		})
 	}
 }
 
 func TestParseVariables(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		result      map[string]interface{}
 		funcMap     template.FuncMap
 		destination string
 	}
+
 	tests := []struct {
 		name    string
 		args    args
 		want    []interface{}
 		wantErr bool
 	}{
-		// TODO: Add test cases.
+		//{},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := ParseVariables(tt.args.result, tt.args.funcMap, tt.args.destination)
+			t.Parallel()
+			got, err := parseVariables(tt.args.result, tt.args.funcMap, tt.args.destination)
 			if (err != nil) != tt.wantErr {
-				t.Errorf("ParseVariables() error = %v, wantErr %v", err, tt.wantErr)
+				t.Errorf("parseVariables() error = %v, wantErr %v", err, tt.wantErr)
+
 				return
 			}
 			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("ParseVariables() got = %v, want %v", got, tt.want)
+				t.Errorf("parseVariables() got = %v, want %v", got, tt.want)
 			}
 		})
 	}
 }
 
 func Test_findResourceName(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		result map[string]interface{}
 		name   string
 	}
+
 	tests := []struct {
 		name    string
 		args    args
 		want    string
 		wantErr bool
 	}{
-		// TODO: Add test cases.
+		//{},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := findResourceName(tt.args.result, tt.args.name)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("findResourceName() error = %v, wantErr %v", err, tt.wantErr)
+
 				return
 			}
 			if got != tt.want {
@@ -183,19 +223,24 @@ func Test_findResourceName(t *testing.T) {
 }
 
 func Test_findResourceType(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		result map[string]interface{}
 		name   string
 	}
+
 	tests := []struct {
 		name string
 		args args
 		want bool
 	}{
-		// TODO: Add test cases.
+		//{},
 	}
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
 			if got := findResourceType(tt.args.result, tt.args.name); got != tt.want {
 				t.Errorf("findResourceType() = %v, want %v", got, tt.want)
 			}
@@ -204,23 +249,28 @@ func Test_findResourceType(t *testing.T) {
 }
 
 func Test_getNameValue(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		result map[string]interface{}
 		name   string
 	}
+
 	tests := []struct {
 		name    string
 		args    args
 		want    string
 		wantErr bool
 	}{
-		// TODO: Add test cases.
+		{},
 	}
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := getNameValue(tt.args.result, tt.args.name)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("getNameValue() error = %v, wantErr %v", err, tt.wantErr)
+
 				return
 			}
 			if got != tt.want {
@@ -239,8 +289,9 @@ func Test_isCompound(t *testing.T) {
 		args args
 		want bool
 	}{
-		// TODO: Add test cases.
+		{},
 	}
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			if got := isCompound(tt.args.newAttribute); got != tt.want {
@@ -254,13 +305,15 @@ func Test_loseSQBrackets(t *testing.T) {
 	type args struct {
 		newAttribute string
 	}
+
 	tests := []struct {
 		name string
 		args args
 		want string
 	}{
-		// TODO: Add test cases.
+		{},
 	}
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			if got := loseSQBrackets(tt.args.newAttribute); got != tt.want {
@@ -275,19 +328,22 @@ func Test_parseList(t *testing.T) {
 		resources []interface{}
 		result    map[string]interface{}
 	}
+
 	tests := []struct {
 		name    string
 		args    args
 		want    []interface{}
 		wantErr bool
 	}{
-		// TODO: Add test cases.
+		{},
 	}
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := parseList(tt.args.resources, tt.args.result)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("parseList() error = %v, wantErr %v", err, tt.wantErr)
+
 				return
 			}
 			if !reflect.DeepEqual(got, tt.want) {
@@ -298,23 +354,29 @@ func Test_parseList(t *testing.T) {
 }
 
 func Test_parseMap(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		myResource map[string]interface{}
 		result     map[string]interface{}
 	}
+
 	tests := []struct {
 		name    string
 		args    args
 		want    map[string]interface{}
 		wantErr bool
 	}{
-		// TODO: Add test cases.
+		{},
 	}
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
 			got, err := parseMap(tt.args.myResource, tt.args.result)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("parseMap() error = %v, wantErr %v", err, tt.wantErr)
+
 				return
 			}
 			if !reflect.DeepEqual(got, tt.want) {
@@ -325,11 +387,14 @@ func Test_parseMap(t *testing.T) {
 }
 
 func Test_parseParameters(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		result  map[string]interface{}
 		funcMap template.FuncMap
 		All     string
 	}
+
 	tests := []struct {
 		name    string
 		args    args
@@ -337,10 +402,12 @@ func Test_parseParameters(t *testing.T) {
 		want1   []interface{}
 		wantErr bool
 	}{
-		// TODO: Add test cases.
+		//{"Pass", args{}, "false"},
 	}
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
 			got, got1, err := parseParameters(tt.args.result, tt.args.funcMap, tt.args.All)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("parseParameters() error = %v, wantErr %v", err, tt.wantErr)
@@ -357,18 +424,23 @@ func Test_parseParameters(t *testing.T) {
 }
 
 func Test_preprocess(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		results map[string]interface{}
 	}
+
 	tests := []struct {
 		name string
 		args args
 		want map[string]interface{}
 	}{
-		// TODO: Add test cases.
+		//{},
 	}
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
 			if got := preprocess(tt.args.results); !reflect.DeepEqual(got, tt.want) {
 				t.Errorf("preprocess() = %v, want %v", got, tt.want)
 			}
@@ -377,23 +449,29 @@ func Test_preprocess(t *testing.T) {
 }
 
 func Test_replaceResourceID(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		Match  string
 		result map[string]interface{}
 	}
+
 	tests := []struct {
 		name    string
 		args    args
 		want    string
 		wantErr bool
 	}{
-		// TODO: Add test cases.
+		//{},
 	}
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
 			got, err := replaceResourceID(tt.args.Match, tt.args.result)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("replaceResourceID() error = %v, wantErr %v", err, tt.wantErr)
+
 				return
 			}
 			if got != tt.want {
@@ -404,18 +482,23 @@ func Test_replaceResourceID(t *testing.T) {
 }
 
 func Test_setResourceNames(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		results map[string]interface{}
 	}
+
 	tests := []struct {
 		name string
 		args args
 		want []interface{}
 	}{
-		// TODO: Add test cases.
+		//{},
 	}
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
 			if got := setResourceNames(tt.args.results); !reflect.DeepEqual(got, tt.want) {
 				t.Errorf("setResourceNames() = %v, want %v", got, tt.want)
 			}
@@ -424,9 +507,12 @@ func Test_setResourceNames(t *testing.T) {
 }
 
 func Test_splitResourceName(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		Attribute string
 	}
+
 	tests := []struct {
 		name    string
 		args    args
@@ -434,13 +520,16 @@ func Test_splitResourceName(t *testing.T) {
 		want1   string
 		wantErr bool
 	}{
-		// TODO: Add test cases.
+		//{},
 	}
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
 			got, got1, err := splitResourceName(tt.args.Attribute)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("splitResourceName() error = %v, wantErr %v", err, tt.wantErr)
+
 				return
 			}
 			if got != tt.want {
@@ -454,9 +543,12 @@ func Test_splitResourceName(t *testing.T) {
 }
 
 func Test_parseLocals(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		result map[string]interface{}
 	}
+
 	tests := []struct {
 		name    string
 		args    args
@@ -464,13 +556,15 @@ func Test_parseLocals(t *testing.T) {
 		want1   map[string]interface{}
 		wantErr bool
 	}{
-		// TODO: Add test cases.
+		//{},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
 			got, got1, err := parseLocals(tt.args.result)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("parseLocals() error = %v, wantErr %v", err, tt.wantErr)
+
 				return
 			}
 			if got != tt.want {
@@ -484,22 +578,28 @@ func Test_parseLocals(t *testing.T) {
 }
 
 func Test_replace(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		matches      []string
 		newAttribute string
 		what         *string
 		result       map[string]interface{}
 	}
+
 	tests := []struct {
 		name  string
 		args  args
 		want  string
 		want1 map[string]interface{}
 	}{
-		// TODO: Add test cases.
+		//{},
 	}
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
+
 			got, got1 := replace(tt.args.matches, tt.args.newAttribute, tt.args.what, tt.args.result)
 			if got != tt.want {
 				t.Errorf("replace() got = %v, want %v", got, tt.want)
@@ -512,18 +612,22 @@ func Test_replace(t *testing.T) {
 }
 
 func Test_parseString(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		newAttribute string
 		result       map[string]interface{}
 	}
+
 	tests := []struct {
 		name  string
 		args  args
 		want  *string
 		want1 map[string]interface{}
 	}{
-		// TODO: Add test cases.
+		//{},
 	}
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			got, got1 := parseString(tt.args.newAttribute, tt.args.result)
diff --git a/src/arm/resources.go b/src/arm/resources.go
index bb14eca..254686e 100644
--- a/src/arm/resources.go
+++ b/src/arm/resources.go
@@ -1,7 +1,7 @@
 package arm
 
 import (
-	_ "embed" //required for embed
+	_ "embed" // required for embed
 )
 
 //go:embed resources/azurerm_virtual_machine.template
@@ -54,3 +54,12 @@ var azurermLogAnalyticsWorkspace []byte
 
 //go:embed resources/azurerm_role_definition.template
 var azurermRoleDefinition []byte
+
+//go:embed resources/azurerm_servicebus_namespace.template
+var azurermServicebusNamespace []byte
+
+//go:embed resources/azurerm_servicebus_namespace_authorization_rule.template
+var azurermServicebusNamespaceAuthorizationRule []byte
+
+//go:embed resources/azurerm_servicebus_queue.template
+var azurermServicebusQueue []byte
diff --git a/src/arm/resources/azurerm_analysis_services_server.template b/src/arm/resources/azurerm_analysis_services_server.template
index 948a1b7..a8ac9bf 100644
--- a/src/arm/resources/azurerm_analysis_services_server.template
+++ b/src/arm/resources/azurerm_analysis_services_server.template
@@ -20,7 +20,7 @@ resource "azurerm_analysis_services_server" "{{.item}}" {
 {{- if .resource.properties.backupBlobContainerUri}}
   backup_blob_container_uri =  {{ .resource.properties.backupBlobContainerUri}}
 {{- end}}
-{{- if .resource.properties.enablePowerBiService}}
+{{- if NotNil .resource.properties.enablePowerBiService}}
   enable_power_bi_service = {{ .resource.properties.enablePowerBiService}}
 {{- end}}
 {{- if .resource.properties.ipV4FirewallSettings}}
@@ -33,7 +33,7 @@ resource "azurerm_analysis_services_server" "{{.item}}" {
       }
   }
 {{- end}}
-{{- if .resource.properties.tags}}
-  tags = {{.resource.properties.tags}}
+{{- if .resource.tags}}
+  tags = {{Tags .resource.tags}}
 {{- end}}
 }
diff --git a/src/arm/resources/azurerm_api_management.template b/src/arm/resources/azurerm_api_management.template
index dee5631..db5db49 100644
--- a/src/arm/resources/azurerm_api_management.template
+++ b/src/arm/resources/azurerm_api_management.template
@@ -64,7 +64,7 @@ resource "azurerm_api_management" "{{.item}}" {
 {{- if .resource.publicIpAddressId}}
   public_ip_address_id={{ .resource.publicIpAddressId}}
 {{- end}}
-{{- if .resource.publicNetworkAccessEnabled}}
+{{- if NotNil .resource.publicNetworkAccessEnabled}}
   public_network_access_enabled={{ .resource.publicNetworkAccessEnabled}}
 {{- end}}
 {{- if .resource.virtualNetworkType}}
@@ -74,6 +74,6 @@ resource "azurerm_api_management" "{{.item}}" {
   virtual_network_configuration={{ .resource.virtualNetworkConfiguration}}
 {{- end}}
 {{- if .resource.tags}}
-  tags={{ .resource.tags}}
+  tags = {{Tags .resource.tags}}
 {{- end}}
 }
diff --git a/src/arm/resources/azurerm_container_app.template b/src/arm/resources/azurerm_container_app.template
index 154e65c..62a8892 100644
--- a/src/arm/resources/azurerm_container_app.template
+++ b/src/arm/resources/azurerm_container_app.template
@@ -54,6 +54,9 @@ resource "azurerm_container_app" "{{.item}}" {
   }
 {{- end}}
 {{- end}}
+{{- if .resource.tags}}
+  tags = {{Tags .resource.tags}}
+{{- end}}
 {{- if .resource.dependsOn }}
   depends_on = [{{- range $x, $j:= .resource.dependsOn }} {{Deref $j}}, {{- end}}]
 {{- end}}
diff --git a/src/arm/resources/azurerm_container_app_environment.template b/src/arm/resources/azurerm_container_app_environment.template
index 116b0eb..7fa54d2 100644
--- a/src/arm/resources/azurerm_container_app_environment.template
+++ b/src/arm/resources/azurerm_container_app_environment.template
@@ -11,6 +11,9 @@ resource "azurerm_container_app_environment" "{{.item}}" {
   resource_group_name      = data.azurerm_resource_group.sato.name
 {{- end}}
   log_analytics_workspace_id={{- Replace .resource.properties.appLogsConfiguration.logAnalyticsConfiguration.customerId ".customerId" ".id"}}
+{{- if .resource.tags}}
+  tags = {{Tags .resource.tags}}
+{{- end}}
 {{- if .resource.dependsOn }}
   depends_on = [{{- range $x, $j:= .resource.dependsOn }} {{Deref $j}}, {{- end}}]
 {{- end}}
diff --git a/src/arm/resources/azurerm_log_analytics_workspace.template b/src/arm/resources/azurerm_log_analytics_workspace.template
index 368b9b4..56f664a 100644
--- a/src/arm/resources/azurerm_log_analytics_workspace.template
+++ b/src/arm/resources/azurerm_log_analytics_workspace.template
@@ -16,7 +16,7 @@
 {{- if .resource.properties.allowResourceOnlyPermissions}}
   allow_resource_only_permissions = {{ .resource.properties.allowResourceOnlyPermissions}}
 {{- end}}
-{{- if .resource.properties.localAuthenticationDisabled}}
+{{- if NotNil .resource.properties.localAuthenticationDisabled}}
   local_authentication_disabled = {{.resource.properties.localAuthenticationDisabled}}
 {{- end}}
 {{- if .resource.properties.retentionInDays}}
@@ -25,20 +25,20 @@
 {{- if .resource.properties.dailyQuotaGB}}
   daily_quota_gb= {{ .resource.properties.dailyQuotaGB}}
 {{- end}}
-{{- if .resource.properties.cmkForQueryForced}}
+{{- if NotNil .resource.properties.cmkForQueryForced}}
   cmk_for_query_forced ={{ .resource.properties.cmkForQueryForced}}
 {{- end}}
-{{- if .resource.properties.internetIngestionEnabled}}
+{{- if NotNil .resource.properties.internetIngestionEnabled}}
   internet_ingestion_enabled = {{.resource.properties.internetIngestionEnabled}}
 {{- end}}
-{{- if .resource.properties.internetQueryEnabled}}
+{{- if NotNil .resource.properties.internetQueryEnabled}}
   internet_query_enabled = {{.resource.properties.internetQueryEnabled}}
 {{- end}}
 {{- if .resource.properties.reservationCapacityInGBPerDay}}
   reservation_capacity_in_gb_per_day = {{.resource.properties.reservationCapacityInGBPerDay}}
 {{- end}}
-{{- if .resource.properties.tags}}
-  tags = {{.resource.properties.tags}}
+{{- if .resource.tags}}
+  tags = {{Tags .resource.tags}}
 {{- end}}
 {{- if .resource.dependsOn }}
   depends_on = [{{- range $x, $j:= .resource.dependsOn }} {{Deref $j}}, {{- end}}]
diff --git a/src/arm/resources/azurerm_network_interface.template b/src/arm/resources/azurerm_network_interface.template
index d914311..42a263e 100644
--- a/src/arm/resources/azurerm_network_interface.template
+++ b/src/arm/resources/azurerm_network_interface.template
@@ -17,6 +17,9 @@ resource "azurerm_network_interface" "{{ .item}}" {
     private_ip_address_allocation = {{ $i.properties.privateIPAllocationMethod|Quote }}
   }
 {{- end}}
+{{- if .resource.tags}}
+  tags = {{Tags .resource.tags}}
+{{- end}}
 {{- if .resource.dependsOn }}
   depends_on                 = [{{- range $x, $j:= .resource.dependsOn }} {{ $j}}, {{- end}}]
 {{- end}}
diff --git a/src/arm/resources/azurerm_network_security_group.template b/src/arm/resources/azurerm_network_security_group.template
index 090860f..fc0eea4 100644
--- a/src/arm/resources/azurerm_network_security_group.template
+++ b/src/arm/resources/azurerm_network_security_group.template
@@ -27,6 +27,9 @@ resource "azurerm_network_security_group" "{{ .item }}" {
   }
  {{- end}}
 {{- end}}
+{{- if .resource.tags}}
+  tags = {{Tags .resource.tags}}
+{{- end}}
 {{- if .resource.dependsOn }}
   depends_on                 = [{{- range $x, $j:= .resource.dependsOn }} {{Deref $j}}, {{- end}}]
 {{- end}}
diff --git a/src/arm/resources/azurerm_public_ip.template b/src/arm/resources/azurerm_public_ip.template
index c2d6e22..04073b4 100644
--- a/src/arm/resources/azurerm_public_ip.template
+++ b/src/arm/resources/azurerm_public_ip.template
@@ -13,7 +13,9 @@ resource "azurerm_public_ip" "{{ .item }}" {
 {{- else }}
   resource_group_name      = data.azurerm_resource_group.sato.name
 {{- end}}
-  tags = {}
+{{- if .resource.tags}}
+  tags = {{Tags .resource.tags}}
+{{- end}}
 {{- if .resource.properties.dnsSettings.domainNameLabel}}
   domain_name_label        = {{ .resource.properties.dnsSettings.domainNameLabel|Quote }}
 {{- end}}
diff --git a/src/arm/resources/azurerm_role_assignment.template b/src/arm/resources/azurerm_role_assignment.template
index 02b8695..5e23c6a 100644
--- a/src/arm/resources/azurerm_role_assignment.template
+++ b/src/arm/resources/azurerm_role_assignment.template
@@ -4,6 +4,9 @@ resource "azurerm_role_assignment" "{{.item}}" {
   scope              = ""
   role_definition_id = {{.resource.properties.roleDefinitionId}}
   description        = {{.resource.metadata.description|Quote}}
+{{- if .resource.tags}}
+  tags = {{Tags .resource.tags}}
+{{- end}}
 {{- if .resource.dependsOn }}
   depends_on = [{{- range $x, $j:= .resource.dependsOn }} {{Deref $j}}, {{- end}}]
 {{- end}}
diff --git a/src/arm/resources/azurerm_role_definition.template b/src/arm/resources/azurerm_role_definition.template
index e501469..aaeab66 100644
--- a/src/arm/resources/azurerm_role_definition.template
+++ b/src/arm/resources/azurerm_role_definition.template
@@ -14,7 +14,9 @@ scope
 description
 permissions
 assignable_scopes
-
+{{- if .resource.tags}}
+  tags = {{Tags .resource.tags}}
+{{- end}}
 {{- if .resource.dependsOn }}
   depends_on = [{{- range $x, $j:= .resource.dependsOn }} {{Deref $j}}, {{- end}}]
 {{- end}}
diff --git a/src/arm/resources/azurerm_servicebus_namespace.template b/src/arm/resources/azurerm_servicebus_namespace.template
new file mode 100644
index 0000000..81c4818
--- /dev/null
+++ b/src/arm/resources/azurerm_servicebus_namespace.template
@@ -0,0 +1,41 @@
+resource "azurerm_servicebus_namespace" "{{.item}}" {
+{{- if .resource.location}}
+  location                 = {{ .resource.location|Quote }}
+{{- else}}
+  location                 = data.azurerm_resource_group.sato.location
+{{- end }}
+  name                     = {{ .resource.name|Quote }}
+{{- if .resource.resourceGroupName }}
+  resource_group_name      = {{  .resource.resourceGroupName|Quote }}
+{{- else }}
+  resource_group_name      = data.azurerm_resource_group.sato.name
+{{- end}}
+  sku                      = {{ .resource.sku.name|Quote}}
+{{- if  .resource.properties.identity}}
+  identity {}
+{{- end}}
+{{- if .resource.properties.capacity}}
+  capacity = {{.resource.properties.capacity|Quote}}
+{{- end}}
+{{- if .resource.properties.customerManagedKey}}
+  customer_managed_key ={{.resource.properties.customerManagedKey|Quote}}
+{{- end}}
+{{- if NotNil .resource.properties.localAuthEnabled}}
+  local_auth_enabled= {{ .resource.properties.localAuthEnabled}}
+{{- end}}
+{{- if NotNil .resource.properties.publicNetworkAccessEnabled}}
+  public_network_access_enabled ={{ .resource.properties.publicNetworkAccessEnabled}}
+{{- end}}
+{{- if .resource.properties.minimumTlsVersion}}
+  minimum_tls_version={{ .resource.properties.minimumTlsVersion|Quote}}
+{{- end}}
+{{- if .resource.properties.zoneRedundant}}
+  zone_redundant={{.resource.properties.zoneRedundant|Quote}}
+{{- end}}
+{{- if .resource.tags}}
+  tags = {{Tags .resource.tags}}
+{{- end}}
+{{- if .resource.dependsOn }}
+  depends_on = [{{- range $x, $j:= .resource.dependsOn }} {{ $j}}, {{- end}}]
+{{- end}}
+}
diff --git a/src/arm/resources/azurerm_servicebus_namespace_authorization_rule.template b/src/arm/resources/azurerm_servicebus_namespace_authorization_rule.template
new file mode 100644
index 0000000..fcd72eb
--- /dev/null
+++ b/src/arm/resources/azurerm_servicebus_namespace_authorization_rule.template
@@ -0,0 +1,15 @@
+resource "azurerm_servicebus_namespace_authorization_rule" "{{.item}}" {
+  name         = {{ .resource.name|Quote }}
+{{- if .resource.properties.rights}}
+{{- range $a, $i:= .resource.properties.rights}}
+  {{ToLower $i}}         = true
+{{- end}}
+{{- end}}
+  namespace_id = ""
+{{- if .resource.dependsOn }}
+  depends_on   = [{{- range $x, $j:= .resource.dependsOn }} {{ $j}}, {{- end}}]
+{{- end}}
+{{- if .resource.tags}}
+  tags = {{Tags .resource.tags}}
+{{- end}}
+}
diff --git a/src/arm/resources/azurerm_servicebus_queue.template b/src/arm/resources/azurerm_servicebus_queue.template
new file mode 100644
index 0000000..94abbff
--- /dev/null
+++ b/src/arm/resources/azurerm_servicebus_queue.template
@@ -0,0 +1,43 @@
+resource "azurerm_servicebus_queue" "{{.item}}" {
+  name         = {{ .resource.name|Quote }}
+  namespace_id = ""
+{{- if .resource.properties.lockDuration}}
+  lock_duration = {{.resource.properties.lockDuration|Quote}}
+{{- end}}
+{{- if NotNil .resource.properties.requiresSession}}
+  requires_session = {{ .resource.properties.requiresSession}}
+{{- end}}
+{{- if .resource.properties.defaultMessageTimeToLive}}
+  default_message_ttl = {{ .resource.properties.defaultMessageTimeToLive|Quote}}
+{{- end}}
+{{- if NotNil .resource.properties.duplicateDetectionHistoryTimeWindow}}
+  duplicate_detection_history_time_window = {{.resource.properties.duplicateDetectionHistoryTimeWindow|Quote}}
+{{- end}}
+{{- if .resource.properties.maxDeliveryCount}}
+  max_delivery_count = {{.resource.properties.maxDeliveryCount}}
+{{- end}}
+{{- if NotNil .resource.properties.enablePartitioning}}
+  enable_partitioning = {{.resource.properties.enablePartitioning}}
+{{- end}}
+{{- if NotNil .resource.properties.enableExpress}}
+  enable_express = {{.resource.properties.enableExpress}}
+{{- end}}
+{{- if .resource.properties.maxSizeInMegabytes}}
+  max_size_in_megabytes= {{ .resource.properties.maxSizeInMegabytes}}
+{{- end}}
+{{- if NotNil .resource.properties.requiresDuplicateDetection}}
+  requires_duplicate_detection = {{.resource.properties.requiresDuplicateDetection}}
+{{- end}}
+{{- if .resource.properties.deadLetteringOnMessageExpiration}}
+  dead_lettering_on_message_expiration = {{.resource.properties.deadLetteringOnMessageExpiration}}
+{{- end}}
+{{- if .resource.properties.autoDeleteOnIdle}}
+  auto_delete_on_idle = {{.resource.properties.autoDeleteOnIdle|Quote}}
+{{- end}}
+{{- if .resource.tags}}
+  tags = {{Tags .resource.tags}}
+{{- end}}
+{{- if .resource.dependsOn }}
+  depends_on = [{{- range $x, $j:= .resource.dependsOn }} {{ $j}}, {{- end}}]
+{{- end}}
+}
diff --git a/src/arm/resources/azurerm_storage_account.template b/src/arm/resources/azurerm_storage_account.template
index 156a5af..ee48113 100644
--- a/src/arm/resources/azurerm_storage_account.template
+++ b/src/arm/resources/azurerm_storage_account.template
@@ -11,6 +11,9 @@ resource "azurerm_storage_account" "{{.item}}" {
 {{- else }}
   resource_group_name      = data.azurerm_resource_group.sato.name
 {{- end}}
+{{- if .resource.tags}}
+  tags = {{Tags .resource.tags}}
+{{- end}}
 {{- if .resource.dependsOn }}
   depends_on                 = [{{- range $x, $j:= .resource.dependsOn }} {{Deref $j}}, {{- end}}]
 {{- end}}
diff --git a/src/arm/resources/azurerm_subnet.template b/src/arm/resources/azurerm_subnet.template
index 74cf45d..e44d515 100644
--- a/src/arm/resources/azurerm_subnet.template
+++ b/src/arm/resources/azurerm_subnet.template
@@ -1,4 +1,7 @@
 resource "azurerm_subnet" "{{.item}}" {
+{{- if .resource.tags}}
+  tags = {{Tags .resource.tags}}
+{{- end}}
 {{- if .resource.dependsOn }}
   depends_on                 = [{{- range $x, $j:= .resource.dependsOn }} {{Deref $j}}, {{- end}}]
 {{- end}}
diff --git a/src/arm/resources/azurerm_template_deployment.template b/src/arm/resources/azurerm_template_deployment.template
index 7f98c4f..d42bb4c 100644
--- a/src/arm/resources/azurerm_template_deployment.template
+++ b/src/arm/resources/azurerm_template_deployment.template
@@ -17,6 +17,9 @@ resource "azurerm_template_deployment" "{{.item}}" {
     {{ $i }}    = {{$j.value}}
 {{- end}}
   }
+{{- if .resource.tags}}
+  tags = {{Tags .resource.tags}}
+{{- end}}
 {{- if .resource.dependsOn }}
   depends_on = {{ .resource.dependsOn }}
 {{- end}}
diff --git a/src/arm/resources/azurerm_user_assigned_identity.template b/src/arm/resources/azurerm_user_assigned_identity.template
index d7f39f5..7103a43 100644
--- a/src/arm/resources/azurerm_user_assigned_identity.template
+++ b/src/arm/resources/azurerm_user_assigned_identity.template
@@ -10,6 +10,9 @@ resource "azurerm_user_assigned_identity" "{{.item}}" {
 {{- else }}
   resource_group_name      = data.azurerm_resource_group.sato.name
 {{- end}}
+{{- if .resource.tags}}
+  tags = {{Tags .resource.tags}}
+{{- end}}
 {{- if .resource.dependsOn }}
   depends_on = [{{- range $x, $j:= .resource.dependsOn }} {{Deref $j}}, {{- end}}]
 {{- end}}
diff --git a/src/arm/resources/azurerm_virtual_machine.template b/src/arm/resources/azurerm_virtual_machine.template
index fb8123e..52f2556 100644
--- a/src/arm/resources/azurerm_virtual_machine.template
+++ b/src/arm/resources/azurerm_virtual_machine.template
@@ -75,6 +75,9 @@ resource "azurerm_virtual_machine" "{{.item}}" {
 {{- end}}
   }
 {{- end }}
+{{- if .resource.tags}}
+  tags = {{Tags .resource.tags}}
+{{- end}}
 {{- if .resource.dependsOn }}
   depends_on                 = [{{- range $x, $j:= .resource.dependsOn }} {{ $j}}, {{- end}}]
 {{- end}}
diff --git a/src/arm/resources/azurerm_virtual_machine_extension.template b/src/arm/resources/azurerm_virtual_machine_extension.template
index c2a4749..d5a49c6 100644
--- a/src/arm/resources/azurerm_virtual_machine_extension.template
+++ b/src/arm/resources/azurerm_virtual_machine_extension.template
@@ -7,6 +7,9 @@ resource "azurerm_virtual_machine_extension" "{{.item}}" {
   auto_upgrade_minor_version = {{$p.autoUpgradeMinorVersion}}
   automatic_upgrade_enabled  = {{$p.enableAutomaticUpgrade}}
   settings                   = jsonencode({{Marshal $p.settings}})
+{{- if .resource.tags}}
+  tags = {{Tags .resource.tags}}
+{{- end}}
 {{- if .resource.dependsOn }}
   virtual_machine_id         = {{index .resource.dependsOn 0|Quote}}.id
   depends_on                 = [{{- range $x, $j:= .resource.dependsOn }} {{ $j}}, {{- end}}]
diff --git a/src/arm/resources/azurerm_virtual_network.template b/src/arm/resources/azurerm_virtual_network.template
index 01b1978..b765450 100644
--- a/src/arm/resources/azurerm_virtual_network.template
+++ b/src/arm/resources/azurerm_virtual_network.template
@@ -20,12 +20,13 @@ resource "azurerm_virtual_network" "{{.item}}" {
   }
 {{- end}}
 {{- end}}
+{{- if .resource.tags}}
+  tags = {{Tags .resource.tags}}
+{{- end}}
 {{- if .resource.dependsOn }}
-  depends_on                 = [{{- range $x, $j:= .resource.dependsOn }} {{ $j}}, {{- end}}]
+  depends_on  = [{{- range $x, $j:= .resource.dependsOn }} {{ $j}}, {{- end}}]
 {{- end}}
 }
-
-
 {{- if .resource.properties.subnets }}
 
 {{- end}}
diff --git a/src/arm/variable.go b/src/arm/variable.go
index f76db7d..cdf9d40 100644
--- a/src/arm/variable.go
+++ b/src/arm/variable.go
@@ -1,14 +1,14 @@
 package arm
 
 import (
-	_ "embed" //required for embed
+	_ "embed" // required for embed
 )
 
 //go:embed variable.template
-var VariableFile []byte
+var variableFile []byte
 
 //go:embed output.template
-var OutputFile []byte
+var outputFile []byte
 
 //go:embed data.template
-var DataFile []byte
+var dataFile []byte
diff --git a/src/cf/data.go b/src/cf/data.go
new file mode 100644
index 0000000..072be66
--- /dev/null
+++ b/src/cf/data.go
@@ -0,0 +1,28 @@
+package cf
+
+const dataAvailabilityZone = `data "aws_availability_zone" "example" {
+  name = ""
+}
+`
+
+const dataSubnet = `data "aws_subnet" "selected" {
+	id = ""
+}
+`
+
+const dataKeyPair = `data "aws_key_pair" "example" {
+  key_name = ""
+  include_public_key = true
+}
+`
+
+const dataVpc = `data "aws_vpc" "selected" {
+  id = ""
+}
+`
+
+const dataRegion = "data \"aws_region\" \"current\" {}\n"
+
+const dataSecurityGroup = "data \"aws_security_group\" \"selected\" {\n  id = \"\"\n}\n"
+
+const provider = "provider \"aws\" {\n  region=\"eu-west-2\"\n}\n"
diff --git a/src/helpers.go b/src/cf/helpers.go
similarity index 73%
rename from src/helpers.go
rename to src/cf/helpers.go
index bc861f4..e25d699 100644
--- a/src/helpers.go
+++ b/src/cf/helpers.go
@@ -1,4 +1,4 @@
-package sato
+package cf
 
 import (
 	"archive/zip"
@@ -14,22 +14,27 @@ import (
 	"github.com/gobeam/stringy"
 )
 
-// Replace is a template function
+// Replace is a template function.
 func Replace(input, from, to string) string {
-	return strings.Replace(input, from, to, -1)
+	return strings.ReplaceAll(input, from, to)
 }
 
-// Add is a template function
-func Add(s string, a []string, m map[string]bool) ([]string, map[string]bool) {
-	if m[s] {
-		return a, m
+// Add is a template function.
+func Add(
+	myString string,
+	myList []string,
+	myMap map[string]bool,
+) ([]string, map[string]bool) {
+	if myMap[myString] {
+		return myList, myMap
 	}
-	a = append(a, s)
-	m[s] = true
-	return a, m
+	myList = append(myList, myString) //nolint:wsl
+	myMap[myString] = true
+
+	return myList, myMap
 }
 
-// Split is a template function
+// Split is a template function.
 func Split(source string, separator string) []string {
 	return strings.Split(source, separator)
 }
@@ -40,21 +45,23 @@ func SplitOn(source string, separator string, index int) string {
 	if len(splits) >= index+1 {
 		return splits[index]
 	}
+
 	return ""
 }
 
 // Dequote is a template function
 func Dequote(target string) string {
-	return strings.Replace(strings.Replace(target, "\"", "", -1), "'", "", -1)
+	return strings.ReplaceAll(strings.ReplaceAll(target, "\"", ""), "'", "")
 }
 
 // Quote is a template function
 func Quote(target string) string {
-	//is it a resource or variable
+	// is it a resource or variable
 	if strings.Contains(target, "var.") || strings.Contains(target, "local.") ||
 		(strings.Contains(target, "_") && strings.Contains(target, ".")) {
 		return target
 	}
+
 	return "\"" + target + "\""
 }
 
@@ -63,12 +70,14 @@ func Boolean(test *bool) bool {
 	if test == nil {
 		return false
 	}
+
 	return *test
 }
 
 // Decode64 is a template function
 func Decode64(str string) string {
 	temp, _ := base64.StdEncoding.DecodeString(str)
+
 	return string(temp)
 }
 
@@ -78,20 +87,23 @@ func Sprint(unknown interface{}) string {
 	if temp == "<nil>" {
 		return "\"\""
 	}
+
 	return temp
 }
 
 // Snake is a template function
-func Snake(Camel string) string {
-	str := stringy.New(Camel)
+func Snake(camel string) string {
+	str := stringy.New(camel)
 	snakeStr := str.SnakeCase()
+
 	return snakeStr.ToLower()
 }
 
 // Kebab is a template function
-func Kebab(Camel string) string {
-	str := stringy.New(Camel)
+func Kebab(camel string) string {
+	str := stringy.New(camel)
 	KebabStr := str.KebabCase()
+
 	return KebabStr.ToLower()
 }
 
@@ -105,6 +117,7 @@ func Nill(str *string) string {
 	if str == nil {
 		return ""
 	}
+
 	return *str
 }
 
@@ -113,6 +126,7 @@ func Nild(str *string, myDefault string) string {
 	if str == nil || *str == "" {
 		return myDefault
 	}
+
 	return *str
 }
 
@@ -121,11 +135,15 @@ func Array(mySlice []string) string {
 	if mySlice == nil || mySlice[0] == "" {
 		return "[]"
 	}
-	var newSlice []string
+
+	var newSlice []string //nolint:prealloc
+
 	for _, item := range mySlice {
 		newSlice = append(newSlice, "\t\""+item+"\"")
 	}
-	newString := "[\n" + strings.Join(newSlice[:], ",") + "\n\t]\n"
+
+	newString := "[\n" + strings.Join(newSlice, ",") + "\n\t]\n"
+
 	return newString
 }
 
@@ -134,13 +152,15 @@ func ArrayReplace(mySlice []string, target string, replacement string) string {
 	if mySlice == nil || mySlice[0] == "" {
 		return "[]"
 	}
-	var newSlice []string
+
+	var newSlice []string //nolint:prealloc
 
 	for _, item := range mySlice {
 		item = strings.Replace(item, target, replacement, 1)
 		newSlice = append(newSlice, "\t\""+item+"\"")
 	}
 	newString := "[\n" + strings.Join(newSlice[:], ",") + "\n\t]\n"
+
 	return newString
 }
 
@@ -152,6 +172,7 @@ func Contains(target string, substring string) bool {
 // Zipfile is a template function
 func Zipfile(code string, filename string, runtime string) string {
 	var extension string
+
 	switch runtime {
 	case "nodejs16.x", "nodejs14.x", "nodejs12.x", "nodejs":
 		extension = ".js"
@@ -165,23 +186,25 @@ func Zipfile(code string, filename string, runtime string) string {
 
 	codeFile := filename + extension
 	d1 := []byte(code)
-	_ = os.WriteFile(codeFile, d1, 0644)
+	_ = os.WriteFile(codeFile, d1, 0o644)
 
 	output := filename + ".zip"
 	archive, _ := os.Create(output)
+
 	defer func(archive *os.File) {
 		_ = archive.Close()
 	}(archive)
+
 	zipWriter := zip.NewWriter(archive)
 
-	f1, _ := os.Open(filename)
+	file, _ := os.Open(filename)
 
 	defer func(f1 *os.File) {
 		_ = f1.Close()
-	}(f1)
+	}(file)
 
 	w1, _ := zipWriter.Create(filename)
-	_, _ = io.Copy(w1, f1)
+	_, _ = io.Copy(w1, file)
 	_ = zipWriter.Close()
 
 	return output
@@ -189,34 +212,41 @@ func Zipfile(code string, filename string, runtime string) string {
 
 // Demap is a template function
 func Demap(str string) []string {
-	str = strings.Replace(str, "{", "", -1)
-	str = strings.Replace(str, "}", "", -1)
-	str = strings.Replace(str, "\"", "", -1)
-	str = strings.Replace(str, ":", "", -1)
-	str = strings.Replace(str, " ", "", -1)
+	str = strings.ReplaceAll(str, "{", "")
+	str = strings.ReplaceAll(str, "}", "")
+	str = strings.ReplaceAll(str, "\"", "")
+	str = strings.ReplaceAll(str, ":", "")
+	str = strings.ReplaceAll(str, " ", "")
+
 	return strings.Split(str, ",")
 }
 
 // Tags is a template function
 func Tags(v []tags.Tag) string {
 	var temp string
+
 	for _, item := range v {
 		if item.Key != "" {
 			temp = temp + "\t\"" + item.Key + "\"" + "=" + "\"" + item.Value + "\"" + "\n"
 		}
 	}
+
 	return temp
 }
 
 // RandomString is a template function
 func RandomString(n int) string {
-	rand.Seed(time.Now().UnixNano())
-	var letters = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
-	b := make([]rune, n)
-	for i := range b {
-		b[i] = letters[rand.Intn(len(letters))]
+	rand.New(rand.NewSource(time.Now().UnixNano())) //nolint:gosec
+
+	letters := []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
+	myString := make([]rune, n)
+
+	for i := range myString {
+		//goland:noinspection GoLinter
+		myString[i] = letters[rand.Intn(len(letters))] //nolint:gosec
 	}
-	return string(b)
+
+	return string(myString)
 }
 
 // Map is a template function
@@ -225,7 +255,8 @@ func Map(myMap map[string]string) string {
 	for item, stuff := range myMap {
 		result = result + "\t\"" + item + "\"" + "=" + "\"" + stuff + "\"\n"
 	}
-	result = result + " }"
+
+	result += " }"
 
 	return result
 }
diff --git a/src/helpers_test.go b/src/cf/helpers_test.go
similarity index 80%
rename from src/helpers_test.go
rename to src/cf/helpers_test.go
index da0004d..9e34b04 100644
--- a/src/helpers_test.go
+++ b/src/cf/helpers_test.go
@@ -1,16 +1,20 @@
-package sato
+package cf_test
 
 import (
 	"reflect"
+	sato "sato/src/cf"
 	"testing"
 )
 
 func Test_replace(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		input string
 		from  string
 		to    string
 	}
+
 	tests := []struct {
 		name string
 		args args
@@ -18,9 +22,12 @@ func Test_replace(t *testing.T) {
 	}{
 		{"pass", args{"hankey", "k", "l"}, "hanley"},
 	}
+
 	for _, tt := range tests {
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
-			if got := Replace(tt.args.input, tt.args.from, tt.args.to); got != tt.want {
+			t.Parallel()
+			if got := sato.Replace(tt.args.input, tt.args.from, tt.args.to); got != tt.want {
 				t.Errorf("Replace() = %v, want %v", got, tt.want)
 			}
 		})
@@ -28,12 +35,16 @@ func Test_replace(t *testing.T) {
 }
 
 func Test_add(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		s string
 		a []string
 		m map[string]bool
 	}
+
 	var added []string
+
 	m := map[string]bool{"test": false}
 	after := []string{"test"}
 	afterMap := map[string]bool{"test": true}
@@ -48,9 +59,12 @@ func Test_add(t *testing.T) {
 		{"Add-empty", args{"test", added, m}, after, afterMap},
 		{"no-change", args{"test", exists, afterMap}, after, afterMap},
 	}
+
 	for _, tt := range tests {
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
-			got, got1 := Add(tt.args.s, tt.args.a, tt.args.m)
+			t.Parallel()
+			got, got1 := sato.Add(tt.args.s, tt.args.a, tt.args.m)
 			if !reflect.DeepEqual(got, tt.want) {
 				t.Errorf("Add() got = %v, want %v", got, tt.want)
 			}
@@ -62,10 +76,13 @@ func Test_add(t *testing.T) {
 }
 
 func Test_split(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		source    string
 		separator string
 	}
+
 	result := []string{"test", "here"}
 	tests := []struct {
 		name string
@@ -74,9 +91,12 @@ func Test_split(t *testing.T) {
 	}{
 		{"pass", args{"test:here", ":"}, result},
 	}
+
 	for _, tt := range tests {
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
-			if got := Split(tt.args.source, tt.args.separator); !reflect.DeepEqual(got, tt.want) {
+			t.Parallel()
+			if got := sato.Split(tt.args.source, tt.args.separator); !reflect.DeepEqual(got, tt.want) {
 				t.Errorf("Split() = %v, want %v", got, tt.want)
 			}
 		})
@@ -84,9 +104,12 @@ func Test_split(t *testing.T) {
 }
 
 func Test_dequote(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		target string
 	}
+
 	tests := []struct {
 		name string
 		args args
@@ -94,9 +117,12 @@ func Test_dequote(t *testing.T) {
 	}{
 		{"Dequote", args{"This is a \"pain\""}, "This is a pain"},
 	}
+
 	for _, tt := range tests {
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
-			if got := Dequote(tt.args.target); got != tt.want {
+			t.Parallel()
+			if got := sato.Dequote(tt.args.target); got != tt.want {
 				t.Errorf("Dequote() = %v, want %v", got, tt.want)
 			}
 		})
@@ -104,11 +130,15 @@ func Test_dequote(t *testing.T) {
 }
 
 func Test_boolean(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		test *bool
 	}
+
 	test := true
 	var undefined bool
+
 	tests := []struct {
 		name string
 		args args
@@ -118,9 +148,12 @@ func Test_boolean(t *testing.T) {
 		{"false", args{nil}, false},
 		{"undefined", args{&undefined}, false},
 	}
+
 	for _, tt := range tests {
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
-			if got := Boolean(tt.args.test); got != tt.want {
+			t.Parallel()
+			if got := sato.Boolean(tt.args.test); got != tt.want {
 				t.Errorf("Boolean() = %v, want %v", got, tt.want)
 			}
 		})
@@ -128,9 +161,12 @@ func Test_boolean(t *testing.T) {
 }
 
 func Test_decode64(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		str string
 	}
+
 	tests := []struct {
 		name string
 		args args
@@ -138,9 +174,11 @@ func Test_decode64(t *testing.T) {
 	}{
 		{"decode", args{"QSB0ZXN0"}, "A test"},
 	}
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := Decode64(tt.args.str); got != tt.want {
+			t.Parallel()
+			if got := sato.Decode64(tt.args.str); got != tt.want {
 				t.Errorf("Decode64() = %v, want %v", got, tt.want)
 			}
 		})
@@ -148,6 +186,8 @@ func Test_decode64(t *testing.T) {
 }
 
 func Test_sprint(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		unknown interface{}
 	}
@@ -171,7 +211,8 @@ func Test_sprint(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := Sprint(tt.args.unknown); got != tt.want {
+			t.Parallel()
+			if got := sato.Sprint(tt.args.unknown); got != tt.want {
 				t.Errorf("Sprint() = %v, want %v", got, tt.want)
 			}
 		})
@@ -191,7 +232,7 @@ func Test_quote(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := Quote(tt.args.target); got != tt.want {
+			if got := sato.Quote(tt.args.target); got != tt.want {
 				t.Errorf("Quote() = %v, want %v", got, tt.want)
 			}
 		})
@@ -212,7 +253,7 @@ func Test_snake(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := Snake(tt.args.Camel); got != tt.want {
+			if got := sato.Snake(tt.args.Camel); got != tt.want {
 				t.Errorf("Snake() = %v, want %v", got, tt.want)
 			}
 		})
@@ -233,7 +274,7 @@ func Test_kebab(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := Kebab(tt.args.Camel); got != tt.want {
+			if got := sato.Kebab(tt.args.Camel); got != tt.want {
 				t.Errorf("Kebab() = %v, want %v", got, tt.want)
 			}
 		})
@@ -254,7 +295,7 @@ func Test_lower(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := Lower(tt.args.target); got != tt.want {
+			if got := sato.Lower(tt.args.target); got != tt.want {
 				t.Errorf("Lower() = %v, want %v", got, tt.want)
 			}
 		})
@@ -276,7 +317,7 @@ func Test_nill(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := Nill(tt.args.str); got != tt.want {
+			if got := sato.Nill(tt.args.str); got != tt.want {
 				t.Errorf("Nill() = %v, want %v", got, tt.want)
 			}
 		})
@@ -299,7 +340,7 @@ func Test_nild(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := Nild(tt.args.str, tt.args.myDefault); got != tt.want {
+			if got := sato.Nild(tt.args.str, tt.args.myDefault); got != tt.want {
 				t.Errorf("Nild() = %v, want %v", got, tt.want)
 			}
 		})
@@ -315,16 +356,20 @@ func Test_array(t *testing.T) {
 		args args
 		want string
 	}{
-		{name: "Replace",
+		{
+			name: "Replace",
 			args: args{mySlice: []string{"some", "thing", "punt"}},
-			want: "[\n\t\"some\",\t\"thing\",\t\"punt\"\n\t]\n"},
-		{name: "nil",
+			want: "[\n\t\"some\",\t\"thing\",\t\"punt\"\n\t]\n",
+		},
+		{
+			name: "nil",
 			args: args{mySlice: nil},
-			want: "[]"},
+			want: "[]",
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := Array(tt.args.mySlice); got != tt.want {
+			if got := sato.Array(tt.args.mySlice); got != tt.want {
 				t.Errorf("Array() = %v, want %v", got, tt.want)
 			}
 		})
@@ -342,16 +387,20 @@ func Test_arrayReplace(t *testing.T) {
 		args args
 		want string
 	}{
-		{name: "Replace",
+		{
+			name: "Replace",
 			args: args{mySlice: []string{"some", "thing", "punt"}, target: "pu", replacement: "ca"},
-			want: "[\n\t\"some\",\t\"thing\",\t\"cant\"\n\t]\n"},
-		{name: "nil",
+			want: "[\n\t\"some\",\t\"thing\",\t\"cant\"\n\t]\n",
+		},
+		{
+			name: "nil",
 			args: args{mySlice: nil, target: "pu", replacement: "ca"},
-			want: "[]"},
+			want: "[]",
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := ArrayReplace(tt.args.mySlice, tt.args.target, tt.args.replacement); got != tt.want {
+			if got := sato.ArrayReplace(tt.args.mySlice, tt.args.target, tt.args.replacement); got != tt.want {
 				t.Errorf("ArrayReplace() = %v, want %v", got, tt.want)
 			}
 		})
@@ -373,7 +422,7 @@ func Test_contains(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := Contains(tt.args.target, tt.args.substring); got != tt.want {
+			if got := sato.Contains(tt.args.target, tt.args.substring); got != tt.want {
 				t.Errorf("Contains() = %v, want %v", got, tt.want)
 			}
 		})
@@ -381,21 +430,26 @@ func Test_contains(t *testing.T) {
 }
 
 func Test_zipfile(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		code     string
 		filename string
 		runtime  string
 	}
+
 	tests := []struct {
 		name string
 		args args
 		want string
 	}{
-		// TODO: Add test cases.
+		//{},
 	}
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := Zipfile(tt.args.code, tt.args.filename, tt.args.runtime); got != tt.want {
+			t.Parallel()
+			if got := sato.Zipfile(tt.args.code, tt.args.filename, tt.args.runtime); got != tt.want {
 				t.Errorf("Zipfile() = %v, want %v", got, tt.want)
 			}
 		})
diff --git a/src/lookup.go b/src/cf/lookup.go
similarity index 91%
rename from src/lookup.go
rename to src/cf/lookup.go
index fb52fa1..d34a28c 100644
--- a/src/lookup.go
+++ b/src/cf/lookup.go
@@ -1,4 +1,4 @@
-package sato
+package cf
 
 import (
 	"bytes"
@@ -10,8 +10,8 @@ import (
 	"github.com/rs/zerolog/log"
 )
 
-// ParseResources converts resource to Terraform
-func ParseResources(resources cloudformation.Resources, funcMap tftemplate.FuncMap, destination string) error {
+// parseResources converts resource to Terraform
+func parseResources(resources cloudformation.Resources, funcMap tftemplate.FuncMap, destination string) error {
 	for item, resource := range resources {
 		var output bytes.Buffer
 
@@ -19,9 +19,8 @@ func ParseResources(resources cloudformation.Resources, funcMap tftemplate.FuncM
 
 		myContent := lookup(myType)
 
-		//needs to pivot on policy template from resource
+		// needs to pivot on policy template from resource
 		tmpl, err := tftemplate.New("sato").Funcs(funcMap).Parse(string(myContent))
-
 		if err != nil {
 			return err
 		}
@@ -31,14 +30,19 @@ func ParseResources(resources cloudformation.Resources, funcMap tftemplate.FuncM
 			"item":     item,
 		})
 
-		err = Write(ReplaceDependant(ReplaceVariables(output.String())), destination, fmt.Sprint(ToTFName(myType), ".", strings.ToLower(item)))
+		err = Write(
+			ReplaceDependant(
+				ReplaceVariables(output.String())), destination, fmt.Sprint(ToTFName(myType), ".", strings.ToLower(item)))
 		if err != nil {
 			return err
 		}
 	}
+
 	return nil
 }
 
+//goland:noinspection GoLinter
+//nolint:funlen
 func lookup(myType string) []byte {
 	TFLookup := map[string]interface{}{
 		"AWS::ApplicationAutoScaling::ScalableTarget":      awsAppAutoscalingTarget,
@@ -127,14 +131,14 @@ func lookup(myType string) []byte {
 		"AWS::Logs::MetricFilter":                          awsCloudwatchLogMetricFilter,
 		"AWS::Neptune::DBCluster":                          awsNeptuneCluster,
 		"AWS::Neptune::DBClusterParameterGroup":            awsNeptuneClusterDBParameterGroup,
-		"AWS::Neptune::DBInstance":                         awsNeptuneDbInstance,
+		"AWS::Neptune::DBInstance":                         awsNeptuneDBInstance,
 		"AWS::Neptune::DBParameterGroup":                   awsNeptuneDBParameterGroup,
 		"AWS::Neptune::DBSubnetGroup":                      awsNeptuneDnSubnetGroup,
 		"AWS::RDS::DBCluster":                              awsRdsCluster,
-		"AWS::RDS::DBClusterParameterGroup":                awsDbParameterGroup,
-		"AWS::RDS::DBInstance":                             awsDbInstance,
-		"AWS::RDS::DBParameterGroup":                       awsDbParameterGroup,
-		"AWS::RDS::DBSubnetGroup":                          awsDbSubnetGroup,
+		"AWS::RDS::DBClusterParameterGroup":                awsDBParameterGroup,
+		"AWS::RDS::DBInstance":                             awsDBInstance,
+		"AWS::RDS::DBParameterGroup":                       awsDBParameterGroup,
+		"AWS::RDS::DBSubnetGroup":                          awsDBSubnetGroup,
 		"AWS::Route53::RecordSet":                          awsRoute53Record,
 		"AWS::S3::Bucket":                                  awsS3Bucket,
 		"AWS::S3::BucketPolicy":                            awsS3BucketPolicy,
@@ -159,11 +163,18 @@ func lookup(myType string) []byte {
 	}
 
 	var myContent []byte
+
+	var ok bool
+
 	if TFLookup[myType] != nil {
-		myContent = TFLookup[myType].([]byte)
+		myContent, ok = TFLookup[myType].([]byte)
+		if !ok {
+			log.Warn().Msg("failed to cast to []byte")
+		}
 	} else {
-		//we don't want to half the parsing so just log it.
+		// we don't want to half the parsing so just log it.
 		log.Warn().Msgf("%s not found", myType)
 	}
+
 	return myContent
 }
diff --git a/src/lookup_test.go b/src/cf/lookup_test.go
similarity index 82%
rename from src/lookup_test.go
rename to src/cf/lookup_test.go
index f5e1c6a..775624e 100644
--- a/src/lookup_test.go
+++ b/src/cf/lookup_test.go
@@ -1,4 +1,4 @@
-package sato
+package cf
 
 import (
 	"reflect"
@@ -9,22 +9,27 @@ import (
 )
 
 func TestParseResources(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		resources   cloudformation.Resources
 		funcMap     tftemplate.FuncMap
 		destination string
 	}
+
 	tests := []struct {
 		name    string
 		args    args
 		wantErr bool
 	}{
-		// TODO: Add test cases.
+		//{},
 	}
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if err := ParseResources(tt.args.resources, tt.args.funcMap, tt.args.destination); (err != nil) != tt.wantErr {
-				t.Errorf("ParseResources() error = %v, wantErr %v", err, tt.wantErr)
+			t.Parallel()
+			if err := parseResources(tt.args.resources, tt.args.funcMap, tt.args.destination); (err != nil) != tt.wantErr {
+				t.Errorf("parseResources() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})
 	}
@@ -43,8 +48,10 @@ func TestLookup(t *testing.T) {
 		{"found", args{"AWS::SNS::Topic"}, awsSNSTopic},
 		{"not found", args{"AWS::SNS::Balderdash"}, nil},
 	}
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
 			got := lookup(tt.args.myType)
 			if !reflect.DeepEqual(got, tt.want) {
 				t.Errorf("Lookup() = %v, want %v", got, tt.want)
diff --git a/src/parse.go b/src/cf/parse.go
similarity index 71%
rename from src/parse.go
rename to src/cf/parse.go
index d9663c0..8fcc268 100644
--- a/src/parse.go
+++ b/src/cf/parse.go
@@ -1,4 +1,4 @@
-package sato
+package cf
 
 import (
 	"bytes"
@@ -16,10 +16,14 @@ import (
 	"github.com/rs/zerolog/log"
 )
 
-// M is a wrapper object to help pass in multiple object to template
+const typeNumber = "number"
+const typeListString = "list(string)"
+const typeString = "string"
+
+// M is a wrapper object to help pass in multiple object to template.
 type M map[string]interface{}
 
-// Variable describes a terraform variable
+// Variable describes a terraform variable.
 type Variable struct {
 	Description string
 	Type        string
@@ -27,7 +31,7 @@ type Variable struct {
 	Name        string
 }
 
-// Output describes Tf output type
+// Output describes Tf output type.
 type Output struct {
 	Description string
 	Type        string
@@ -35,7 +39,7 @@ type Output struct {
 	Name        string
 }
 
-// Parse turn CFN into Terraform
+// Parse turn CFN into Terraform.
 func Parse(file string, destination string) error {
 	// Open a template from file (can be JSON or YAML)
 	fileAbs, err := filepath.Abs(file)
@@ -65,6 +69,7 @@ func Parse(file string, destination string) error {
 		"Nild":         Nild,
 		"Marshal": func(v interface{}) string {
 			a, _ := json.Marshal(v)
+
 			return string(a)
 		},
 		"Split":        Split,
@@ -78,11 +83,12 @@ func Parse(file string, destination string) error {
 		"ZipFile":      Zipfile,
 	}
 	_, err = ParseVariables(template, funcMap, destination)
+
 	if err != nil {
 		return err
 	}
 
-	err = ParseResources(template.Resources, funcMap, destination)
+	err = parseResources(template.Resources, funcMap, destination)
 	if err != nil {
 		return err
 	}
@@ -91,35 +97,45 @@ func Parse(file string, destination string) error {
 }
 
 // ParseVariables convert CFN Parameters into terraform variables
-func ParseVariables(template *cloudformation.Template, funcMap tftemplate.FuncMap, destination string) ([]Variable, error) {
+func ParseVariables(
+	template *cloudformation.Template,
+	funcMap tftemplate.FuncMap,
+	destination string,
+) ([]Variable, error) {
 	var All string
 
 	var (
-		m             = make(map[string]bool)
+		myMap         = make(map[string]bool)
 		DataResources []string
 	)
 
 	var myVariables []Variable
+
 	for Name, param := range template.Parameters {
 		var myVariable Variable
 
-		DataResources, myVariable, m = GetVariableType(param, myVariable, DataResources, m)
-		myVariable.Description = strings.Replace(*param.Description, "${", "$${", -1)
+		DataResources, myVariable, myMap = GetVariableType(param, myVariable, DataResources, myMap)
+		myVariable.Description = strings.ReplaceAll(*param.Description, "${", "$${")
 		myVariable.Name = Name
 		myVariable = GetVariableDefault(param, myVariable)
 
 		var output bytes.Buffer
-		tmpl, err := tftemplate.New("test").Funcs(funcMap).Parse(string(VariableFile))
+
+		tmpl, err := tftemplate.New("test").Funcs(funcMap).Parse(string(variableFile))
 		if err != nil {
 			return nil, err
 		}
+
 		_ = tmpl.Execute(&output, M{
 			"variable": myVariable,
 			"item":     Name,
 		})
-		All = All + output.String()
+
+		All += output.String()
+
 		myVariables = append(myVariables, myVariable)
 	}
+
 	err := Write(All, destination, "variables")
 	if err != nil {
 		return nil, err
@@ -133,8 +149,12 @@ func ParseVariables(template *cloudformation.Template, funcMap tftemplate.FuncMa
 	return myVariables, nil
 }
 
-// GetVariableType determines variable types
-func GetVariableType(param cloudformation.Parameter, myVariable Variable, DataResources []string, m map[string]bool) ([]string, Variable, map[string]bool) {
+// GetVariableType determines variable types.
+func GetVariableType(
+	param cloudformation.Parameter,
+	myVariable Variable,
+	dataResources []string,
+	myMap map[string]bool) ([]string, Variable, map[string]bool) {
 	switch param.Type {
 	case "String":
 		if param.Default == "false" || param.Default == "true" || param.Default == true || param.Default == false {
@@ -143,46 +163,48 @@ func GetVariableType(param cloudformation.Parameter, myVariable Variable, DataRe
 			myVariable.Type = strings.ToLower(param.Type)
 		}
 	case "CommaDelimitedList":
-		myVariable.Type = "list(string)"
+		myVariable.Type = typeListString
 	case "List<AWS::EC2::AvailabilityZone::Name>":
-		myVariable.Type = "list(string)"
-		DataResources, m = Add(dataAvailabilityZone, DataResources, m)
+		myVariable.Type = typeListString
+		dataResources, myMap = Add(dataAvailabilityZone, dataResources, myMap)
 	case "AWS::EC2::Subnet::Id":
-		myVariable.Type = "string"
-		DataResources, m = Add(dataSubnet, DataResources, m)
+		myVariable.Type = typeString
+		dataResources, myMap = Add(dataSubnet, dataResources, myMap)
 	case "AWS::EC2::KeyPair::KeyName":
-		myVariable.Type = "string"
-		DataResources, m = Add(dataKeyPair, DataResources, m)
+		myVariable.Type = typeString
+		dataResources, myMap = Add(dataKeyPair, dataResources, myMap)
 	case "AWS::EC2::VPC::Id", "List<AWS::EC2::VPC::Id>":
-		myVariable.Type = "string"
-		DataResources, m = Add(dataVpc, DataResources, m)
+		myVariable.Type = typeString
+		dataResources, myMap = Add(dataVpc, dataResources, myMap)
 	case "AWS::EC2::SecurityGroup::Id":
-		myVariable.Type = "string"
-		DataResources, m = Add(dataSecurityGroup, DataResources, m)
+		myVariable.Type = typeString
+		dataResources, myMap = Add(dataSecurityGroup, dataResources, myMap)
 	case "AWS::EC2::Image::Id", "AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>":
-		myVariable.Type = "string"
+		myVariable.Type = typeString
 	case "AWS::Region":
-		myVariable.Type = "string"
-		DataResources, m = Add(dataRegion, DataResources, m)
+		myVariable.Type = typeString
+		dataResources, myMap = Add(dataRegion, dataResources, myMap)
 	case "List<AWS::EC2::Subnet::Id>":
-		myVariable.Type = "list(string)"
+		myVariable.Type = typeListString
 	case "Number":
-		myVariable.Type = "number"
+		myVariable.Type = typeNumber
 	default:
 		log.Info().Msgf("Variable %s", param.Type)
 	}
 
-	DataResources, m = Add(provider, DataResources, m)
-	return DataResources, myVariable, m
+	dataResources, myMap = Add(provider, dataResources, myMap)
+
+	return dataResources, myVariable, myMap
 }
 
-// GetVariableDefault determines a variables default value
+// GetVariableDefault determines a variables default value.
 func GetVariableDefault(param cloudformation.Parameter, myVariable Variable) Variable {
+	//goland:noinspection GoLinter
 	switch param.Default.(type) {
 	case string:
 		_, err := strconv.Atoi(param.Default.(string))
 		if err == nil {
-			myVariable.Type = "number"
+			myVariable.Type = typeNumber
 			myVariable.Default = param.Default.(string)
 		} else {
 			if myVariable.Type == "bool" {
@@ -196,7 +218,7 @@ func GetVariableDefault(param cloudformation.Parameter, myVariable Variable) Var
 			}
 		}
 	case float64:
-		myVariable.Type = "number"
+		myVariable.Type = typeNumber
 		myVariable.Default = fmt.Sprintf("%v", param.Default.(float64))
 	case bool:
 		myVariable.Default = strconv.FormatBool(param.Default.(bool))
@@ -205,25 +227,31 @@ func GetVariableDefault(param cloudformation.Parameter, myVariable Variable) Var
 	default:
 		myVariable.Default = "null"
 	}
+
 	return myVariable
 }
 
-// StringToMap converts maps in strings(for tags)
+// StringToMap converts maps in strings(for tags).
 func StringToMap(param cloudformation.Parameter, myVariable Variable) Variable {
 	temp := strings.Split(param.Default.(string), "=")
+
 	var myMap string
-	for n := 0; n < len(temp); n++ {
-		if n == 0 {
-			myMap = myMap + "{ "
+
+	for item := 0; item < len(temp); item++ {
+		if item == 0 {
+			myMap += "{ "
 		}
-		if n%2 == 0 {
-			myMap = myMap + "\"" + temp[n] + "\" = "
+
+		if item%2 == 0 {
+			myMap += "\"" + temp[item] + "\" = "
 		} else {
-			myMap = myMap + "\"" + temp[n] + "\""
+			myMap += "\"" + temp[item] + "\""
 		}
 	}
+
 	myVariable.Default = myMap + "}"
 	myVariable.Type = "map(string)"
+
 	return myVariable
 }
 
@@ -232,6 +260,7 @@ func Write(output string, location string, name string) error {
 	if output != "" {
 		newPath, _ := filepath.Abs(location)
 		err := os.MkdirAll(newPath, os.ModePerm)
+
 		if err != nil {
 			return err
 		}
@@ -239,12 +268,14 @@ func Write(output string, location string, name string) error {
 		d1 := []byte(output)
 
 		destination, _ := filepath.Abs(fmt.Sprint(location, "/", name, ".tf"))
-		err = os.WriteFile(destination, d1, 0644)
+		err = os.WriteFile(destination, d1, 0o644)
 		log.Info().Msgf("Created %s", destination)
+
 		if err != nil {
 			return err
 		}
 	}
+
 	return nil
 }
 
@@ -259,12 +290,12 @@ func ReplaceVariables(str1 string) string {
 	submatch := re.FindAllString(str1, -1)
 
 	for _, target := range submatch {
-		if strings.Contains(target, "::") {
-		} else {
+		if !strings.Contains(target, "::") {
 			brReplace := strings.Replace(target, "${", "${var.", 1)
 			str1 = strings.Replace(str1, target, brReplace, 1)
 		}
 	}
+
 	return str1
 }
 
@@ -272,5 +303,6 @@ func ReplaceVariables(str1 string) string {
 func ReplaceDependant(str1 string) string {
 	replacer := strings.NewReplacer(
 		"AWS::Region", "data.aws_region.current.name")
+
 	return replacer.Replace(str1)
 }
diff --git a/src/parse_test.go b/src/cf/parse_test.go
similarity index 63%
rename from src/parse_test.go
rename to src/cf/parse_test.go
index b9e222e..b818f0d 100644
--- a/src/parse_test.go
+++ b/src/cf/parse_test.go
@@ -1,97 +1,123 @@
-package sato
+package cf_test
 
 import (
 	"reflect"
+	sato "sato/src/cf"
 	"testing"
 	tftemplate "text/template"
 
 	"github.com/awslabs/goformation/v7/cloudformation"
 )
 
+//goland:noinspection GoLinter,GoLinter,GoLinter,GoLinter,GoLinter,GoLinter
 func TestParse(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		file        string
 		destination string
 	}
+
 	tests := []struct {
 		name    string
 		args    args
 		wantErr bool
 	}{
-		// TODO: Add test cases.
+		//{},
 	}
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if err := Parse(tt.args.file, tt.args.destination); (err != nil) != tt.wantErr {
+			t.Parallel()
+			if err := sato.Parse(tt.args.file, tt.args.destination); (err != nil) != tt.wantErr {
 				t.Errorf("Parse() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})
 	}
 }
 
+//goland:noinspection GoLinter,GoLinter,GoLinter,GoLinter,GoLinter,GoLinter
 func TestStringToMap(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		param      cloudformation.Parameter
-		myVariable Variable
+		myVariable sato.Variable
 	}
+
 	tests := []struct {
 		name string
 		args args
-		want Variable
+		want sato.Variable
 	}{
-		// TODO: Add test cases.
+		//{},
 	}
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := StringToMap(tt.args.param, tt.args.myVariable); !reflect.DeepEqual(got, tt.want) {
+			t.Parallel()
+			if got := sato.StringToMap(tt.args.param, tt.args.myVariable); !reflect.DeepEqual(got, tt.want) {
 				t.Errorf("StringToMap() = %v, want %v", got, tt.want)
 			}
 		})
 	}
 }
 
+//goland:noinspection GoLinter,GoLinter,GoLinter,GoLinter,GoLinter,GoLinter
 func TestWrite(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		output   string
 		location string
 		name     string
 	}
+
 	tests := []struct {
 		name    string
 		args    args
 		wantErr bool
 	}{
-		// TODO: Add test cases.
+		//{},
 	}
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if err := Write(tt.args.output, tt.args.location, tt.args.name); (err != nil) != tt.wantErr {
+			t.Parallel()
+			if err := sato.Write(tt.args.output, tt.args.location, tt.args.name); (err != nil) != tt.wantErr {
 				t.Errorf("Write() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})
 	}
 }
 
+//goland:noinspection GoLinter,GoLinter,GoLinter,GoLinter,GoLinter,GoLinter
 func TestToTFName(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		CFN string
 	}
+
 	tests := []struct {
 		name string
 		args args
 		want string
 	}{
-		// TODO: Add test cases.
+		{},
 	}
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := ToTFName(tt.args.CFN); got != tt.want {
+			t.Parallel()
+			if got := sato.ToTFName(tt.args.CFN); got != tt.want {
 				t.Errorf("ToTFName() = %v, want %v", got, tt.want)
 			}
 		})
 	}
 }
 
+//goland:noinspection GoLinter,GoLinter,GoLinter,GoLinter,GoLinter
 func TestReplaceVariables(t *testing.T) {
 	type args struct {
 		str1 string
@@ -106,30 +132,37 @@ func TestReplaceVariables(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := ReplaceVariables(tt.args.str1); got != tt.want {
+			if got := sato.ReplaceVariables(tt.args.str1); got != tt.want {
 				t.Errorf("ReplaceVariables() = %v, want %v", got, tt.want)
 			}
 		})
 	}
 }
 
+//goland:noinspection GoLinter,GoLinter,GoLinter,GoLinter,GoLinter,GoLinter,GoLinter,GoLinter,GoLinter,GoLinter
 func TestParseVariables(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		template    *cloudformation.Template
 		funcMap     tftemplate.FuncMap
 		destination string
 	}
+
 	tests := []struct {
 		name    string
 		args    args
-		want    []Variable
+		want    []sato.Variable
 		wantErr bool
 	}{
-		// TODO: Add test cases.
+		//{},
 	}
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := ParseVariables(tt.args.template, tt.args.funcMap, tt.args.destination)
+			t.Parallel()
+
+			got, err := sato.ParseVariables(tt.args.template, tt.args.funcMap, tt.args.destination)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("ParseVariables() error = %v, wantErr %v", err, tt.wantErr)
 				return
@@ -141,25 +174,31 @@ func TestParseVariables(t *testing.T) {
 	}
 }
 
+//goland:noinspection GoLinter,GoLinter,GoLinter,GoLinter,GoLinter,GoLinter,GoLinter,GoLinter,GoLinter,GoLinter,GoLinter
 func TestGetVariableType(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		param         cloudformation.Parameter
-		myVariable    Variable
+		myVariable    sato.Variable
 		DataResources []string
 		m             map[string]bool
 	}
+
 	tests := []struct {
 		name  string
 		args  args
 		want  []string
-		want1 Variable
+		want1 sato.Variable
 		want2 map[string]bool
 	}{
-		// TODO: Add test cases.
+		//{},
 	}
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, got1, got2 := GetVariableType(tt.args.param, tt.args.myVariable, tt.args.DataResources, tt.args.m)
+			t.Parallel()
+			got, got1, got2 := sato.GetVariableType(tt.args.param, tt.args.myVariable, tt.args.DataResources, tt.args.m)
 			if !reflect.DeepEqual(got, tt.want) {
 				t.Errorf("GetVariableType() got = %v, want %v", got, tt.want)
 			}
@@ -173,27 +212,34 @@ func TestGetVariableType(t *testing.T) {
 	}
 }
 
+//goland:noinspection GoLinter,GoLinter,GoLinter,GoLinter,GoLinter,GoLinter
 func TestGetVariableDefault(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		param      cloudformation.Parameter
-		myVariable Variable
+		myVariable sato.Variable
 	}
+
 	tests := []struct {
 		name string
 		args args
-		want Variable
+		want sato.Variable
 	}{
-		// TODO: Add test cases.
+		//{},
 	}
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := GetVariableDefault(tt.args.param, tt.args.myVariable); !reflect.DeepEqual(got, tt.want) {
+			t.Parallel()
+			if got := sato.GetVariableDefault(tt.args.param, tt.args.myVariable); !reflect.DeepEqual(got, tt.want) {
 				t.Errorf("GetVariableDefault() = %v, want %v", got, tt.want)
 			}
 		})
 	}
 }
 
+//goland:noinspection GoLinter,GoLinter,GoLinter,GoLinter,GoLinter,GoLinter
 func TestReplaceDependant(t *testing.T) {
 	type args struct {
 		str1 string
@@ -203,11 +249,11 @@ func TestReplaceDependant(t *testing.T) {
 		args args
 		want string
 	}{
-		// TODO: Add test cases.
+		{},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := ReplaceDependant(tt.args.str1); got != tt.want {
+			if got := sato.ReplaceDependant(tt.args.str1); got != tt.want {
 				t.Errorf("ReplaceDependant() = %v, want %v", got, tt.want)
 			}
 		})
diff --git a/src/resources.go b/src/cf/resources.go
similarity index 98%
rename from src/resources.go
rename to src/cf/resources.go
index fd7faeb..87f6888 100644
--- a/src/resources.go
+++ b/src/cf/resources.go
@@ -1,7 +1,7 @@
-package sato
+package cf
 
 import (
-	_ "embed" //required for embed
+	_ "embed" // required for embed
 )
 
 //go:embed resources/aws_sns_topic.template
@@ -176,7 +176,7 @@ var awsCloudwatchMetricAlarm []byte
 var awsRoute53Record []byte
 
 //go:embed resources/aws_db_subnet_group.template
-var awsDbSubnetGroup []byte
+var awsDBSubnetGroup []byte
 
 //go:embed resources/aws_rds_cluster.template
 var awsRdsCluster []byte
@@ -215,7 +215,7 @@ var awsConfigConfigRule []byte
 var awsDmsReplicationTask []byte
 
 //go:embed resources/aws_db_parameter_group.template
-var awsDbParameterGroup []byte
+var awsDBParameterGroup []byte
 
 //go:embed resources/aws_dms_endpoint.template
 var awsDmsEndpoint []byte
@@ -227,7 +227,7 @@ var awsDmsReplicationinstance []byte
 var awsDmsReplicationSubnetGroup []byte
 
 //go:embed resources/aws_db_instance.template
-var awsDbInstance []byte
+var awsDBInstance []byte
 
 //go:embed resources/aws_eip_association.template
 var awsEipAssociation []byte
@@ -272,7 +272,7 @@ var awsSqsQueue []byte
 var awsNeptuneCluster []byte
 
 //go:embed resources/aws_neptune_cluster_instance.template
-var awsNeptuneDbInstance []byte
+var awsNeptuneDBInstance []byte
 
 //go:embed resources/aws_neptune_parameter_group.template
 var awsNeptuneDBParameterGroup []byte
diff --git a/src/resources/aws_appautoscaling_policy.template b/src/cf/resources/aws_appautoscaling_policy.template
similarity index 100%
rename from src/resources/aws_appautoscaling_policy.template
rename to src/cf/resources/aws_appautoscaling_policy.template
diff --git a/src/resources/aws_appautoscaling_target.template b/src/cf/resources/aws_appautoscaling_target.template
similarity index 100%
rename from src/resources/aws_appautoscaling_target.template
rename to src/cf/resources/aws_appautoscaling_target.template
diff --git a/src/resources/aws_autoscaling_group.template b/src/cf/resources/aws_autoscaling_group.template
similarity index 100%
rename from src/resources/aws_autoscaling_group.template
rename to src/cf/resources/aws_autoscaling_group.template
diff --git a/src/resources/aws_autoscaling_lifecycle_hook.template b/src/cf/resources/aws_autoscaling_lifecycle_hook.template
similarity index 100%
rename from src/resources/aws_autoscaling_lifecycle_hook.template
rename to src/cf/resources/aws_autoscaling_lifecycle_hook.template
diff --git a/src/resources/aws_autoscaling_policy.template b/src/cf/resources/aws_autoscaling_policy.template
similarity index 100%
rename from src/resources/aws_autoscaling_policy.template
rename to src/cf/resources/aws_autoscaling_policy.template
diff --git a/src/resources/aws_autoscaling_schedule.template b/src/cf/resources/aws_autoscaling_schedule.template
similarity index 100%
rename from src/resources/aws_autoscaling_schedule.template
rename to src/cf/resources/aws_autoscaling_schedule.template
diff --git a/src/resources/aws_backup_plan.template b/src/cf/resources/aws_backup_plan.template
similarity index 100%
rename from src/resources/aws_backup_plan.template
rename to src/cf/resources/aws_backup_plan.template
diff --git a/src/resources/aws_backup_selection.template b/src/cf/resources/aws_backup_selection.template
similarity index 100%
rename from src/resources/aws_backup_selection.template
rename to src/cf/resources/aws_backup_selection.template
diff --git a/src/resources/aws_backup_vault.template b/src/cf/resources/aws_backup_vault.template
similarity index 100%
rename from src/resources/aws_backup_vault.template
rename to src/cf/resources/aws_backup_vault.template
diff --git a/src/resources/aws_cloud9_environment_ec2.template b/src/cf/resources/aws_cloud9_environment_ec2.template
similarity index 100%
rename from src/resources/aws_cloud9_environment_ec2.template
rename to src/cf/resources/aws_cloud9_environment_ec2.template
diff --git a/src/resources/aws_cloudformation_stack.template b/src/cf/resources/aws_cloudformation_stack.template
similarity index 100%
rename from src/resources/aws_cloudformation_stack.template
rename to src/cf/resources/aws_cloudformation_stack.template
diff --git a/src/resources/aws_cloudfront_distribution.template b/src/cf/resources/aws_cloudfront_distribution.template
similarity index 100%
rename from src/resources/aws_cloudfront_distribution.template
rename to src/cf/resources/aws_cloudfront_distribution.template
diff --git a/src/resources/aws_cloudfront_origin_access_identity.template b/src/cf/resources/aws_cloudfront_origin_access_identity.template
similarity index 100%
rename from src/resources/aws_cloudfront_origin_access_identity.template
rename to src/cf/resources/aws_cloudfront_origin_access_identity.template
diff --git a/src/resources/aws_cloudwatch_dashboard.template b/src/cf/resources/aws_cloudwatch_dashboard.template
similarity index 100%
rename from src/resources/aws_cloudwatch_dashboard.template
rename to src/cf/resources/aws_cloudwatch_dashboard.template
diff --git a/src/resources/aws_cloudwatch_event_rule.template b/src/cf/resources/aws_cloudwatch_event_rule.template
similarity index 100%
rename from src/resources/aws_cloudwatch_event_rule.template
rename to src/cf/resources/aws_cloudwatch_event_rule.template
diff --git a/src/resources/aws_cloudwatch_log_group.template b/src/cf/resources/aws_cloudwatch_log_group.template
similarity index 100%
rename from src/resources/aws_cloudwatch_log_group.template
rename to src/cf/resources/aws_cloudwatch_log_group.template
diff --git a/src/resources/aws_cloudwatch_log_metric_filter.template b/src/cf/resources/aws_cloudwatch_log_metric_filter.template
similarity index 100%
rename from src/resources/aws_cloudwatch_log_metric_filter.template
rename to src/cf/resources/aws_cloudwatch_log_metric_filter.template
diff --git a/src/resources/aws_cloudwatch_metric_alarm.template b/src/cf/resources/aws_cloudwatch_metric_alarm.template
similarity index 100%
rename from src/resources/aws_cloudwatch_metric_alarm.template
rename to src/cf/resources/aws_cloudwatch_metric_alarm.template
diff --git a/src/resources/aws_codebuild_project.template b/src/cf/resources/aws_codebuild_project.template
similarity index 100%
rename from src/resources/aws_codebuild_project.template
rename to src/cf/resources/aws_codebuild_project.template
diff --git a/src/resources/aws_codecommit_repository.template b/src/cf/resources/aws_codecommit_repository.template
similarity index 100%
rename from src/resources/aws_codecommit_repository.template
rename to src/cf/resources/aws_codecommit_repository.template
diff --git a/src/resources/aws_codepipeline.template b/src/cf/resources/aws_codepipeline.template
similarity index 100%
rename from src/resources/aws_codepipeline.template
rename to src/cf/resources/aws_codepipeline.template
diff --git a/src/resources/aws_config_config_rule.template b/src/cf/resources/aws_config_config_rule.template
similarity index 100%
rename from src/resources/aws_config_config_rule.template
rename to src/cf/resources/aws_config_config_rule.template
diff --git a/src/resources/aws_config_configuration_recorder.template b/src/cf/resources/aws_config_configuration_recorder.template
similarity index 100%
rename from src/resources/aws_config_configuration_recorder.template
rename to src/cf/resources/aws_config_configuration_recorder.template
diff --git a/src/resources/aws_config_delivery_channel.template b/src/cf/resources/aws_config_delivery_channel.template
similarity index 100%
rename from src/resources/aws_config_delivery_channel.template
rename to src/cf/resources/aws_config_delivery_channel.template
diff --git a/src/resources/aws_db_instance.template b/src/cf/resources/aws_db_instance.template
similarity index 100%
rename from src/resources/aws_db_instance.template
rename to src/cf/resources/aws_db_instance.template
diff --git a/src/resources/aws_db_parameter_group.template b/src/cf/resources/aws_db_parameter_group.template
similarity index 100%
rename from src/resources/aws_db_parameter_group.template
rename to src/cf/resources/aws_db_parameter_group.template
diff --git a/src/resources/aws_db_subnet_group.template b/src/cf/resources/aws_db_subnet_group.template
similarity index 100%
rename from src/resources/aws_db_subnet_group.template
rename to src/cf/resources/aws_db_subnet_group.template
diff --git a/src/resources/aws_directory_service_directory.template b/src/cf/resources/aws_directory_service_directory.template
similarity index 100%
rename from src/resources/aws_directory_service_directory.template
rename to src/cf/resources/aws_directory_service_directory.template
diff --git a/src/resources/aws_dms_endpoint.template b/src/cf/resources/aws_dms_endpoint.template
similarity index 100%
rename from src/resources/aws_dms_endpoint.template
rename to src/cf/resources/aws_dms_endpoint.template
diff --git a/src/resources/aws_dms_replication_instance.template b/src/cf/resources/aws_dms_replication_instance.template
similarity index 100%
rename from src/resources/aws_dms_replication_instance.template
rename to src/cf/resources/aws_dms_replication_instance.template
diff --git a/src/resources/aws_dms_replication_subnet_group.template b/src/cf/resources/aws_dms_replication_subnet_group.template
similarity index 100%
rename from src/resources/aws_dms_replication_subnet_group.template
rename to src/cf/resources/aws_dms_replication_subnet_group.template
diff --git a/src/resources/aws_dms_replication_task.template b/src/cf/resources/aws_dms_replication_task.template
similarity index 100%
rename from src/resources/aws_dms_replication_task.template
rename to src/cf/resources/aws_dms_replication_task.template
diff --git a/src/resources/aws_dynamodb_table.template b/src/cf/resources/aws_dynamodb_table.template
similarity index 100%
rename from src/resources/aws_dynamodb_table.template
rename to src/cf/resources/aws_dynamodb_table.template
diff --git a/src/resources/aws_ebs_volume.template b/src/cf/resources/aws_ebs_volume.template
similarity index 100%
rename from src/resources/aws_ebs_volume.template
rename to src/cf/resources/aws_ebs_volume.template
diff --git a/src/resources/aws_ecs_cluster.template b/src/cf/resources/aws_ecs_cluster.template
similarity index 100%
rename from src/resources/aws_ecs_cluster.template
rename to src/cf/resources/aws_ecs_cluster.template
diff --git a/src/resources/aws_ecs_service.template b/src/cf/resources/aws_ecs_service.template
similarity index 100%
rename from src/resources/aws_ecs_service.template
rename to src/cf/resources/aws_ecs_service.template
diff --git a/src/resources/aws_ecs_task_definition.template b/src/cf/resources/aws_ecs_task_definition.template
similarity index 100%
rename from src/resources/aws_ecs_task_definition.template
rename to src/cf/resources/aws_ecs_task_definition.template
diff --git a/src/resources/aws_efs_file_system.template b/src/cf/resources/aws_efs_file_system.template
similarity index 100%
rename from src/resources/aws_efs_file_system.template
rename to src/cf/resources/aws_efs_file_system.template
diff --git a/src/resources/aws_efs_mount_target.template b/src/cf/resources/aws_efs_mount_target.template
similarity index 100%
rename from src/resources/aws_efs_mount_target.template
rename to src/cf/resources/aws_efs_mount_target.template
diff --git a/src/resources/aws_eip.template b/src/cf/resources/aws_eip.template
similarity index 100%
rename from src/resources/aws_eip.template
rename to src/cf/resources/aws_eip.template
diff --git a/src/resources/aws_eip_association.template b/src/cf/resources/aws_eip_association.template
similarity index 100%
rename from src/resources/aws_eip_association.template
rename to src/cf/resources/aws_eip_association.template
diff --git a/src/resources/aws_eks_cluster.template b/src/cf/resources/aws_eks_cluster.template
similarity index 100%
rename from src/resources/aws_eks_cluster.template
rename to src/cf/resources/aws_eks_cluster.template
diff --git a/src/resources/aws_eks_node_group.template b/src/cf/resources/aws_eks_node_group.template
similarity index 100%
rename from src/resources/aws_eks_node_group.template
rename to src/cf/resources/aws_eks_node_group.template
diff --git a/src/resources/aws_elasticache_parameter_group.template b/src/cf/resources/aws_elasticache_parameter_group.template
similarity index 100%
rename from src/resources/aws_elasticache_parameter_group.template
rename to src/cf/resources/aws_elasticache_parameter_group.template
diff --git a/src/resources/aws_elasticache_replication_group.template b/src/cf/resources/aws_elasticache_replication_group.template
similarity index 100%
rename from src/resources/aws_elasticache_replication_group.template
rename to src/cf/resources/aws_elasticache_replication_group.template
diff --git a/src/resources/aws_elasticache_subnet_group.template b/src/cf/resources/aws_elasticache_subnet_group.template
similarity index 100%
rename from src/resources/aws_elasticache_subnet_group.template
rename to src/cf/resources/aws_elasticache_subnet_group.template
diff --git a/src/resources/aws_elb.template b/src/cf/resources/aws_elb.template
similarity index 100%
rename from src/resources/aws_elb.template
rename to src/cf/resources/aws_elb.template
diff --git a/src/resources/aws_flow_log.template b/src/cf/resources/aws_flow_log.template
similarity index 100%
rename from src/resources/aws_flow_log.template
rename to src/cf/resources/aws_flow_log.template
diff --git a/src/resources/aws_iam_access_key.template b/src/cf/resources/aws_iam_access_key.template
similarity index 100%
rename from src/resources/aws_iam_access_key.template
rename to src/cf/resources/aws_iam_access_key.template
diff --git a/src/resources/aws_iam_group.template b/src/cf/resources/aws_iam_group.template
similarity index 100%
rename from src/resources/aws_iam_group.template
rename to src/cf/resources/aws_iam_group.template
diff --git a/src/resources/aws_iam_group_membership.template b/src/cf/resources/aws_iam_group_membership.template
similarity index 100%
rename from src/resources/aws_iam_group_membership.template
rename to src/cf/resources/aws_iam_group_membership.template
diff --git a/src/resources/aws_iam_instance_profile.template b/src/cf/resources/aws_iam_instance_profile.template
similarity index 100%
rename from src/resources/aws_iam_instance_profile.template
rename to src/cf/resources/aws_iam_instance_profile.template
diff --git a/src/resources/aws_iam_managed_policy.template b/src/cf/resources/aws_iam_managed_policy.template
similarity index 100%
rename from src/resources/aws_iam_managed_policy.template
rename to src/cf/resources/aws_iam_managed_policy.template
diff --git a/src/resources/aws_iam_policy.template b/src/cf/resources/aws_iam_policy.template
similarity index 100%
rename from src/resources/aws_iam_policy.template
rename to src/cf/resources/aws_iam_policy.template
diff --git a/src/resources/aws_iam_role.template b/src/cf/resources/aws_iam_role.template
similarity index 100%
rename from src/resources/aws_iam_role.template
rename to src/cf/resources/aws_iam_role.template
diff --git a/src/resources/aws_iam_user.template b/src/cf/resources/aws_iam_user.template
similarity index 100%
rename from src/resources/aws_iam_user.template
rename to src/cf/resources/aws_iam_user.template
diff --git a/src/resources/aws_instance.template b/src/cf/resources/aws_instance.template
similarity index 100%
rename from src/resources/aws_instance.template
rename to src/cf/resources/aws_instance.template
diff --git a/src/resources/aws_internet_gateway.template b/src/cf/resources/aws_internet_gateway.template
similarity index 100%
rename from src/resources/aws_internet_gateway.template
rename to src/cf/resources/aws_internet_gateway.template
diff --git a/src/resources/aws_kms_alias.template b/src/cf/resources/aws_kms_alias.template
similarity index 100%
rename from src/resources/aws_kms_alias.template
rename to src/cf/resources/aws_kms_alias.template
diff --git a/src/resources/aws_kms_key.template b/src/cf/resources/aws_kms_key.template
similarity index 100%
rename from src/resources/aws_kms_key.template
rename to src/cf/resources/aws_kms_key.template
diff --git a/src/resources/aws_lambda_event_source_mapping.template b/src/cf/resources/aws_lambda_event_source_mapping.template
similarity index 100%
rename from src/resources/aws_lambda_event_source_mapping.template
rename to src/cf/resources/aws_lambda_event_source_mapping.template
diff --git a/src/resources/aws_lambda_function.template b/src/cf/resources/aws_lambda_function.template
similarity index 100%
rename from src/resources/aws_lambda_function.template
rename to src/cf/resources/aws_lambda_function.template
diff --git a/src/resources/aws_lambda_permission.template b/src/cf/resources/aws_lambda_permission.template
similarity index 100%
rename from src/resources/aws_lambda_permission.template
rename to src/cf/resources/aws_lambda_permission.template
diff --git a/src/resources/aws_lambda_version.template b/src/cf/resources/aws_lambda_version.template
similarity index 100%
rename from src/resources/aws_lambda_version.template
rename to src/cf/resources/aws_lambda_version.template
diff --git a/src/resources/aws_launch_configuration.template b/src/cf/resources/aws_launch_configuration.template
similarity index 100%
rename from src/resources/aws_launch_configuration.template
rename to src/cf/resources/aws_launch_configuration.template
diff --git a/src/resources/aws_launch_template.template b/src/cf/resources/aws_launch_template.template
similarity index 100%
rename from src/resources/aws_launch_template.template
rename to src/cf/resources/aws_launch_template.template
diff --git a/src/resources/aws_lb.template b/src/cf/resources/aws_lb.template
similarity index 100%
rename from src/resources/aws_lb.template
rename to src/cf/resources/aws_lb.template
diff --git a/src/resources/aws_lb_listener.template b/src/cf/resources/aws_lb_listener.template
similarity index 100%
rename from src/resources/aws_lb_listener.template
rename to src/cf/resources/aws_lb_listener.template
diff --git a/src/resources/aws_lb_listener_rule.template b/src/cf/resources/aws_lb_listener_rule.template
similarity index 100%
rename from src/resources/aws_lb_listener_rule.template
rename to src/cf/resources/aws_lb_listener_rule.template
diff --git a/src/resources/aws_lb_target_group.template b/src/cf/resources/aws_lb_target_group.template
similarity index 100%
rename from src/resources/aws_lb_target_group.template
rename to src/cf/resources/aws_lb_target_group.template
diff --git a/src/resources/aws_nat_gateway.template b/src/cf/resources/aws_nat_gateway.template
similarity index 100%
rename from src/resources/aws_nat_gateway.template
rename to src/cf/resources/aws_nat_gateway.template
diff --git a/src/resources/aws_neptune_cluster.template b/src/cf/resources/aws_neptune_cluster.template
similarity index 100%
rename from src/resources/aws_neptune_cluster.template
rename to src/cf/resources/aws_neptune_cluster.template
diff --git a/src/resources/aws_neptune_cluster_instance.template b/src/cf/resources/aws_neptune_cluster_instance.template
similarity index 100%
rename from src/resources/aws_neptune_cluster_instance.template
rename to src/cf/resources/aws_neptune_cluster_instance.template
diff --git a/src/resources/aws_neptune_cluster_parameter_group.template b/src/cf/resources/aws_neptune_cluster_parameter_group.template
similarity index 100%
rename from src/resources/aws_neptune_cluster_parameter_group.template
rename to src/cf/resources/aws_neptune_cluster_parameter_group.template
diff --git a/src/resources/aws_neptune_parameter_group.template b/src/cf/resources/aws_neptune_parameter_group.template
similarity index 100%
rename from src/resources/aws_neptune_parameter_group.template
rename to src/cf/resources/aws_neptune_parameter_group.template
diff --git a/src/resources/aws_neptune_subnet_group.template b/src/cf/resources/aws_neptune_subnet_group.template
similarity index 100%
rename from src/resources/aws_neptune_subnet_group.template
rename to src/cf/resources/aws_neptune_subnet_group.template
diff --git a/src/resources/aws_network_acl.template b/src/cf/resources/aws_network_acl.template
similarity index 100%
rename from src/resources/aws_network_acl.template
rename to src/cf/resources/aws_network_acl.template
diff --git a/src/resources/aws_network_acl_association.template b/src/cf/resources/aws_network_acl_association.template
similarity index 100%
rename from src/resources/aws_network_acl_association.template
rename to src/cf/resources/aws_network_acl_association.template
diff --git a/src/resources/aws_network_acl_rule.template b/src/cf/resources/aws_network_acl_rule.template
similarity index 100%
rename from src/resources/aws_network_acl_rule.template
rename to src/cf/resources/aws_network_acl_rule.template
diff --git a/src/resources/aws_network_interface.template b/src/cf/resources/aws_network_interface.template
similarity index 100%
rename from src/resources/aws_network_interface.template
rename to src/cf/resources/aws_network_interface.template
diff --git a/src/resources/aws_rds_cluster.template b/src/cf/resources/aws_rds_cluster.template
similarity index 100%
rename from src/resources/aws_rds_cluster.template
rename to src/cf/resources/aws_rds_cluster.template
diff --git a/src/resources/aws_route.template b/src/cf/resources/aws_route.template
similarity index 100%
rename from src/resources/aws_route.template
rename to src/cf/resources/aws_route.template
diff --git a/src/resources/aws_route53_record.template b/src/cf/resources/aws_route53_record.template
similarity index 100%
rename from src/resources/aws_route53_record.template
rename to src/cf/resources/aws_route53_record.template
diff --git a/src/resources/aws_route_table.template b/src/cf/resources/aws_route_table.template
similarity index 100%
rename from src/resources/aws_route_table.template
rename to src/cf/resources/aws_route_table.template
diff --git a/src/resources/aws_route_table_association.template b/src/cf/resources/aws_route_table_association.template
similarity index 100%
rename from src/resources/aws_route_table_association.template
rename to src/cf/resources/aws_route_table_association.template
diff --git a/src/resources/aws_s3_bucket.template b/src/cf/resources/aws_s3_bucket.template
similarity index 100%
rename from src/resources/aws_s3_bucket.template
rename to src/cf/resources/aws_s3_bucket.template
diff --git a/src/resources/aws_s3_bucket_policy.template b/src/cf/resources/aws_s3_bucket_policy.template
similarity index 100%
rename from src/resources/aws_s3_bucket_policy.template
rename to src/cf/resources/aws_s3_bucket_policy.template
diff --git a/src/resources/aws_secretsmanager_secret.template b/src/cf/resources/aws_secretsmanager_secret.template
similarity index 100%
rename from src/resources/aws_secretsmanager_secret.template
rename to src/cf/resources/aws_secretsmanager_secret.template
diff --git a/src/resources/aws_security_group.template b/src/cf/resources/aws_security_group.template
similarity index 100%
rename from src/resources/aws_security_group.template
rename to src/cf/resources/aws_security_group.template
diff --git a/src/resources/aws_security_group_rule_egress.template b/src/cf/resources/aws_security_group_rule_egress.template
similarity index 100%
rename from src/resources/aws_security_group_rule_egress.template
rename to src/cf/resources/aws_security_group_rule_egress.template
diff --git a/src/resources/aws_security_group_rule_ingress.template b/src/cf/resources/aws_security_group_rule_ingress.template
similarity index 100%
rename from src/resources/aws_security_group_rule_ingress.template
rename to src/cf/resources/aws_security_group_rule_ingress.template
diff --git a/src/resources/aws_service_discovery_service.template b/src/cf/resources/aws_service_discovery_service.template
similarity index 100%
rename from src/resources/aws_service_discovery_service.template
rename to src/cf/resources/aws_service_discovery_service.template
diff --git a/src/resources/aws_servicecatalog_portfolio.template b/src/cf/resources/aws_servicecatalog_portfolio.template
similarity index 100%
rename from src/resources/aws_servicecatalog_portfolio.template
rename to src/cf/resources/aws_servicecatalog_portfolio.template
diff --git a/src/resources/aws_servicecatalog_portfolio_share.template b/src/cf/resources/aws_servicecatalog_portfolio_share.template
similarity index 100%
rename from src/resources/aws_servicecatalog_portfolio_share.template
rename to src/cf/resources/aws_servicecatalog_portfolio_share.template
diff --git a/src/resources/aws_servicecatalog_product_portfolio_association.template b/src/cf/resources/aws_servicecatalog_product_portfolio_association.template
similarity index 100%
rename from src/resources/aws_servicecatalog_product_portfolio_association.template
rename to src/cf/resources/aws_servicecatalog_product_portfolio_association.template
diff --git a/src/resources/aws_servicecatalog_tag_option.template b/src/cf/resources/aws_servicecatalog_tag_option.template
similarity index 100%
rename from src/resources/aws_servicecatalog_tag_option.template
rename to src/cf/resources/aws_servicecatalog_tag_option.template
diff --git a/src/resources/aws_servicecatalog_tag_option_resource_association.template b/src/cf/resources/aws_servicecatalog_tag_option_resource_association.template
similarity index 100%
rename from src/resources/aws_servicecatalog_tag_option_resource_association.template
rename to src/cf/resources/aws_servicecatalog_tag_option_resource_association.template
diff --git a/src/resources/aws_sfn_state_machine.template b/src/cf/resources/aws_sfn_state_machine.template
similarity index 100%
rename from src/resources/aws_sfn_state_machine.template
rename to src/cf/resources/aws_sfn_state_machine.template
diff --git a/src/resources/aws_sns_topic.template b/src/cf/resources/aws_sns_topic.template
similarity index 100%
rename from src/resources/aws_sns_topic.template
rename to src/cf/resources/aws_sns_topic.template
diff --git a/src/resources/aws_sns_topic_policy.template b/src/cf/resources/aws_sns_topic_policy.template
similarity index 100%
rename from src/resources/aws_sns_topic_policy.template
rename to src/cf/resources/aws_sns_topic_policy.template
diff --git a/src/resources/aws_sns_topic_subscription.template b/src/cf/resources/aws_sns_topic_subscription.template
similarity index 100%
rename from src/resources/aws_sns_topic_subscription.template
rename to src/cf/resources/aws_sns_topic_subscription.template
diff --git a/src/resources/aws_sqs_queue.template b/src/cf/resources/aws_sqs_queue.template
similarity index 100%
rename from src/resources/aws_sqs_queue.template
rename to src/cf/resources/aws_sqs_queue.template
diff --git a/src/resources/aws_ssm_association.template b/src/cf/resources/aws_ssm_association.template
similarity index 100%
rename from src/resources/aws_ssm_association.template
rename to src/cf/resources/aws_ssm_association.template
diff --git a/src/resources/aws_ssm_document.template b/src/cf/resources/aws_ssm_document.template
similarity index 100%
rename from src/resources/aws_ssm_document.template
rename to src/cf/resources/aws_ssm_document.template
diff --git a/src/resources/aws_ssm_maintenance_window.template b/src/cf/resources/aws_ssm_maintenance_window.template
similarity index 100%
rename from src/resources/aws_ssm_maintenance_window.template
rename to src/cf/resources/aws_ssm_maintenance_window.template
diff --git a/src/resources/aws_ssm_maintenance_window_target.template b/src/cf/resources/aws_ssm_maintenance_window_target.template
similarity index 100%
rename from src/resources/aws_ssm_maintenance_window_target.template
rename to src/cf/resources/aws_ssm_maintenance_window_target.template
diff --git a/src/resources/aws_ssm_maintenance_window_task.template b/src/cf/resources/aws_ssm_maintenance_window_task.template
similarity index 100%
rename from src/resources/aws_ssm_maintenance_window_task.template
rename to src/cf/resources/aws_ssm_maintenance_window_task.template
diff --git a/src/resources/aws_subnet.template b/src/cf/resources/aws_subnet.template
similarity index 100%
rename from src/resources/aws_subnet.template
rename to src/cf/resources/aws_subnet.template
diff --git a/src/resources/aws_vpc.template b/src/cf/resources/aws_vpc.template
similarity index 100%
rename from src/resources/aws_vpc.template
rename to src/cf/resources/aws_vpc.template
diff --git a/src/resources/aws_vpc_dhcp_options.template b/src/cf/resources/aws_vpc_dhcp_options.template
similarity index 100%
rename from src/resources/aws_vpc_dhcp_options.template
rename to src/cf/resources/aws_vpc_dhcp_options.template
diff --git a/src/resources/aws_vpc_dhcp_options_association.template b/src/cf/resources/aws_vpc_dhcp_options_association.template
similarity index 100%
rename from src/resources/aws_vpc_dhcp_options_association.template
rename to src/cf/resources/aws_vpc_dhcp_options_association.template
diff --git a/src/resources/aws_vpc_endpoint.template b/src/cf/resources/aws_vpc_endpoint.template
similarity index 100%
rename from src/resources/aws_vpc_endpoint.template
rename to src/cf/resources/aws_vpc_endpoint.template
diff --git a/src/resources/aws_vpn_gateway_attachment.template b/src/cf/resources/aws_vpn_gateway_attachment.template
similarity index 100%
rename from src/resources/aws_vpn_gateway_attachment.template
rename to src/cf/resources/aws_vpn_gateway_attachment.template
diff --git a/src/resources/aws_wafv2_web_acl_association.template b/src/cf/resources/aws_wafv2_web_acl_association.template
similarity index 100%
rename from src/resources/aws_wafv2_web_acl_association.template
rename to src/cf/resources/aws_wafv2_web_acl_association.template
diff --git a/src/cf/variable.go b/src/cf/variable.go
new file mode 100644
index 0000000..9f3e108
--- /dev/null
+++ b/src/cf/variable.go
@@ -0,0 +1,9 @@
+package cf
+
+//goland:noinspection GoLinter
+import (
+	_ "embed" // required for embed
+)
+
+//go:embed variable.template
+var variableFile []byte
diff --git a/src/variable.template b/src/cf/variable.template
similarity index 100%
rename from src/variable.template
rename to src/cf/variable.template
diff --git a/src/version.go b/src/cf/version.go
similarity index 84%
rename from src/version.go
rename to src/cf/version.go
index 5d01454..16a1561 100644
--- a/src/version.go
+++ b/src/cf/version.go
@@ -1,4 +1,4 @@
-package sato
+package cf
 
 // Version controls the applications version
 const Version = "9.9.9"
diff --git a/src/data.go b/src/data.go
deleted file mode 100644
index bc983f7..0000000
--- a/src/data.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package sato
-
-const dataAvailabilityZone = "data \"aws_availability_zone\" \"example\" {\n  name = \"\"\n}\n"
-
-const dataSubnet = "data \"aws_subnet\" \"selected\" {\n  id = \"\"\n}\n"
-
-const dataKeyPair = "data \"aws_key_pair\" \"example\" {\n  key_name           = \"\"\n  include_public_key = true\n }\n"
-
-const dataVpc = "data \"aws_vpc\" \"selected\" {\n  id = \"\"\n}\n"
-
-const dataRegion = "data \"aws_region\" \"current\" {}\n"
-
-const dataSecurityGroup = "data \"aws_security_group\" \"selected\" {\n  id = \"\"\n}\n"
-
-const provider = "provider \"aws\" {\n  region=\"eu-west-2\"\n}\n"
diff --git a/src/see/lookup.go b/src/see/lookup.go
index d76f96e..fb6cc70 100644
--- a/src/see/lookup.go
+++ b/src/see/lookup.go
@@ -1,149 +1,159 @@
 package see
 
-import "fmt"
+import (
+	"fmt"
+	"strings"
+)
 
-// Lookup converts from cf/arm to terraform resource name
+// Lookup converts from cf/arm to terraform resource name.
 func Lookup(resource string) (*string, error) {
 	Lookup := map[string]string{
-		"AWS::ApplicationAutoScaling::ScalableTarget":      "aws_appautoscaling_target",
-		"AWS::ApplicationAutoScaling::ScalingPolicy":       "aws_appAutoscaling_policy",
-		"AWS::AutoScaling::AutoScalingGroup":               "aws_autoscaling_group",
-		"AWS::AutoScaling::LaunchConfiguration":            "aws_launch_configuration",
-		"AWS::AutoScaling::LifecycleHook":                  "aws_autoscaling_lifecycle_hook",
-		"AWS::AutoScaling::ScalingPolicy":                  "aws_autoscaling_policy",
-		"AWS::AutoScaling::ScheduledAction":                "aws_autoscaling_schedule",
-		"AWS::Backup::BackupPlan":                          "aws_backup_plan",
-		"AWS::Backup::BackupSelection":                     "aws_backup_selection",
-		"AWS::Backup::BackupVault":                         "aws_backup_vault",
-		"AWS::Cloud9::EnvironmentEC2":                      "aws_cloud9_environment_ec2",
-		"AWS::CloudFormation::Stack":                       "aws_cloudformation_stack",
-		"AWS::CloudFront::CloudFrontOriginAccessIdentity":  "aws_cloudfront_origin_access_identity",
-		"AWS::CloudFront::Distribution":                    "aws_cloudfront_distribution",
-		"AWS::CloudWatch::Alarm":                           "aws_cloudwatch_metric_alarm",
-		"AWS::CloudWatch::Dashboard":                       "aws_cloudwatch_dashboard",
-		"AWS::CodeBuild::Project":                          "aws_codebuild_project",
-		"AWS::CodeCommit::Repository":                      "aws_codecommit_repository",
-		"AWS::CodePipeline::Pipeline":                      "aws_codepipeline",
-		"AWS::Config::ConfigRule":                          "aws_config_config_rule",
-		"AWS::Config::ConfigurationRecorder":               "aws_config_configuration_recorder",
-		"AWS::Config::DeliveryChannel":                     "aws_config_delivery_channel",
-		"AWS::DMS::Endpoint":                               "aws_dms_endpoint",
-		"AWS::DMS::ReplicationInstance":                    "aws_dms_replication_instance",
-		"AWS::DMS::ReplicationSubnetGroup":                 "aws_dms_replication_subnet_group",
-		"AWS::DMS::ReplicationTask":                        "aws_dms_replication_task",
-		"AWS::DirectoryService::MicrosoftAD":               "aws_directory_service_directory",
-		"AWS::DynamoDB::Table":                             "aws_dynamodb_table",
-		"AWS::EC2::DHCPOptions":                            "aws_vpc_dhcp_options",
-		"AWS::EC2::EIP":                                    "aws_eip",
-		"AWS::EC2::EIPAssociation":                         "aws_eip_association",
-		"AWS::EC2::FlowLog":                                "aws_flow_log",
-		"AWS::EC2::Instance":                               "aws_instance",
-		"AWS::EC2::InternetGateway":                        "aws_Internet_gateway",
-		"AWS::EC2::LaunchTemplate":                         "aws_launch_template",
-		"AWS::EC2::NatGateway":                             "aws_nat_gateway",
-		"AWS::EC2::NetworkAcl":                             "aws_network_acl",
-		"AWS::EC2::NetworkAclEntry":                        "aws_network_acl_rule",
-		"AWS::EC2::NetworkInterface":                       "aws_network_interface",
-		"AWS::EC2::Route":                                  "aws_route",
-		"AWS::EC2::RouteTable":                             "aws_route_table",
-		"AWS::EC2::SecurityGroup":                          "aws_security_group",
-		"AWS::EC2::SecurityGroupEgress":                    "aws_security_group_rule_egress",
-		"AWS::EC2::SecurityGroupIngress":                   "aws_security_group_rule_ingress",
-		"AWS::EC2::Subnet":                                 "aws_subnet",
-		"AWS::EC2::SubnetNetworkAclAssociation":            "aws_network_acl_association",
-		"AWS::EC2::SubnetRouteTableAssociation":            "aws_route_table_association",
-		"AWS::EC2::VPC":                                    "aws_vpc",
-		"AWS::EC2::VPCDHCPOptionsAssociation":              "aws_vpc_dhcp_options_association",
-		"AWS::EC2::VPCEndpoint":                            "aws_vpc_rndpoint",
-		"AWS::EC2::VPCGatewayAttachment":                   "aws_vpn_gatewayAttachment",
-		"AWS::EC2::Volume":                                 "aws_ebs_volume",
-		"AWS::ECS::Cluster":                                "aws_ecs_cluster",
-		"AWS::ECS::Service":                                "aws_ecs_service",
-		"AWS::ECS::TaskDefinition":                         "aws_ecs_task_definition",
-		"AWS::EFS::FileSystem":                             "aws_efs_file_system",
-		"AWS::EFS::MountTarget":                            "aws_efs_mount_target",
-		"AWS::EKS::Cluster":                                "aws_eks_cluster",
-		"AWS::EKS::Nodegroup":                              "aws_eks_node_group",
-		"AWS::ElastiCache::ParameterGroup":                 "aws_elasticache_parameter_group",
-		"AWS::ElastiCache::ReplicationGroup":               "aws_elasticache_replication_group",
-		"AWS::ElastiCache::SubnetGroup":                    "aws_elasticache_subnet_group",
-		"AWS::ElasticLoadBalancing::LoadBalancer":          "aws_elb",
-		"AWS::ElasticLoadBalancingV2::Listener":            "aws_lb_listener",
-		"AWS::ElasticLoadBalancingV2::ListenerRule":        "aws_lb_listener_rule",
-		"AWS::ElasticLoadBalancingV2::LoadBalancer":        "aws_lb",
-		"AWS::ElasticLoadBalancingV2::TargetGroup":         "aws_lb_target_group",
-		"AWS::Events::Rule":                                "aws_cloudwatch_event_rule",
-		"AWS::IAM::AccessKey":                              "aws_iam_access_key",
-		"AWS::IAM::Group":                                  "aws_iam_group",
-		"AWS::IAM::InstanceProfile":                        "aws_iam_instance_profile",
-		"AWS::IAM::ManagedPolicy":                          "aws_iam_managed_policy",
-		"AWS::IAM::Policy":                                 "aws_iam_policy",
-		"AWS::IAM::Role":                                   "aws_iam_role",
-		"AWS::IAM::User":                                   "aws_iam_user",
-		"AWS::IAM::UserToGroupAddition":                    "aws_iam_group_membership",
-		"AWS::KMS::Alias":                                  "aws_kms_alias",
-		"AWS::KMS::Key":                                    "aws_Kms_key",
-		"AWS::Lambda::EventSourceMapping":                  "aws_lambda_event_source_mapping",
-		"AWS::Lambda::Function":                            "aws_lambda_function",
-		"AWS::Lambda::Permission":                          "aws_lambda_permission",
-		"AWS::Lambda::Version":                             "aws_lambda_version",
-		"AWS::Logs::LogGroup":                              "aws_cloudwatch_logGroup",
-		"AWS::Logs::MetricFilter":                          "aws_cloudwatch_logMetricFilter",
-		"AWS::Neptune::DBCluster":                          "aws_neptune_cluster",
-		"AWS::Neptune::DBClusterParameterGroup":            "aws_neptune_cluster_parameter_group",
-		"AWS::Neptune::DBInstance":                         "aws_neptune_cluster_instance",
-		"AWS::Neptune::DBParameterGroup":                   "aws_neptune_parameter_group",
-		"AWS::Neptune::DBSubnetGroup":                      "aws_neptune_subnet_group",
-		"AWS::RDS::DBCluster":                              "aws_rds_cluster",
-		"AWS::RDS::DBClusterParameterGroup":                "aws_rds_cluster_parameter_group",
-		"AWS::RDS::DBInstance":                             "aws_db_instance",
-		"AWS::RDS::DBParameterGroup":                       "aws_db_parameter_group",
-		"AWS::RDS::DBSubnetGroup":                          "aws_db_subnet_group",
-		"AWS::Route53::RecordSet":                          "aws_route53_record",
-		"AWS::S3::Bucket":                                  "aws_s3_bucket",
-		"AWS::S3::BucketPolicy":                            "aws_s3_bucket_policy",
-		"AWS::SNS::Subscription":                           "aws_sns_subscription",
-		"AWS::SNS::Topic":                                  "aws_sns_topic",
-		"AWS::SNS::TopicPolicy":                            "aws_sns_topic_policy",
-		"AWS::SQS::Queue":                                  "aws_sqs_queue",
-		"AWS::SSM::Association":                            "aws_ssm_association",
-		"AWS::SSM::Document":                               "aws_ssm_document",
-		"AWS::SSM::MaintenanceWindow":                      "aws_ssm_maintenance_window",
-		"AWS::SSM::MaintenanceWindowTarget":                "aws_ssm_maintenance_window_target",
-		"AWS::SSM::MaintenanceWindowTask":                  "aws_ssm_maintenance_window_task",
-		"AWS::SecretsManager::Secret":                      "aws_secrets_manager_secret",
-		"AWS::ServiceCatalog::Portfolio":                   "aws_service_catalog_portfolio",
-		"AWS::ServiceCatalog::PortfolioProductAssociation": "aws_service_catalog_product_portfolio_association",
-		"AWS::ServiceCatalog::PortfolioShare":              "aws_service_catalog_portfolio_share",
-		"AWS::ServiceCatalog::TagOption":                   "aws_service_catalog_tag_option",
-		"AWS::ServiceCatalog::TagOptionAssociation":        "aws_service_catalog_tag_option_association",
-		"AWS::ServiceDiscovery::Service":                   "aws_service_discovery_service",
-		"AWS::StepFunctions::StateMachine":                 "aws_sfn_state_machine",
-		"AWS::WAFv2::WebACLAssociation":                    "aws_wafv2_webacl_association",
-		"Microsoft.AnalysisServices/servers":               "azurerm_analysis_services_server",
-		"Microsoft.ApiManagement/service":                  "azurerm_api_management",
-		"Microsoft.App/containerApps":                      "azurerm_container_app",
-		"Microsoft.App/managedEnvironments":                "azurerm_container_app_environment",
-		"Microsoft.Authorization/roleAssignments":          "azurerm_role_assignment",
-		"Microsoft.Authorization/roleDefinitions":          "azurerm_role_definition",
-		"Microsoft.Compute/virtualMachines":                "azurerm_virtual_machine",
-		"Microsoft.Compute/virtualMachines/extensions":     "azurerm_virtual_machine_extension",
-		"Microsoft.ManagedIdentity/userAssignedIdentities": "azurerm_user_assigned_identity",
-		"Microsoft.Network/networkInterfaces":              "azurerm_network_interface",
-		"Microsoft.Network/networkSecurityGroups":          "azurerm_network_security_group",
-		"Microsoft.Network/publicIPAddresses":              "azurerm_public_ip",
-		"Microsoft.Network/virtualNetworks":                "azurerm_virtual_network",
-		"Microsoft.Network/virtualNetworks/subnets":        "azurerm_subnet",
-		"Microsoft.OperationalInsights/workspaces":         "azurerm_log_analytics_workspace",
-		"Microsoft.Resources/deployments":                  "azurerm_template_deployment",
-		"Microsoft.Storage/storageAccounts":                "azurerm_storage_account",
-		"Microsoft.ContainerRegistry/registries":           "azurerm_container_registry",
+		"AWS::ApplicationAutoScaling::ScalableTarget":        "aws_appautoscaling_target",
+		"AWS::ApplicationAutoScaling::ScalingPolicy":         "aws_appAutoscaling_policy",
+		"AWS::AutoScaling::AutoScalingGroup":                 "aws_autoscaling_group",
+		"AWS::AutoScaling::LaunchConfiguration":              "aws_launch_configuration",
+		"AWS::AutoScaling::LifecycleHook":                    "aws_autoscaling_lifecycle_hook",
+		"AWS::AutoScaling::ScalingPolicy":                    "aws_autoscaling_policy",
+		"AWS::AutoScaling::ScheduledAction":                  "aws_autoscaling_schedule",
+		"AWS::Backup::BackupPlan":                            "aws_backup_plan",
+		"AWS::Backup::BackupSelection":                       "aws_backup_selection",
+		"AWS::Backup::BackupVault":                           "aws_backup_vault",
+		"AWS::Cloud9::EnvironmentEC2":                        "aws_cloud9_environment_ec2",
+		"AWS::CloudFormation::Stack":                         "aws_cloudformation_stack",
+		"AWS::CloudFront::CloudFrontOriginAccessIdentity":    "aws_cloudfront_origin_access_identity",
+		"AWS::CloudFront::Distribution":                      "aws_cloudfront_distribution",
+		"AWS::CloudWatch::Alarm":                             "aws_cloudwatch_metric_alarm",
+		"AWS::CloudWatch::Dashboard":                         "aws_cloudwatch_dashboard",
+		"AWS::CodeBuild::Project":                            "aws_codebuild_project",
+		"AWS::CodeCommit::Repository":                        "aws_codecommit_repository",
+		"AWS::CodePipeline::Pipeline":                        "aws_codepipeline",
+		"AWS::Config::ConfigRule":                            "aws_config_config_rule",
+		"AWS::Config::ConfigurationRecorder":                 "aws_config_configuration_recorder",
+		"AWS::Config::DeliveryChannel":                       "aws_config_delivery_channel",
+		"AWS::DMS::Endpoint":                                 "aws_dms_endpoint",
+		"AWS::DMS::ReplicationInstance":                      "aws_dms_replication_instance",
+		"AWS::DMS::ReplicationSubnetGroup":                   "aws_dms_replication_subnet_group",
+		"AWS::DMS::ReplicationTask":                          "aws_dms_replication_task",
+		"AWS::DirectoryService::MicrosoftAD":                 "aws_directory_service_directory",
+		"AWS::DynamoDB::Table":                               "aws_dynamodb_table",
+		"AWS::EC2::DHCPOptions":                              "aws_vpc_dhcp_options",
+		"AWS::EC2::EIP":                                      "aws_eip",
+		"AWS::EC2::EIPAssociation":                           "aws_eip_association",
+		"AWS::EC2::FlowLog":                                  "aws_flow_log",
+		"AWS::EC2::Instance":                                 "aws_instance",
+		"AWS::EC2::InternetGateway":                          "aws_Internet_gateway",
+		"AWS::EC2::LaunchTemplate":                           "aws_launch_template",
+		"AWS::EC2::NatGateway":                               "aws_nat_gateway",
+		"AWS::EC2::NetworkAcl":                               "aws_network_acl",
+		"AWS::EC2::NetworkAclEntry":                          "aws_network_acl_rule",
+		"AWS::EC2::NetworkInterface":                         "aws_network_interface",
+		"AWS::EC2::Route":                                    "aws_route",
+		"AWS::EC2::RouteTable":                               "aws_route_table",
+		"AWS::EC2::SecurityGroup":                            "aws_security_group",
+		"AWS::EC2::SecurityGroupEgress":                      "aws_security_group_rule_egress",
+		"AWS::EC2::SecurityGroupIngress":                     "aws_security_group_rule_ingress",
+		"AWS::EC2::Subnet":                                   "aws_subnet",
+		"AWS::EC2::SubnetNetworkAclAssociation":              "aws_network_acl_association",
+		"AWS::EC2::SubnetRouteTableAssociation":              "aws_route_table_association",
+		"AWS::EC2::VPC":                                      "aws_vpc",
+		"AWS::EC2::VPCDHCPOptionsAssociation":                "aws_vpc_dhcp_options_association",
+		"AWS::EC2::VPCEndpoint":                              "aws_vpc_rndpoint",
+		"AWS::EC2::VPCGatewayAttachment":                     "aws_vpn_gatewayAttachment",
+		"AWS::EC2::Volume":                                   "aws_ebs_volume",
+		"AWS::ECS::Cluster":                                  "aws_ecs_cluster",
+		"AWS::ECS::Service":                                  "aws_ecs_service",
+		"AWS::ECS::TaskDefinition":                           "aws_ecs_task_definition",
+		"AWS::EFS::FileSystem":                               "aws_efs_file_system",
+		"AWS::EFS::MountTarget":                              "aws_efs_mount_target",
+		"AWS::EKS::Cluster":                                  "aws_eks_cluster",
+		"AWS::EKS::Nodegroup":                                "aws_eks_node_group",
+		"AWS::ElastiCache::ParameterGroup":                   "aws_elasticache_parameter_group",
+		"AWS::ElastiCache::ReplicationGroup":                 "aws_elasticache_replication_group",
+		"AWS::ElastiCache::SubnetGroup":                      "aws_elasticache_subnet_group",
+		"AWS::ElasticLoadBalancing::LoadBalancer":            "aws_elb",
+		"AWS::ElasticLoadBalancingV2::Listener":              "aws_lb_listener",
+		"AWS::ElasticLoadBalancingV2::ListenerRule":          "aws_lb_listener_rule",
+		"AWS::ElasticLoadBalancingV2::LoadBalancer":          "aws_lb",
+		"AWS::ElasticLoadBalancingV2::TargetGroup":           "aws_lb_target_group",
+		"AWS::Events::Rule":                                  "aws_cloudwatch_event_rule",
+		"AWS::IAM::AccessKey":                                "aws_iam_access_key",
+		"AWS::IAM::Group":                                    "aws_iam_group",
+		"AWS::IAM::InstanceProfile":                          "aws_iam_instance_profile",
+		"AWS::IAM::ManagedPolicy":                            "aws_iam_managed_policy",
+		"AWS::IAM::Policy":                                   "aws_iam_policy",
+		"AWS::IAM::Role":                                     "aws_iam_role",
+		"AWS::IAM::User":                                     "aws_iam_user",
+		"AWS::IAM::UserToGroupAddition":                      "aws_iam_group_membership",
+		"AWS::KMS::Alias":                                    "aws_kms_alias",
+		"AWS::KMS::Key":                                      "aws_Kms_key",
+		"AWS::Lambda::EventSourceMapping":                    "aws_lambda_event_source_mapping",
+		"AWS::Lambda::Function":                              "aws_lambda_function",
+		"AWS::Lambda::Permission":                            "aws_lambda_permission",
+		"AWS::Lambda::Version":                               "aws_lambda_version",
+		"AWS::Logs::LogGroup":                                "aws_cloudwatch_logGroup",
+		"AWS::Logs::MetricFilter":                            "aws_cloudwatch_logMetricFilter",
+		"AWS::Neptune::DBCluster":                            "aws_neptune_cluster",
+		"AWS::Neptune::DBClusterParameterGroup":              "aws_neptune_cluster_parameter_group",
+		"AWS::Neptune::DBInstance":                           "aws_neptune_cluster_instance",
+		"AWS::Neptune::DBParameterGroup":                     "aws_neptune_parameter_group",
+		"AWS::Neptune::DBSubnetGroup":                        "aws_neptune_subnet_group",
+		"AWS::RDS::DBCluster":                                "aws_rds_cluster",
+		"AWS::RDS::DBClusterParameterGroup":                  "aws_rds_cluster_parameter_group",
+		"AWS::RDS::DBInstance":                               "aws_db_instance",
+		"AWS::RDS::DBParameterGroup":                         "aws_db_parameter_group",
+		"AWS::RDS::DBSubnetGroup":                            "aws_db_subnet_group",
+		"AWS::Route53::RecordSet":                            "aws_route53_record",
+		"AWS::S3::Bucket":                                    "aws_s3_bucket",
+		"AWS::S3::BucketPolicy":                              "aws_s3_bucket_policy",
+		"AWS::SNS::Subscription":                             "aws_sns_subscription",
+		"AWS::SNS::Topic":                                    "aws_sns_topic",
+		"AWS::SNS::TopicPolicy":                              "aws_sns_topic_policy",
+		"AWS::SQS::Queue":                                    "aws_sqs_queue",
+		"AWS::SSM::Association":                              "aws_ssm_association",
+		"AWS::SSM::Document":                                 "aws_ssm_document",
+		"AWS::SSM::MaintenanceWindow":                        "aws_ssm_maintenance_window",
+		"AWS::SSM::MaintenanceWindowTarget":                  "aws_ssm_maintenance_window_target",
+		"AWS::SSM::MaintenanceWindowTask":                    "aws_ssm_maintenance_window_task",
+		"AWS::SecretsManager::Secret":                        "aws_secrets_manager_secret",
+		"AWS::ServiceCatalog::Portfolio":                     "aws_service_catalog_portfolio",
+		"AWS::ServiceCatalog::PortfolioProductAssociation":   "aws_service_catalog_product_portfolio_association",
+		"AWS::ServiceCatalog::PortfolioShare":                "aws_service_catalog_portfolio_share",
+		"AWS::ServiceCatalog::TagOption":                     "aws_service_catalog_tag_option",
+		"AWS::ServiceCatalog::TagOptionAssociation":          "aws_service_catalog_tag_option_association",
+		"AWS::ServiceDiscovery::Service":                     "aws_service_discovery_service",
+		"AWS::StepFunctions::StateMachine":                   "aws_sfn_state_machine",
+		"AWS::WAFv2::WebACLAssociation":                      "aws_wafv2_webacl_association",
+		"Microsoft.AnalysisServices/servers":                 "azurerm_analysis_services_server",
+		"Microsoft.ApiManagement/service":                    "azurerm_api_management",
+		"Microsoft.App/containerApps":                        "azurerm_container_app",
+		"Microsoft.App/managedEnvironments":                  "azurerm_container_app_environment",
+		"Microsoft.Authorization/roleAssignments":            "azurerm_role_assignment",
+		"Microsoft.Authorization/roleDefinitions":            "azurerm_role_definition",
+		"Microsoft.Compute/virtualMachines":                  "azurerm_virtual_machine",
+		"Microsoft.Compute/virtualMachines/extensions":       "azurerm_virtual_machine_extension",
+		"Microsoft.ManagedIdentity/userAssignedIdentities":   "azurerm_user_assigned_identity",
+		"Microsoft.Network/networkInterfaces":                "azurerm_network_interface",
+		"Microsoft.Network/networkSecurityGroups":            "azurerm_network_security_group",
+		"Microsoft.Network/publicIPAddresses":                "azurerm_public_ip",
+		"Microsoft.Network/virtualNetworks":                  "azurerm_virtual_network",
+		"Microsoft.Network/virtualNetworks/subnets":          "azurerm_subnet",
+		"Microsoft.OperationalInsights/workspaces":           "azurerm_log_analytics_workspace",
+		"Microsoft.Resources/deployments":                    "azurerm_template_deployment",
+		"Microsoft.Storage/storageAccounts":                  "azurerm_storage_account",
+		"Microsoft.ContainerRegistry/registries":             "azurerm_container_registry",
+		"Microsoft.ServiceBus/namespaces":                    "azurerm_servicebus_namespace",
+		"Microsoft.ServiceBus/namespaces/authorizationRules": "azurerm_servicebus_namespace_authorization_rule",
+		"Microsoft.ServiceBus/namespaces/queues":             "azurerm_servicebus_queue",
 	}
-	result := Lookup[resource]
+	result := Lookup[strings.TrimSuffix(resource, "/")]
+
 	var err error
+
 	if result == "" {
 		err = fmt.Errorf("resource %s not found", resource)
+
 		return nil, err
 	}
+
 	return &result, err
 }
diff --git a/src/see/lookup_test.go b/src/see/lookup_test.go
index 743e11c..3bd3682 100644
--- a/src/see/lookup_test.go
+++ b/src/see/lookup_test.go
@@ -6,6 +6,8 @@ import (
 )
 
 func TestLookup(t *testing.T) {
+	t.Parallel()
+
 	type args struct {
 		resource string
 	}
@@ -23,9 +25,11 @@ func TestLookup(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
 			got, err := Lookup(tt.args.resource)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("Lookup() error = %v, wantErr %v", err, tt.wantErr)
+
 				return
 			}
 			if !reflect.DeepEqual(got, tt.want) {
diff --git a/src/variable.go b/src/variable.go
deleted file mode 100644
index cc83ff6..0000000
--- a/src/variable.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package sato
-
-import (
-	_ "embed" //required for embed
-)
-
-//go:embed variable.template
-var VariableFile []byte
diff --git a/tests/integration/integration_test.go b/tests/integration/integration_test.go
index dd4f571..4ceb0db 100644
--- a/tests/integration/integration_test.go
+++ b/tests/integration/integration_test.go
@@ -1,19 +1,20 @@
-package integration
+package integration_test
 
 import (
 	"os"
 	"path"
-	sato "sato/src"
+	sato "sato/src/cf"
+	"sato/tests/utils"
 	"strconv"
 	"testing"
 
-	"sato/tests/utils"
-
 	"github.com/stretchr/testify/assert"
 )
 
 func TestLocalModules(t *testing.T) {
+	t.Parallel()
 	t.Run("Test sato conversion", func(t *testing.T) {
+		t.Parallel()
 		localTagExampleRepo := "https://github.com/JamesWoolfenden/aws-cloudformation-templates"
 		repoPath := utils.CloneRepo(localTagExampleRepo, "6758465103b4431e9de4a93d30faff7912204847")
 		defer func() {
@@ -28,12 +29,13 @@ func TestLocalModules(t *testing.T) {
 			assert.Fail(t, "Failed to parse")
 		}
 
-		//Count
+		// Count
 		files, _ := os.ReadDir(destination)
 		expect := 14
-		assert.Equal(t, expect, len(files), "The number of files found "+strconv.Itoa(len(files))+" should match expectation "+strconv.Itoa(expect))
+		assert.Equal(
+			t, expect, len(files),
+			"The number of files found "+strconv.Itoa(len(files))+" should match expectation "+strconv.Itoa(expect))
 		err = utils.TfInit(destination)
 		assert.Nil(t, err, "Failed to tf init output")
 	})
-
 }
diff --git a/tests/utils/utils.go b/tests/utils/utils.go
index c0bb982..e932cfd 100644
--- a/tests/utils/utils.go
+++ b/tests/utils/utils.go
@@ -24,6 +24,10 @@ func CloneRepo(repoPath string, commitHash string) string {
 		URL: repoPath,
 	})
 
+	if err != nil {
+		log.Fatal().Err(err)
+	}
+
 	if commitHash != "" {
 		wt, _ := repo.Worktree()
 
@@ -43,8 +47,8 @@ func TfInit(workingDir string) error {
 	installer := &releases.LatestVersion{
 		Product: product.Terraform,
 	}
-
 	execPath, err := installer.Install(context.Background())
+
 	if err != nil {
 		return err
 	}
@@ -58,5 +62,6 @@ func TfInit(workingDir string) error {
 	if err != nil {
 		return err
 	}
+
 	return nil
 }