diff --git a/examples/basic_dns_c2_azure.tf b/examples/basic_dns_c2_azure.tf
index 26836fd..df4efb8 100644
--- a/examples/basic_dns_c2_azure.tf
+++ b/examples/basic_dns_c2_azure.tf
@@ -8,23 +8,23 @@ module "resource_group" {
 
 module "storage_account" {
   source               = "./modules/azure/create-storage-account"
-  resource_group_names = "${module.resource_group.resource_group_names}"
-  locations            = "${module.resource_group.locations}"
+  resource_group_names = module.resource_group.resource_group_names
+  locations            = module.resource_group.locations
 }
 
 module "dns_c2" {
   source                  = "./modules/azure/dns-c2"
-  resource_group_names    = "${module.resource_group.resource_group_names}"
-  locations               = "${module.resource_group.locations}"
-  primary_blob_endpoints  = "${module.storage_account.primary_blob_endpoints}"
-  storage_container_names = "${module.storage_account.storage_container_names}"
+  resource_group_names    = module.resource_group.resource_group_names
+  locations               = module.resource_group.locations
+  primary_blob_endpoints  = module.storage_account.primary_blob_endpoints
+  storage_container_names = module.storage_account.storage_container_names
 }
 
 module "dns_rdir" {
   source                  = "./modules/azure/dns-rdir"
-  redirect_to             = "${module.dns_c2.ips}"
-  resource_group_names    = "${module.resource_group.resource_group_names}"
-  locations               = "${module.resource_group.locations}"
-  primary_blob_endpoints  = "${module.storage_account.primary_blob_endpoints}"
-  storage_container_names = "${module.storage_account.storage_container_names}"
+  redirect_to             = module.dns_c2.ips
+  resource_group_names    = module.resource_group.resource_group_names
+  locations               = module.resource_group.locations
+  primary_blob_endpoints  = module.storage_account.primary_blob_endpoints
+  storage_container_names = module.storage_account.storage_container_names
 }
diff --git a/examples/basic_dns_c2_digitalocean.tf b/examples/basic_dns_c2_digitalocean.tf
index f9240a9..1fdcdb4 100644
--- a/examples/basic_dns_c2_digitalocean.tf
+++ b/examples/basic_dns_c2_digitalocean.tf
@@ -9,16 +9,16 @@ module "dns_c2" {
   //count = 2
 
   // Wanna install empire?
-  //install = ["./scripts/empire.sh"]
+  //install = ["./data/scripts/empire.sh"]
 
   // Wanna install metasploit?
-  //install = ["./scripts/metasploit.sh"]
+  //install = ["./data/scripts/metasploit.sh"]
 
   // Wanna install CS?
-  //install = ["./scripts/cobaltstrike.sh"]
+  //install = ["./data/scripts/cobaltstrike.sh"]
 
   // I WANT EVERYTHING
-  //install = ["./scripts/empire.sh", "./scripts/metasploit.sh", "./scripts/cobaltstrike.sh"]
+  //install = ["./data/scripts/empire.sh", "./scripts/metasploit.sh", "./scripts/cobaltstrike.sh"]
 }
 
 module "dns_rdir" {
@@ -27,16 +27,16 @@ module "dns_rdir" {
   // 1 redirector ha. ha. ha... 2 redirectors ha. ha. ha... 3 redirectors ha. ha. ha..
   //count = 4
 
-  redirect_to = "${module.dns_c2.ips}"
+  redirect_to = module.dns_c2.ips
 
   //regions = ["NYC1", "SGP1"]
 }
 
 // print the c2 and redirector ips to the screen all perty like when everything's done
 output "dns-c2-ips" {
-  value = "${module.dns_c2.ips}"
+  value = module.dns_c2.ips
 }
 
 output "dns-rdir-ips" {
-  value = "${module.dns_rdir.ips}"
+  value = module.dns_rdir.ips
 }
\ No newline at end of file
diff --git a/examples/basic_http_c2_aws.tf b/examples/basic_http_c2_aws.tf
index 904db7c..fdf19ed 100644
--- a/examples/basic_http_c2_aws.tf
+++ b/examples/basic_http_c2_aws.tf
@@ -15,23 +15,23 @@ module "create_vpc" {
 module "http_c2" {
   source = "./modules/aws/http-c2"
 
-  vpc_id = "${module.create_vpc.vpc_id}"
-  subnet_id = "${module.create_vpc.subnet_id}"
+  vpc_id = module.create_vpc.vpc_id
+  subnet_id = module.create_vpc.subnet_id
 
   // 1 http C2 ha. ha. ha... 2 http C2s ha. ha. ha... 3 http C2s ha. ha. ha...
   //count = 2
 
   // Wanna install empire?
-  //install = ["./scripts/empire.sh"]
+  //install = ["./data/scripts/empire.sh"]
 
   // Wanna install metasploit?
-  //install = ["./scripts/metasploit.sh"]
+  //install = ["./data/scripts/metasploit.sh"]
 
   // Wanna install CS?
-  //install = ["./scripts/cobaltstrike.sh"]
+  //install = ["./data/scripts/cobaltstrike.sh"]
 
   // I WANT EVERYTHING
-  //install = ["./scripts/empire.sh", "./scripts/metasploit.sh", "./scripts/cobaltstrike.sh"]
+  //install = ["./data/scripts/empire.sh", "./scripts/metasploit.sh", "./scripts/cobaltstrike.sh"]
 }
 
 
@@ -39,10 +39,10 @@ module "http_rdir" {
   source = "./modules/aws/http-rdir"
 
   //count = 4
-  vpc_id = "${module.create_vpc.vpc_id}"
-  subnet_id = "${module.create_vpc.subnet_id}"
+  vpc_id = module.create_vpc.vpc_id
+  subnet_id = module.create_vpc.subnet_id
 
-  redirect_to = "${module.http_c2.ips}"
+  redirect_to = module.http_c2.ips
 
   //regions = ["TX", "SG"]
 }
diff --git a/examples/basic_http_c2_azure.tf b/examples/basic_http_c2_azure.tf
index afa254f..17e627d 100644
--- a/examples/basic_http_c2_azure.tf
+++ b/examples/basic_http_c2_azure.tf
@@ -9,40 +9,40 @@ module "resource_group" {
 
 module "storage_account" {
   source               = "./modules/azure/create-storage-account"
-  resource_group_names = "${module.resource_group.resource_group_names}"
-  locations            = "${module.resource_group.locations}"
+  resource_group_names = module.resource_group.resource_group_names
+  locations            = module.resource_group.locations
   count                = 2
 }
 
 module "http_c2" {
   source                  = "./modules/azure/http-c2"
-  resource_group_names    = "${module.resource_group.resource_group_names}"
-  locations               = "${module.resource_group.locations}"
-  primary_blob_endpoints  = "${module.storage_account.primary_blob_endpoints}"
-  storage_container_names = "${module.storage_account.storage_container_names}"
+  resource_group_names    = module.resource_group.resource_group_names
+  locations               = module.resource_group.locations
+  primary_blob_endpoints  = module.storage_account.primary_blob_endpoints
+  storage_container_names = module.storage_account.storage_container_names
 
   // 1 http C2 ha. ha. ha... 2 http C2s ha. ha. ha... 3 http C2s ha. ha. ha...
   //count = 2
 
   // Wanna install empire?
-  //install = ["./scripts/empire.sh"]
+  //install = ["./data/scripts/empire.sh"]
 
   // Wanna install metasploit?
-  //install = ["./scripts/metasploit.sh"]
+  //install = ["./data/scripts/metasploit.sh"]
 
   // Wanna install CS?
-  //install = ["./scripts/cobaltstrike.sh"]
+  //install = ["./data/scripts/cobaltstrike.sh"]
 
   // I WANT EVERYTHING
-  //install = ["./scripts/empire.sh", "./scripts/metasploit.sh", "./scripts/cobaltstrike.sh"]
+  //install = ["./data/scripts/empire.sh", "./scripts/metasploit.sh", "./scripts/cobaltstrike.sh"]
 }
 
 module "http_rdir" {
   source                  = "./modules/azure/http-rdir"
-  redirect_to             = "${module.http_c2.ips}"
-  resource_group_names    = "${module.resource_group.resource_group_names}"
-  locations               = "${module.resource_group.locations}"
-  primary_blob_endpoints  = "${module.storage_account.primary_blob_endpoints}"
-  storage_container_names = "${module.storage_account.storage_container_names}"
+  redirect_to             = module.http_c2.ips
+  resource_group_names    = module.resource_group.resource_group_names
+  locations               = module.resource_group.locations
+  primary_blob_endpoints  = module.storage_account.primary_blob_endpoints
+  storage_container_names = module.storage_account.storage_container_names
   count                   = 2
 }
diff --git a/examples/basic_http_c2_digitalocean.tf b/examples/basic_http_c2_digitalocean.tf
index fee0daf..a24c681 100644
--- a/examples/basic_http_c2_digitalocean.tf
+++ b/examples/basic_http_c2_digitalocean.tf
@@ -9,16 +9,16 @@ module "http_c2" {
   //count = 2
 
   // Wanna install empire?
-  //install = ["./scripts/empire.sh"]
+  //install = ["./data/scripts/empire.sh"]
 
   // Wanna install metasploit?
-  //install = ["./scripts/metasploit.sh"]
+  //install = ["./data/scripts/metasploit.sh"]
 
   // Wanna install CS?
-  //install = ["./scripts/cobaltstrike.sh"]
+  //install = ["./data/scripts/cobaltstrike.sh"]
 
   // I WANT EVERYTHING
-  //install = ["./scripts/empire.sh", "./scripts/metasploit.sh", "./scripts/cobaltstrike.sh"]
+  //install = ["./data/scripts/empire.sh", "./scripts/metasploit.sh", "./scripts/cobaltstrike.sh"]
 }
 
 module "http_rdir" {
@@ -27,16 +27,16 @@ module "http_rdir" {
   // 1 redirector ha. ha. ha... 2 redirectors ha. ha. ha... 3 redirectors ha. ha. ha..
   //count = 4
 
-  redirect_to = "${module.http_c2.ips}"
+  redirect_to = module.http_c2.ips
 
   //regions = ["NYC1", "SGP1"]
 }
 
 // print the c2 and redirector ips to the screen all perty like when everything's done
 output "http-c2-ips" {
-  value = "${module.http_c2.ips}"
+  value = module.http_c2.ips
 }
 
 output "http-rdir-ips" {
-  value = "${module.http_rdir.ips}"
+  value = module.http_rdir.ips
 }
\ No newline at end of file
diff --git a/examples/basic_http_c2_google.tf b/examples/basic_http_c2_google.tf
index 6ad9cdb..7ab0b99 100644
--- a/examples/basic_http_c2_google.tf
+++ b/examples/basic_http_c2_google.tf
@@ -10,6 +10,6 @@ module "http_c2" {
 module "http_rdir" {
   source = "./modules/google/http-rdir"
   count = 2
-  redirect_to = "${module.http_c2.ips}"
+  redirect_to = module.http_c2.ips
   zones = ["Canada-1", "Brazil-2"]
 }
diff --git a/examples/basic_http_c2_linode.tf b/examples/basic_http_c2_linode.tf
index f6d5af3..299e739 100644
--- a/examples/basic_http_c2_linode.tf
+++ b/examples/basic_http_c2_linode.tf
@@ -11,16 +11,16 @@ module "http_c2" {
   //count = 2
 
   // Wanna install empire?
-  //install = ["./scripts/empire.sh"]
+  //install = ["./data/scripts/empire.sh"]
 
   // Wanna install metasploit?
-  //install = ["./scripts/metasploit.sh"]
+  //install = ["./data/scripts/metasploit.sh"]
 
   // Wanna install CS?
-  //install = ["./scripts/cobaltstrike.sh"]
+  //install = ["./data/scripts/cobaltstrike.sh"]
 
   // I WANT EVERYTHING
-  //install = ["./scripts/empire.sh", "./scripts/metasploit.sh", "./scripts/cobaltstrike.sh"]
+  //install = ["./data/scripts/empire.sh", "./scripts/metasploit.sh", "./scripts/cobaltstrike.sh"]
 }
 
 module "http_rdir" {
@@ -28,7 +28,7 @@ module "http_rdir" {
 
   // 1 redirector ha. ha. ha... 2 redirectors ha. ha. ha... 3 redirectors ha. ha. ha..
   //count = 4
-  redirect_to = "${module.http_c2.ips}"
+  redirect_to = module.http_c2.ips
 
   //regions = ["TX", "SG"]
 }
diff --git a/examples/basic_phishing_aws.tf b/examples/basic_phishing_aws.tf
index 9ca2906..1db98af 100644
--- a/examples/basic_phishing_aws.tf
+++ b/examples/basic_phishing_aws.tf
@@ -17,8 +17,8 @@ module "phishing_server" {
 
   // 1 phishing server ha. ha. ha... 2 phishing servers ha. ha. ha... 3 phishing servers ha. ha. ha...
   //count = 2
-  vpc_id = "${module.create_vpc.vpc_id}"
-  subnet_id = "${module.create_vpc.subnet_id}"
+  vpc_id = module.create_vpc.vpc_id
+  subnet_id = module.create_vpc.subnet_id
 
 }
 
@@ -27,9 +27,9 @@ module "http_rdir" {
 
   // 1 redirector ha. ha. ha... 2 redirectors ha. ha. ha... 3 redirectors ha. ha. ha...
   //count = 4
-  vpc_id = "${module.create_vpc.vpc_id}"
-  subnet_id = "${module.create_vpc.subnet_id}"
+  vpc_id = module.create_vpc.vpc_id
+  subnet_id = module.create_vpc.subnet_id
 
-  redirect_to = "${module.phishing_server.ips}"
+  redirect_to = module.phishing_server.ips
 
 }
diff --git a/examples/basic_phishing_digitalocean.tf b/examples/basic_phishing_digitalocean.tf
index 30cf781..681312b 100644
--- a/examples/basic_phishing_digitalocean.tf
+++ b/examples/basic_phishing_digitalocean.tf
@@ -9,5 +9,5 @@ module "phishing_server" {
 module "http_rdir" {
   source = "./modules/digitalocean/http-rdir"
 
-  redirect_to = "${module.phishing_server.ips}"
+  redirect_to = module.phishing_server.ips
 }
diff --git a/examples/basic_phishing_google.tf b/examples/basic_phishing_google.tf
index f8483e5..fa20fb5 100644
--- a/examples/basic_phishing_google.tf
+++ b/examples/basic_phishing_google.tf
@@ -13,7 +13,7 @@ module "phishing_server" {
 module "http_rdir" {
   source = "./modules/linode/http-rdir"
   count = 4
-  redirect_to = "${module.phishing_server.ips}"
+  redirect_to = module.phishing_server.ips
 
   regions = ["Oregon-1", "Singapore-1", "Australia-2", "Japan-1"]
 }
diff --git a/examples/basic_phishing_linode.tf b/examples/basic_phishing_linode.tf
index fa1e65e..fc49a6c 100644
--- a/examples/basic_phishing_linode.tf
+++ b/examples/basic_phishing_linode.tf
@@ -17,7 +17,7 @@ module "http_rdir" {
 
   // 1 redirector ha. ha. ha... 2 redirectors ha. ha. ha... 3 redirectors ha. ha. ha...
   //count = 4
-  redirect_to = "${module.phishing_server.ips}"
+  redirect_to = module.phishing_server.ips
 
   // 1337 APT's all come from Texas and Singapore
   //regions = ["TX", "SG"]
diff --git a/examples/complete_c2.tf b/examples/complete_c2.tf
index 5f880b5..6026513 100644
--- a/examples/complete_c2.tf
+++ b/examples/complete_c2.tf
@@ -59,31 +59,31 @@ module "create_vpc" {
 module "http_c2" {
   source = "./modules/aws/http-c2"
 
-  vpc_id = "${module.create_vpc.vpc_id}"
-  subnet_id = "${module.create_vpc.subnet_id}"
+  vpc_id = module.create_vpc.vpc_id
+  subnet_id = module.create_vpc.subnet_id
 
-  //install = ["./scripts/empire.sh"]
+  //install = ["./data/scripts/empire.sh"]
 }
 
 module "dns_c2" {
   source = "./modules/aws/dns-c2"
 
-  vpc_id = "${module.create_vpc.vpc_id}"
-  subnet_id = "${module.create_vpc.subnet_id}"
+  vpc_id = module.create_vpc.vpc_id
+  subnet_id = module.create_vpc.subnet_id
 }
 
 module "http_rdir" {
   source = "./modules/linode/http-rdir"
 
   count = 2
-  redirect_to = "${module.http_c2.ips}"
+  redirect_to = module.http_c2.ips
   regions = ["UK", "SG"]
 }
 
 module "dns_rdir" {
   source = "./modules/linode/dns-rdir"
 
-  redirect_to = "${module.dns_c2.ips}"
+  redirect_to = module.dns_c2.ips
 }
 
 module "http_rdir1_records" {
@@ -91,7 +91,7 @@ module "http_rdir1_records" {
   domain = "theredbaroness.com"
   type = "A"
   records = {
-    "theredbaroness.com" = "${module.http_rdir.ips[0]}"
+    "theredbaroness.com" = module.http_rdir.ips[0]
   }
 }
 
@@ -100,7 +100,7 @@ module "http_rdir2_records" {
   domain = "pizzapastalasagna.com"
   type = "A"
   records = {
-    "pizzapastalasagna.com" = "${module.http_rdir.ips[1]}"
+    "pizzapastalasagna.com" = module.http_rdir.ips[1]
   }
 }
 
@@ -110,8 +110,8 @@ module "dns_rdir_records" {
   domain = "goodyearbook.com"
   type = "A"
   records = {
-    "goodyearbook.com"     = "${module.dns_rdir.ips[0]}"
-    "ns1.goodyearbook.com" = "${module.dns_rdir.ips[0]}"
+    "goodyearbook.com"     = module.dns_rdir.ips[0]
+    "ns1.goodyearbook.com" = module.dns_rdir.ips[0]
   }
 }
 
@@ -137,25 +137,25 @@ module "create_certs" {
 }
 
 output "http-c2-ips" {
-  value = "${module.http_c2.ips}"
+  value = module.http_c2.ips
 }
 
 output "dns-c2-ips" {
-  value = "${module.dns_c2.ips}"
+  value = module.dns_c2.ips
 }
 
 output "http-rdir-ips" {
-  value = "${module.http_rdir.ips}"
+  value = module.http_rdir.ips
 }
 
 output "dns-rdir-ips" {
-  value = "${module.dns_rdir.ips}"
+  value = module.dns_rdir.ips
 }
 
 output "http_rdir_domains" {
-  value = "${merge(module.http_rdir1_records.records, module.http_rdir2_records.records)}"
+  value = merge(module.http_rdir1_records.records, module.http_rdir2_records.records)
 }
 
 output "dns_rdir_domains" {
-  value = "${merge(module.dns_rdir_records.records, module.dns_rdir_ns_record.records)}"
+  value = merge(module.dns_rdir_records.records, module.dns_rdir_ns_record.records)
 }
diff --git a/modules/ansible/README.md b/modules/ansible/README.md
index e9da297..bceefab 100644
--- a/modules/ansible/README.md
+++ b/modules/ansible/README.md
@@ -8,8 +8,8 @@ Runs an ansible playbook on a specific resource
 module "ansible" {
   source    = "./modules/ansible"
 
-  user      = "${http_c2.ssh_user}"
-  ip        = "${http_c2.ips[0]}"
+  user      = http_c2.ssh_user
+  ip        = http_c2.ips[0]
   playbook  = "/path/to/playbook.yml"
 }
 ```
diff --git a/modules/ansible/main.tf b/modules/ansible/main.tf
index 663e360..7ff8bdd 100644
--- a/modules/ansible/main.tf
+++ b/modules/ansible/main.tf
@@ -4,14 +4,14 @@ terraform {
 
 resource "null_resource" "ansible_provisioner" {
 
-  triggers {
-    policy_sha1 = "${sha1(file(var.playbook))}"
+  triggers = {
+    policy_sha1 = sha1(file(var.playbook))
   }
 
   provisioner "local-exec" {
     command = "ansible-playbook ${join(" ", compact(var.arguments))} --user=${var.user} --private-key=./data/ssh_keys/${var.ip} -e host=${var.ip}${join(" -e ", compact(var.envs))} ${var.playbook}"
 
-    environment {
+    environment = {
       ANSIBLE_HOST_KEY_CHECKING = "False"
     }
   }
diff --git a/modules/ansible/outputs.tf b/modules/ansible/outputs.tf
index 9bf3a48..fa3f97c 100644
--- a/modules/ansible/outputs.tf
+++ b/modules/ansible/outputs.tf
@@ -1,9 +1,9 @@
 output "arguments" {
-  value = "${var.arguments}"
+  value = var.arguments
   description = "Arguments"
 }
 
 output "envs" {
-  value = "${var.envs}"
+  value = var.envs
   description = "Environment variables"
 }
\ No newline at end of file
diff --git a/modules/ansible/variables.tf b/modules/ansible/variables.tf
index ca124b8..267023d 100644
--- a/modules/ansible/variables.tf
+++ b/modules/ansible/variables.tf
@@ -13,13 +13,13 @@ variable "user" {
 
 variable "arguments" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Arguments"
 }
 
 variable "envs" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Environment variables"
 }
 
diff --git a/modules/aws/create-dns-record/main.tf b/modules/aws/create-dns-record/main.tf
index db36264..5b7a2dc 100644
--- a/modules/aws/create-dns-record/main.tf
+++ b/modules/aws/create-dns-record/main.tf
@@ -3,15 +3,15 @@ terraform {
 }
 
 data "aws_route53_zone" "selected" {
-  name  = "${var.domain}"
+  name  = var.domain
 }
 
 resource "aws_route53_record" "record" {
-  count = "${var.count}"
+  count = var.count_vm
 
-  zone_id = "${data.aws_route53_zone.selected.zone_id}"
-  name = "${element(keys(var.records), count.index)}"
-  type = "${var.type}"
-  ttl = "${var.ttl}"
+  zone_id = data.aws_route53_zone.selected.zone_id
+  name = element(keys(var.records), count.index)
+  type = var.type
+  ttl = var.ttl
   records = ["${lookup(var.records, element(keys(var.records), count.index))}"]
 }
diff --git a/modules/aws/create-dns-record/outputs.tf b/modules/aws/create-dns-record/outputs.tf
index 4e0b481..4adec69 100644
--- a/modules/aws/create-dns-record/outputs.tf
+++ b/modules/aws/create-dns-record/outputs.tf
@@ -1,3 +1,3 @@
 output "records" {
-  value = "${var.records}"
+  value = var.records
 }
\ No newline at end of file
diff --git a/modules/aws/create-dns-record/variables.tf b/modules/aws/create-dns-record/variables.tf
index f03999c..1a76ba9 100644
--- a/modules/aws/create-dns-record/variables.tf
+++ b/modules/aws/create-dns-record/variables.tf
@@ -2,7 +2,7 @@ variable "domain" {}
 
 variable "type" {}
 
-variable "count" {
+variable "count_vm" {
   default = 1
 }
 
@@ -11,5 +11,5 @@ variable "ttl" {
 }
 
 variable "records" {
-  type = "map"
+  type = map(string)
 }
\ No newline at end of file
diff --git a/modules/aws/create-hosted-zone/main.tf b/modules/aws/create-hosted-zone/main.tf
index 687f921..a43e24c 100644
--- a/modules/aws/create-hosted-zone/main.tf
+++ b/modules/aws/create-hosted-zone/main.tf
@@ -1,3 +1,3 @@
 resource "aws_route53_zone" "new_zone" {
-  name = "${var.domain}"
+  name = var.domain
 }
\ No newline at end of file
diff --git a/modules/aws/create-hosted-zone/outputs.tf b/modules/aws/create-hosted-zone/outputs.tf
index d5f39f0..b954787 100644
--- a/modules/aws/create-hosted-zone/outputs.tf
+++ b/modules/aws/create-hosted-zone/outputs.tf
@@ -1,7 +1,7 @@
 output "zone_id" {
-  value = "${aws_route53_zone.new_zone.zone_id}"
+  value = aws_route53_zone.new_zone.zone_id
 }
 
 output "name_servers" {
-  value = "${aws_route53_zone.new_zone.name_servers}"
+  value = aws_route53_zone.new_zone.name_servers
 }
\ No newline at end of file
diff --git a/modules/aws/create-vpc/main.tf b/modules/aws/create-vpc/main.tf
index 9e2d16f..e8d43d7 100644
--- a/modules/aws/create-vpc/main.tf
+++ b/modules/aws/create-vpc/main.tf
@@ -7,7 +7,7 @@ terraform {
 // https://github.com/hashicorp/terraform/issues/11578
 
 resource "aws_vpc" "default" {
-  //count = "${var.count}"
+  //count = var.count_vm
   //provider = "aws.${element(var.regions, count.index)}"
 
   cidr_block = "10.0.0.0/16"
@@ -15,36 +15,36 @@ resource "aws_vpc" "default" {
 }
 
 resource "aws_subnet" "default" {
-  //count = "${var.count}"
+  //count = var.count_vm
   //provider = "aws.${element(var.regions, count.index)}"
 
-  vpc_id = "${aws_vpc.default.id}"
+  vpc_id = aws_vpc.default.id
   cidr_block = "10.0.0.0/24"
 }
 
 resource "aws_internet_gateway" "default" {
-  //count = "${var.count}"
+  //count = var.count_vm
   //provider = "aws.${element(var.regions, count.index)}"
 
-  vpc_id = "${aws_vpc.default.id}"
+  vpc_id = aws_vpc.default.id
 }
 
 resource "aws_route_table" "default" {
-  //count = "${var.count}"
+  //count = var.count_vm
   //provider = "aws.${element(var.regions, count.index)}"
 
-  vpc_id = "${aws_vpc.default.id}"
+  vpc_id = aws_vpc.default.id
 
   route {
     cidr_block = "0.0.0.0/0"
-    gateway_id = "${aws_internet_gateway.default.id}"
+    gateway_id = aws_internet_gateway.default.id
   }
 }
 
 resource "aws_route_table_association" "default" {
-  //count = "${var.count}"
+  //count = var.count_vm
   //provider = "aws.${element(var.regions, count.index)}"
 
-  subnet_id = "${aws_subnet.default.id}"
-  route_table_id = "${aws_route_table.default.id}"
+  subnet_id = aws_subnet.default.id
+  route_table_id = aws_route_table.default.id
 }
diff --git a/modules/aws/create-vpc/outputs.tf b/modules/aws/create-vpc/outputs.tf
index f1708ee..58e5a4c 100644
--- a/modules/aws/create-vpc/outputs.tf
+++ b/modules/aws/create-vpc/outputs.tf
@@ -1,7 +1,7 @@
 output "subnet_id" {
-  value = "${aws_subnet.default.id}"
+  value = aws_subnet.default.id
 }
 
 output "vpc_id" {
-  value = "${aws_vpc.default.id}"
+  value = aws_vpc.default.id
 }
\ No newline at end of file
diff --git a/modules/aws/create-vpc/variables.tf b/modules/aws/create-vpc/variables.tf
index 30ab063..4612f90 100644
--- a/modules/aws/create-vpc/variables.tf
+++ b/modules/aws/create-vpc/variables.tf
@@ -1,5 +1,5 @@
 /*
-variable "count" {
+variable "count_vm" {
   default = 1
 }
 */
\ No newline at end of file
diff --git a/modules/aws/dns-c2/README.md b/modules/aws/dns-c2/README.md
index dc1c275..326cef4 100644
--- a/modules/aws/dns-c2/README.md
+++ b/modules/aws/dns-c2/README.md
@@ -21,7 +21,7 @@ module "dns_c2" {
 |`subnet_id`                | Yes      | String     | Subnet ID to create instance in.
 |`count`                    | No       | Integer    | Number of instances to launch. Defaults to 1.
 |`instance_type`            | No       | String     | Instance type to launch. Defaults to "t2.medium"
-|`install`                  | No       | List       | Scripts to run on instance creation. Defaults to "./scripts/core_deps.sh".
+|`install`                  | No       | List       | Scripts to run on instance creation. Defaults to "./data/scripts/core_deps.sh".
 
 # Outputs
 
diff --git a/modules/aws/dns-c2/main.tf b/modules/aws/dns-c2/main.tf
index dcfda7c..84043fc 100644
--- a/modules/aws/dns-c2/main.tf
+++ b/modules/aws/dns-c2/main.tf
@@ -5,20 +5,20 @@ terraform {
 data "aws_region" "current" {}
 
 resource "random_id" "server" {
-  count = "${var.count}"
+  count = var.count_vm
   byte_length = 4
 }
 
 resource "tls_private_key" "ssh" {
-  count = "${var.count}"
+  count = var.count_vm
   algorithm = "RSA"
   rsa_bits = 4096
 }
 
 resource "aws_key_pair" "dns-c2" {
-  count = "${var.count}"
+  count = var.count_vm
   key_name = "dns-c2-key-${count.index}"  
-  public_key = "${tls_private_key.ssh.*.public_key_openssh[count.index]}"
+  public_key = tls_private_key.ssh.*.public_key_openssh[count.index]
 }
 
 resource "aws_instance" "dns-c2" {
@@ -28,26 +28,26 @@ resource "aws_instance" "dns-c2" {
 
   //provider = "aws.${element(var.regions, count.index)}"
 
-  count = "${var.count}"
+  count = var.count_vm
 
   tags = {
     Name = "dns-c2-${random_id.server.*.hex[count.index]}"
   }
 
-  ami = "${var.amis[data.aws_region.current.name]}"
-  instance_type = "${var.instance_type}"
-  key_name = "${aws_key_pair.dns-c2.*.key_name[count.index]}"
+  ami = var.amis[data.aws_region.current.name]
+  instance_type = var.instance_type
+  key_name = aws_key_pair.dns-c2.*.key_name[count.index]
   vpc_security_group_ids = ["${aws_security_group.dns-c2.id}"]
-  subnet_id = "${var.subnet_id}"
+  subnet_id = var.subnet_id
   associate_public_ip_address = true
 
   provisioner "remote-exec" {
-    scripts = "${concat(list("./scripts/core_deps.sh"), var.install)}"
+    scripts = concat(list("./data/scripts/core_deps.sh"), var.install)
 
     connection {
         type = "ssh"
         user = "admin"
-        private_key = "${tls_private_key.ssh.*.private_key_pem[count.index]}"
+        private_key = tls_private_key.ssh.*.private_key_pem[count.index]
     }
   }
 
@@ -56,26 +56,26 @@ resource "aws_instance" "dns-c2" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_keys/${self.public_ip}*"
   }
 
 }
 
 resource "null_resource" "ansible_provisioner" {
-  count = "${signum(length(var.ansible_playbook)) == 1 ? var.count : 0}"
+  count = signum(length(var.ansible_playbook)) == 1 ? var.count_vm : 0
 
-  depends_on = ["aws_instance.dns-c2"]
+  depends_on = [aws_instance.dns-c2]
 
-  triggers {
-    droplet_creation = "${join("," , aws_instance.dns-c2.*.id)}"
-    policy_sha1 = "${sha1(file(var.ansible_playbook))}"
+  triggers = {
+    droplet_creation = join("," , aws_instance.dns-c2.*.id)
+    policy_sha1 = sha1(file(var.ansible_playbook))
   }
 
   provisioner "local-exec" {
     command = "ansible-playbook ${join(" ", compact(var.ansible_arguments))} --user=admin --private-key=./data/ssh_keys/${aws_instance.dns-c2.*.public_ip[count.index]} -e host=${aws_instance.dns-c2.*.public_ip[count.index]} ${var.ansible_playbook}"
 
-    environment {
+    environment = {
       ANSIBLE_HOST_KEY_CHECKING = "False"
     }
   }
@@ -87,27 +87,27 @@ resource "null_resource" "ansible_provisioner" {
 
 data "template_file" "ssh_config" {
 
-  count    = "${var.count}"
+  count    = var.count_vm
 
-  template = "${file("./data/templates/ssh_config.tpl")}"
+  template = file("./data/templates/ssh_config.tpl")
 
-  depends_on = ["aws_instance.dns-c2"]
+  depends_on = [aws_instance.dns-c2]
 
-  vars {
+  vars = {
     name = "dns_c2_${aws_instance.dns-c2.*.public_ip[count.index]}"
-    hostname = "${aws_instance.dns-c2.*.public_ip[count.index]}"
+    hostname = aws_instance.dns-c2.*.public_ip[count.index]
     user = "admin"
-    identityfile = "${path.root}/data/ssh_keys/${aws_instance.dns-c2.*.public_ip[count.index]}"
+    identityfile = path.root}/data/ssh_keys/${aws_instance.dns-c2.*.public_ip[count.index]
   }
 
 }
 
 resource "null_resource" "gen_ssh_config" {
 
-  count = "${var.count}"
+  count = var.count_vm
 
-  triggers {
-    template_rendered = "${data.template_file.ssh_config.*.rendered[count.index]}"
+  triggers = {
+    template_rendered = data.template_file.ssh_config.*.rendered[count.index]
   }
 
   provisioner "local-exec" {
@@ -115,7 +115,7 @@ resource "null_resource" "gen_ssh_config" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_configs/config_${random_id.server.*.hex[count.index]}"
   }
 
diff --git a/modules/aws/dns-c2/security_group.tf b/modules/aws/dns-c2/security_group.tf
index 7d1a51e..aaba70a 100644
--- a/modules/aws/dns-c2/security_group.tf
+++ b/modules/aws/dns-c2/security_group.tf
@@ -3,13 +3,13 @@ terraform {
 }
 
 data "external" "get_public_ip" {
-  program = ["bash", "./scripts/get_public_ip.sh" ]
+  program = ["bash", "./data/scripts/get_public_ip.sh" ]
 }
 
 resource "aws_security_group" "dns-c2" {
   name = "dns-c2"
   description = "Security group created by Red Baron"
-  vpc_id = "${var.vpc_id}"
+  vpc_id = var.vpc_id
 
   ingress {
     from_port = 22
diff --git a/modules/aws/dns-c2/variables.tf b/modules/aws/dns-c2/variables.tf
index 0e58c81..e89858a 100644
--- a/modules/aws/dns-c2/variables.tf
+++ b/modules/aws/dns-c2/variables.tf
@@ -2,7 +2,7 @@ variable "subnet_id" {}
 
 variable "vpc_id" {}
 
-variable "count" {
+variable "count_vm" {
   default = 1
 }
 
@@ -13,13 +13,13 @@ variable "ansible_playbook" {
 
 variable "ansible_arguments" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Additional Ansible Arguments"
 }
 
 variable "ansible_vars" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Environment variables"
 }
 
@@ -28,23 +28,23 @@ variable "instance_type" {
 }
 
 variable "install" {
-  type = "list"
+  type = list(string)
   default = []
 }
 
 /*
 variable "install" {
-  type = "map"
+  type = map(string)
   default = {
-    "empire" = "./scripts/install_empire.sh"
-    "metasploit" = "./scripts/install_metasploit.sh"
-    "cobaltstrike" = "./scripts/install_cobalt_strike.sh"
+    "empire" = "./data/scripts/install_empire.sh"
+    "metasploit" = "./data/scripts/install_metasploit.sh"
+    "cobaltstrike" = "./data/scripts/install_cobalt_strike.sh"
   }
 }
 */
 
 variable "amis" {
-  type = "map"
+  type = map(string)
   default = {
 
     // Taken from https://wiki.debian.org/Cloud/AmazonEC2Image/Stretch
diff --git a/modules/aws/dns-rdir/main.tf b/modules/aws/dns-rdir/main.tf
index b77b86d..5b999e7 100644
--- a/modules/aws/dns-rdir/main.tf
+++ b/modules/aws/dns-rdir/main.tf
@@ -5,20 +5,20 @@ terraform {
 data "aws_region" "current" {}
 
 resource "random_id" "server" {
-  count = "${var.count}"
+  count = var.count_vm
   byte_length = 4
 }
 
 resource "tls_private_key" "ssh" {
-  count = "${var.count}"
+  count = var.count_vm
   algorithm = "RSA"
   rsa_bits = 4096
 }
 
 resource "aws_key_pair" "dns-rdir" {
-  count = "${var.count}"
+  count = var.count_vm
   key_name = "dns-rdir-key-${count.index}"  
-  public_key = "${tls_private_key.ssh.*.public_key_openssh[count.index]}"
+  public_key = tls_private_key.ssh.*.public_key_openssh[count.index]
 }
 
 resource "aws_instance" "dns-rdir" {
@@ -28,17 +28,17 @@ resource "aws_instance" "dns-rdir" {
 
   //provider = "aws.${element(var.regions, count.index)}"
 
-  count = "${var.count}"
+  count = var.count_vm
 
   tags = {
     Name = "dns-rdir-${random_id.server.*.hex[count.index]}"
   }
 
-  ami = "${var.amis[data.aws_region.current.name]}"
-  instance_type = "${var.instance_type}"
-  key_name = "${aws_key_pair.dns-rdir.*.key_name[count.index]}"
+  ami = var.amis[data.aws_region.current.name]
+  instance_type = var.instance_type
+  key_name = aws_key_pair.dns-rdir.*.key_name[count.index]
   vpc_security_group_ids = ["${aws_security_group.dns-rdir.id}"]
-  subnet_id = "${var.subnet_id}"
+  subnet_id = var.subnet_id
   associate_public_ip_address = true
 
   provisioner "remote-exec" {
@@ -51,7 +51,7 @@ resource "aws_instance" "dns-rdir" {
     connection {
         type = "ssh"
         user = "admin"
-        private_key = "${tls_private_key.ssh.*.private_key_pem[count.index]}"
+        private_key = tls_private_key.ssh.*.private_key_pem[count.index]
     }
   }
 
@@ -60,26 +60,26 @@ resource "aws_instance" "dns-rdir" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_keys/${self.public_ip}*"
   }
 
 }
 
 resource "null_resource" "ansible_provisioner" {
-  count = "${signum(length(var.ansible_playbook)) == 1 ? var.count : 0}"
+  count = signum(length(var.ansible_playbook)) == 1 ? var.count_vm : 0
 
-  depends_on = ["aws_instance.dns-rdir"]
+  depends_on = [aws_instance.dns-rdir]
 
-  triggers {
-    droplet_creation = "${join("," , aws_instance.dns-rdir.*.id)}"
-    policy_sha1 = "${sha1(file(var.ansible_playbook))}"
+  triggers = {
+    droplet_creation = join("," , aws_instance.dns-rdir.*.id)
+    policy_sha1 = sha1(file(var.ansible_playbook))
   }
 
   provisioner "local-exec" {
     command = "ansible-playbook ${join(" ", compact(var.ansible_arguments))} --user=admin --private-key=./data/ssh_keys/${aws_instance.dns-rdir.*.public_ip[count.index]} -e host=${aws_instance.dns-rdir.*.public_ip[count.index]} ${var.ansible_playbook}"
 
-    environment {
+    environment = {
       ANSIBLE_HOST_KEY_CHECKING = "False"
     }
   }
@@ -91,27 +91,27 @@ resource "null_resource" "ansible_provisioner" {
 
 data "template_file" "ssh_config" {
 
-  count    = "${var.count}"
+  count    = var.count_vm
 
-  template = "${file("./data/templates/ssh_config.tpl")}"
+  template = file("./data/templates/ssh_config.tpl")
 
-  depends_on = ["aws_instance.dns-rdir"]
+  depends_on = [aws_instance.dns-rdir]
 
-  vars {
+  vars = {
     name = "dns_rdir_${aws_instance.dns-rdir.*.public_ip[count.index]}"
-    hostname = "${aws_instance.dns-rdir.*.public_ip[count.index]}"
+    hostname = aws_instance.dns-rdir.*.public_ip[count.index]
     user = "admin"
-    identityfile = "${path.root}/data/ssh_keys/${aws_instance.dns-rdir.*.public_ip[count.index]}"
+    identityfile = path.root}/data/ssh_keys/${aws_instance.dns-rdir.*.public_ip[count.index]
   }
 
 }
 
 resource "null_resource" "gen_ssh_config" {
 
-  count = "${var.count}"
+  count = var.count_vm
 
-  triggers {
-    template_rendered = "${data.template_file.ssh_config.*.rendered[count.index]}"
+  triggers = {
+    template_rendered = data.template_file.ssh_config.*.rendered[count.index]
   }
 
   provisioner "local-exec" {
@@ -119,7 +119,7 @@ resource "null_resource" "gen_ssh_config" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_configs/config_${random_id.server.*.hex[count.index]}"
   }
 
diff --git a/modules/aws/dns-rdir/security_group.tf b/modules/aws/dns-rdir/security_group.tf
index 5460d8f..f6f5af5 100644
--- a/modules/aws/dns-rdir/security_group.tf
+++ b/modules/aws/dns-rdir/security_group.tf
@@ -3,13 +3,13 @@ terraform {
 }
 
 data "external" "get_public_ip" {
-  program = ["bash", "./scripts/get_public_ip.sh" ]
+  program = ["bash", "./data/scripts/get_public_ip.sh" ]
 }
 
 resource "aws_security_group" "dns-rdir" {
   name = "dns-rdir"
   description = "Security group created by Red Baron"
-  vpc_id = "${var.vpc_id}"
+  vpc_id = var.vpc_id
 
   ingress {
     from_port = 22
diff --git a/modules/aws/dns-rdir/variables.tf b/modules/aws/dns-rdir/variables.tf
index 7345d0d..9557947 100644
--- a/modules/aws/dns-rdir/variables.tf
+++ b/modules/aws/dns-rdir/variables.tf
@@ -3,10 +3,10 @@ variable "subnet_id" {}
 variable "vpc_id" {}
 
 variable "redirect_to" {
-  type = "list"
+  type = list(string)
 }
 
-variable "count" {
+variable "count_vm" {
   default = 1
 }
 
@@ -17,13 +17,13 @@ variable "ansible_playbook" {
 
 variable "ansible_arguments" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Additional Ansible Arguments"
 }
 
 variable "ansible_vars" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Environment variables"
 }
 
@@ -33,17 +33,17 @@ variable "instance_type" {
 
 /*
 variable "install" {
-  type = "map"
+  type = map(string)
   default = {
-    "empire" = "./scripts/install_empire.sh"
-    "metasploit" = "./scripts/install_metasploit.sh"
-    "cobaltstrike" = "./scripts/install_cobalt_strike.sh"
+    "empire" = "./data/scripts/install_empire.sh"
+    "metasploit" = "./data/scripts/install_metasploit.sh"
+    "cobaltstrike" = "./data/scripts/install_cobalt_strike.sh"
   }
 }
 */
 
 variable "amis" {
-  type = "map"
+  type = map(string)
   default = {
 
     // Taken from https://wiki.debian.org/Cloud/AmazonEC2Image/Stretch
diff --git a/modules/aws/domain-front/main.tf b/modules/aws/domain-front/main.tf
index 0285119..c075bc2 100644
--- a/modules/aws/domain-front/main.tf
+++ b/modules/aws/domain-front/main.tf
@@ -7,7 +7,7 @@ resource "aws_cloudfront_distribution" "http-c2" {
     is_ipv6_enabled = false
 
     origin {
-        domain_name = "${var.domain}"
+        domain_name = var.domain
         origin_id = "domain-front"
 
         custom_origin_config {
diff --git a/modules/aws/domain-front/outputs.tf b/modules/aws/domain-front/outputs.tf
index c9bdf6d..fc5e99d 100644
--- a/modules/aws/domain-front/outputs.tf
+++ b/modules/aws/domain-front/outputs.tf
@@ -1,3 +1,3 @@
 output "cf-domain" {
-    value = "${aws_cloudfront_distribution.http-c2.domain_name}"
+    value = aws_cloudfront_distribution.http-c2.domain_name
 }
\ No newline at end of file
diff --git a/modules/aws/http-c2/README.md b/modules/aws/http-c2/README.md
index a7ed954..208c93b 100644
--- a/modules/aws/http-c2/README.md
+++ b/modules/aws/http-c2/README.md
@@ -21,7 +21,7 @@ module "http_c2" {
 |`subnet_id`                | Yes      | String     | Subnet ID to create instance in.
 |`count`                    | No       | Integer    | Number of instances to launch. Defaults to 1.
 |`instance_type`            | No       | String     | Instance type to launch. Defaults to "t2.medium"
-|`install`                  | No       | List       | Scripts to run on instance creation. Defaults to "./scripts/core_deps.sh".
+|`install`                  | No       | List       | Scripts to run on instance creation. Defaults to "./data/scripts/core_deps.sh".
 
 # Outputs
 
diff --git a/modules/aws/http-c2/main.tf b/modules/aws/http-c2/main.tf
index 49d8d1f..280a795 100644
--- a/modules/aws/http-c2/main.tf
+++ b/modules/aws/http-c2/main.tf
@@ -5,20 +5,20 @@ terraform {
 data "aws_region" "current" {}
 
 resource "random_id" "server" {
-  count = "${var.count}"
+  count = var.count_vm
   byte_length = 4
 }
 
 resource "tls_private_key" "ssh" {
-  count = "${var.count}"
+  count = var.count_vm
   algorithm = "RSA"
   rsa_bits = 4096
 }
 
 resource "aws_key_pair" "http-c2" {
-  count = "${var.count}"
+  count = var.count_vm
   key_name = "http-c2-key-${count.index}"
-  public_key = "${tls_private_key.ssh.*.public_key_openssh[count.index]}"
+  public_key = tls_private_key.ssh.*.public_key_openssh[count.index]
 }
 
 resource "aws_instance" "http-c2" {
@@ -28,26 +28,27 @@ resource "aws_instance" "http-c2" {
 
   //provider = "aws.${element(var.regions, count.index)}"
 
-  count = "${var.count}"
+  count = var.count_vm
   
   tags = {
     Name = "http-c2-${random_id.server.*.hex[count.index]}"
   }
 
-  ami = "${var.amis[data.aws_region.current.name]}"
-  instance_type = "${var.instance_type}"
-  key_name = "${aws_key_pair.http-c2.*.key_name[count.index]}"
+  ami = var.amis[data.aws_region.current.name]
+  instance_type = var.instance_type
+  key_name = aws_key_pair.http-c2.*.key_name[count.index]
   vpc_security_group_ids = ["${aws_security_group.http-c2.id}"]
-  subnet_id = "${var.subnet_id}"
+  subnet_id = var.subnet_id
   associate_public_ip_address = true
 
   provisioner "remote-exec" {
-    scripts = "${concat(list("./scripts/core_deps.sh"), var.install)}"
+    scripts = concat(list("./data/scripts/core_deps.sh"), var.install)
 
     connection {
+        host = self.public_ip
         type = "ssh"
         user = "admin"
-        private_key = "${tls_private_key.ssh.*.private_key_pem[count.index]}"
+        private_key = tls_private_key.ssh.*.private_key_pem[count.index]
     }
   }
 
@@ -56,26 +57,26 @@ resource "aws_instance" "http-c2" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_keys/${self.public_ip}*"
   }
 
 }
 
 resource "null_resource" "ansible_provisioner" {
-  count = "${signum(length(var.ansible_playbook)) == 1 ? var.count : 0}"
+  count = signum(length(var.ansible_playbook)) == 1 ? var.count_vm : 0
 
-  depends_on = ["aws_instance.http-c2"]
+  depends_on = [aws_instance.http-c2]
 
-  triggers {
-    droplet_creation = "${join("," , aws_instance.http-c2.*.id)}"
-    policy_sha1 = "${sha1(file(var.ansible_playbook))}"
+  triggers = {
+    droplet_creation = join("," , aws_instance.http-c2.*.id)
+    policy_sha1 = sha1(file(var.ansible_playbook))
   }
 
   provisioner "local-exec" {
     command = "ansible-playbook ${join(" ", compact(var.ansible_arguments))} --user=admin --private-key=./data/ssh_keys/${aws_instance.http-c2.*.public_ip[count.index]} -e host=${aws_instance.http-c2.*.public_ip[count.index]} ${var.ansible_playbook}"
 
-    environment {
+    environment = {
       ANSIBLE_HOST_KEY_CHECKING = "False"
     }
   }
@@ -87,15 +88,15 @@ resource "null_resource" "ansible_provisioner" {
 
 data "template_file" "ssh_config" {
 
-  count    = "${var.count}"
+  count    = var.count_vm
 
-  template = "${file("./data/templates/ssh_config.tpl")}"
+  template = file("./data/templates/ssh_config.tpl")
 
-  depends_on = ["aws_instance.http-c2"]
+  depends_on = [aws_instance.http-c2]
 
-  vars {
+  vars = {
     name = "dns_rdir_${aws_instance.http-c2.*.public_ip[count.index]}"
-    hostname = "${aws_instance.http-c2.*.public_ip[count.index]}"
+    hostname = aws_instance.http-c2.*.public_ip[count.index]
     user = "admin"
     identityfile = "${path.root}/data/ssh_keys/${aws_instance.http-c2.*.public_ip[count.index]}"
   }
@@ -104,10 +105,11 @@ data "template_file" "ssh_config" {
 
 resource "null_resource" "gen_ssh_config" {
 
-  count = "${var.count}"
+  count = var.count_vm
 
-  triggers {
-    template_rendered = "${data.template_file.ssh_config.*.rendered[count.index]}"
+  triggers = {
+    template_rendered = data.template_file.ssh_config.*.rendered[count.index]
+    server = random_id.server.*.hex[count.index]
   }
 
   provisioner "local-exec" {
@@ -115,8 +117,8 @@ resource "null_resource" "gen_ssh_config" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
-    command = "rm ./data/ssh_configs/config_${random_id.server.*.hex[count.index]}"
+    when = destroy
+    command = "rm ./data/ssh_configs/config_${self.triggers.server}"
   }
 
-}
\ No newline at end of file
+}
diff --git a/modules/aws/http-c2/security_group.tf b/modules/aws/http-c2/security_group.tf
index 78e3dbf..818e1cf 100644
--- a/modules/aws/http-c2/security_group.tf
+++ b/modules/aws/http-c2/security_group.tf
@@ -3,13 +3,13 @@ terraform {
 }
 
 data "external" "get_public_ip" {
-  program = ["bash", "./scripts/get_public_ip.sh" ]
+  program = ["bash", "./data/scripts/get_public_ip.sh" ]
 }
 
 resource "aws_security_group" "http-c2" {
   name = "http-c2"
   description = "Security group created by Red Baron"
-  vpc_id = "${var.vpc_id}"
+  vpc_id = var.vpc_id
 
   ingress {
     from_port = 22
diff --git a/modules/aws/http-c2/variables.tf b/modules/aws/http-c2/variables.tf
index 0e58c81..e89858a 100644
--- a/modules/aws/http-c2/variables.tf
+++ b/modules/aws/http-c2/variables.tf
@@ -2,7 +2,7 @@ variable "subnet_id" {}
 
 variable "vpc_id" {}
 
-variable "count" {
+variable "count_vm" {
   default = 1
 }
 
@@ -13,13 +13,13 @@ variable "ansible_playbook" {
 
 variable "ansible_arguments" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Additional Ansible Arguments"
 }
 
 variable "ansible_vars" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Environment variables"
 }
 
@@ -28,23 +28,23 @@ variable "instance_type" {
 }
 
 variable "install" {
-  type = "list"
+  type = list(string)
   default = []
 }
 
 /*
 variable "install" {
-  type = "map"
+  type = map(string)
   default = {
-    "empire" = "./scripts/install_empire.sh"
-    "metasploit" = "./scripts/install_metasploit.sh"
-    "cobaltstrike" = "./scripts/install_cobalt_strike.sh"
+    "empire" = "./data/scripts/install_empire.sh"
+    "metasploit" = "./data/scripts/install_metasploit.sh"
+    "cobaltstrike" = "./data/scripts/install_cobalt_strike.sh"
   }
 }
 */
 
 variable "amis" {
-  type = "map"
+  type = map(string)
   default = {
 
     // Taken from https://wiki.debian.org/Cloud/AmazonEC2Image/Stretch
diff --git a/modules/aws/http-rdir/main.tf b/modules/aws/http-rdir/main.tf
index 59aa211..6081081 100644
--- a/modules/aws/http-rdir/main.tf
+++ b/modules/aws/http-rdir/main.tf
@@ -5,20 +5,20 @@ terraform {
 data "aws_region" "current" {}
 
 resource "random_id" "server" {
-  count = "${var.count}"
+  count = var.count_vm
   byte_length = 4
 }
 
 resource "tls_private_key" "ssh" {
-  count = "${var.count}"
+  count = var.count_vm
   algorithm = "RSA"
   rsa_bits = 4096
 }
 
 resource "aws_key_pair" "http-rdir" {
-  count = "${var.count}"
+  count = var.count_vm
   key_name = "http-rdir-key-${count.index}"  
-  public_key = "${tls_private_key.ssh.*.public_key_openssh[count.index]}"
+  public_key = tls_private_key.ssh.*.public_key_openssh[count.index]
 }
 
 resource "aws_instance" "http-rdir" {
@@ -28,17 +28,17 @@ resource "aws_instance" "http-rdir" {
 
   //provider = "aws.${element(var.regions, count.index)}"
 
-  count = "${var.count}"
+  count = var.count_vm
   
   tags = {
     Name = "http-rdir-${random_id.server.*.hex[count.index]}"
   }
 
-  ami = "${var.amis[data.aws_region.current.name]}"
-  instance_type = "${var.instance_type}"
-  key_name = "${aws_key_pair.http-rdir.*.key_name[count.index]}"
+  ami = var.amis[data.aws_region.current.name]
+  instance_type = var.instance_type
+  key_name = aws_key_pair.http-rdir.*.key_name[count.index]
   vpc_security_group_ids = ["${aws_security_group.http-rdir.id}"]
-  subnet_id = "${var.subnet_id}"
+  subnet_id = var.subnet_id
   associate_public_ip_address = true
 
   provisioner "remote-exec" {
@@ -51,9 +51,10 @@ resource "aws_instance" "http-rdir" {
     ]
 
     connection {
+        host = self.public_ip
         type = "ssh"
         user = "admin"
-        private_key = "${tls_private_key.ssh.*.private_key_pem[count.index]}"
+        private_key = tls_private_key.ssh.*.private_key_pem[count.index]
     }
   }
 
@@ -62,26 +63,26 @@ resource "aws_instance" "http-rdir" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_keys/${self.public_ip}*"
   }
 
 }
 
 resource "null_resource" "ansible_provisioner" {
-  count = "${signum(length(var.ansible_playbook)) == 1 ? var.count : 0}"
+  count = signum(length(var.ansible_playbook)) == 1 ? var.count_vm : 0
 
-  depends_on = ["aws_instance.http-rdir"]
+  depends_on = [aws_instance.http-rdir]
 
-  triggers {
-    droplet_creation = "${join("," , aws_instance.http-rdir.*.id)}"
-    policy_sha1 = "${sha1(file(var.ansible_playbook))}"
+  triggers = {
+    droplet_creation = join("," , aws_instance.http-rdir.*.id)
+    policy_sha1 = sha1(file(var.ansible_playbook))
   }
 
   provisioner "local-exec" {
     command = "ansible-playbook ${join(" ", compact(var.ansible_arguments))} --user=admin --private-key=./data/ssh_keys/${aws_instance.http-rdir.*.public_ip[count.index]} -e host=${aws_instance.http-rdir.*.public_ip[count.index]} ${var.ansible_playbook}"
 
-    environment {
+    environment = {
       ANSIBLE_HOST_KEY_CHECKING = "False"
     }
   }
@@ -93,15 +94,15 @@ resource "null_resource" "ansible_provisioner" {
 
 data "template_file" "ssh_config" {
 
-  count    = "${var.count}"
+  count    = var.count_vm
 
-  template = "${file("./data/templates/ssh_config.tpl")}"
+  template = file("./data/templates/ssh_config.tpl")
 
-  depends_on = ["aws_instance.http-rdir"]
+  depends_on = [aws_instance.http-rdir]
 
-  vars {
+  vars = {
     name = "dns_rdir_${aws_instance.http-rdir.*.public_ip[count.index]}"
-    hostname = "${aws_instance.http-rdir.*.public_ip[count.index]}"
+    hostname = aws_instance.http-rdir.*.public_ip[count.index]
     user = "admin"
     identityfile = "${path.root}/data/ssh_keys/${aws_instance.http-rdir.*.public_ip[count.index]}"
   }
@@ -110,10 +111,11 @@ data "template_file" "ssh_config" {
 
 resource "null_resource" "gen_ssh_config" {
 
-  count = "${var.count}"
+  count = var.count_vm
 
-  triggers {
-    template_rendered = "${data.template_file.ssh_config.*.rendered[count.index]}"
+  triggers = {
+    template_rendered = data.template_file.ssh_config.*.rendered[count.index]
+    server = random_id.server.*.hex[count.index]
   }
 
   provisioner "local-exec" {
@@ -121,8 +123,8 @@ resource "null_resource" "gen_ssh_config" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
-    command = "rm ./data/ssh_configs/config_${random_id.server.*.hex[count.index]}"
+    when = destroy
+    command = "rm ./data/ssh_configs/config_${self.triggers.server}"
   }
 
-}
\ No newline at end of file
+}
diff --git a/modules/aws/http-rdir/security_group.tf b/modules/aws/http-rdir/security_group.tf
index 68ce3d5..f0ebb58 100644
--- a/modules/aws/http-rdir/security_group.tf
+++ b/modules/aws/http-rdir/security_group.tf
@@ -3,13 +3,13 @@ terraform {
 }
 
 data "external" "get_public_ip" {
-  program = ["bash", "./scripts/get_public_ip.sh" ]
+  program = ["bash", "./data/scripts/get_public_ip.sh" ]
 }
 
 resource "aws_security_group" "http-rdir" {
   name = "http-rdir"
   description = "Security group created by Red Baron"
-  vpc_id = "${var.vpc_id}"
+  vpc_id = var.vpc_id
 
   ingress {
     from_port = 22
diff --git a/modules/aws/http-rdir/variables.tf b/modules/aws/http-rdir/variables.tf
index 48bbaa8..efc3473 100644
--- a/modules/aws/http-rdir/variables.tf
+++ b/modules/aws/http-rdir/variables.tf
@@ -3,7 +3,7 @@ variable "subnet_id" {}
 variable "vpc_id" {}
 
 variable "redirect_to" {
-  type = "list"
+  type = list(string)
 }
 
 variable "ansible_playbook" {
@@ -13,17 +13,17 @@ variable "ansible_playbook" {
 
 variable "ansible_arguments" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Additional Ansible Arguments"
 }
 
 variable "ansible_vars" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Environment variables"
 }
 
-variable "count" {
+variable "count_vm" {
   default = 1
 }
 
@@ -33,17 +33,17 @@ variable "instance_type" {
 
 /*
 variable "install" {
-  type = "map"
+  type = map(string)
   default = {
-    "empire" = "./scripts/install_empire.sh"
-    "metasploit" = "./scripts/install_metasploit.sh"
-    "cobaltstrike" = "./scripts/install_cobalt_strike.sh"
+    "empire" = "./data/scripts/install_empire.sh"
+    "metasploit" = "./data/scripts/install_metasploit.sh"
+    "cobaltstrike" = "./data/scripts/install_cobalt_strike.sh"
   }
 }
 */
 
 variable "amis" {
-  type = "map"
+  type = map(string)
   default = {
 
     // Taken from https://wiki.debian.org/Cloud/AmazonEC2Image/Stretch
diff --git a/modules/aws/phishing-server/main.tf b/modules/aws/phishing-server/main.tf
index e8c6a4e..83eb384 100644
--- a/modules/aws/phishing-server/main.tf
+++ b/modules/aws/phishing-server/main.tf
@@ -5,20 +5,20 @@ terraform {
 data "aws_region" "current" {}
 
 resource "random_id" "server" {
-  count = "${var.count}"
+  count = var.count_vm
   byte_length = 4
 }
 
 resource "tls_private_key" "ssh" {
-  count = "${var.count}"
+  count = var.count_vm
   algorithm = "RSA"
   rsa_bits = 4096
 }
 
 resource "aws_key_pair" "phishing-server" {
-  count = "${var.count}"
+  count = var.count_vm
   key_name = "phishing-server-key-${count.index}"
-  public_key = "${tls_private_key.ssh.*.public_key_openssh[count.index]}"
+  public_key = tls_private_key.ssh.*.public_key_openssh[count.index]
 }
 
 resource "aws_instance" "phishing-server" {
@@ -28,17 +28,17 @@ resource "aws_instance" "phishing-server" {
 
   //provider = "aws.${element(var.regions, count.index)}"
 
-  count = "${var.count}"
+  count = var.count_vm
   
   tags = {
     Name = "phishing-server-${random_id.server.*.hex[count.index]}"
   }
 
-  ami = "${var.amis[data.aws_region.current.name]}"
-  instance_type = "${var.instance_type}"
-  key_name = "${aws_key_pair.phishing-server.*.key_name[count.index]}"
+  ami = var.amis[data.aws_region.current.name]
+  instance_type = var.instance_type
+  key_name = aws_key_pair.phishing-server.*.key_name[count.index]
   vpc_security_group_ids = ["${aws_security_group.phishing-server.id}"]
-  subnet_id = "${var.subnet_id}"
+  subnet_id = var.subnet_id
   associate_public_ip_address = true
 
   provisioner "remote-exec" {
@@ -52,7 +52,7 @@ resource "aws_instance" "phishing-server" {
     connection {
         type = "ssh"
         user = "admin"
-        private_key = "${tls_private_key.ssh.*.private_key_pem[count.index]}"
+        private_key = tls_private_key.ssh.*.private_key_pem[count.index]
     }
   }
 
@@ -61,26 +61,26 @@ resource "aws_instance" "phishing-server" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_keys/${self.public_ip}*"
   }
 
 }
 
 resource "null_resource" "ansible_provisioner" {
-  count = "${signum(length(var.ansible_playbook)) == 1 ? var.count : 0}"
+  count = signum(length(var.ansible_playbook)) == 1 ? var.count_vm : 0
 
-  depends_on = ["aws_instance.phishing-server"]
+  depends_on = [aws_instance.phishing-server]
 
-  triggers {
-    droplet_creation = "${join("," , aws_instance.phishing-server.*.id)}"
-    policy_sha1 = "${sha1(file(var.ansible_playbook))}"
+  triggers = {
+    droplet_creation = join("," , aws_instance.phishing-server.*.id)
+    policy_sha1 = sha1(file(var.ansible_playbook))
   }
 
   provisioner "local-exec" {
     command = "ansible-playbook ${join(" ", compact(var.ansible_arguments))} --user=admin --private-key=./data/ssh_keys/${aws_instance.phishing-server.*.public_ip[count.index]} -e host=${aws_instance.phishing-server.*.public_ip[count.index]} ${var.ansible_playbook}"
 
-    environment {
+    environment = {
       ANSIBLE_HOST_KEY_CHECKING = "False"
     }
   }
@@ -92,27 +92,27 @@ resource "null_resource" "ansible_provisioner" {
 
 data "template_file" "ssh_config" {
 
-  count    = "${var.count}"
+  count    = var.count_vm
 
-  template = "${file("./data/templates/ssh_config.tpl")}"
+  template = file("./data/templates/ssh_config.tpl")
 
-  depends_on = ["aws_instance.phishing-server"]
+  depends_on = [aws_instance.phishing-server]
 
-  vars {
+  vars = {
     name = "dns_rdir_${aws_instance.phishing-server.*.public_ip[count.index]}"
-    hostname = "${aws_instance.phishing-server.*.public_ip[count.index]}"
+    hostname = aws_instance.phishing-server.*.public_ip[count.index]
     user = "admin"
-    identityfile = "${path.root}/data/ssh_keys/${aws_instance.phishing-server.*.public_ip[count.index]}"
+    identityfile = path.root}/data/ssh_keys/${aws_instance.phishing-server.*.public_ip[count.index]
   }
 
 }
 
 resource "null_resource" "gen_ssh_config" {
 
-  count = "${var.count}"
+  count = var.count_vm
 
-  triggers {
-    template_rendered = "${data.template_file.ssh_config.*.rendered[count.index]}"
+  triggers = {
+    template_rendered = data.template_file.ssh_config.*.rendered[count.index]
   }
 
   provisioner "local-exec" {
@@ -120,7 +120,7 @@ resource "null_resource" "gen_ssh_config" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_configs/config_${random_id.server.*.hex[count.index]}"
   }
 
diff --git a/modules/aws/phishing-server/security_group.tf b/modules/aws/phishing-server/security_group.tf
index 97edcc0..d8199c1 100644
--- a/modules/aws/phishing-server/security_group.tf
+++ b/modules/aws/phishing-server/security_group.tf
@@ -3,13 +3,13 @@ terraform {
 }
 
 data "external" "get_public_ip" {
-  program = ["bash", "./scripts/get_public_ip.sh" ]
+  program = ["bash", "./data/scripts/get_public_ip.sh" ]
 }
 
 resource "aws_security_group" "phishing-server" {
   name = "phishing-server"
   description = "Security group created by Red Baron"
-  vpc_id = "${var.vpc_id}"
+  vpc_id = var.vpc_id
 
   ingress {
     from_port = 22
diff --git a/modules/aws/phishing-server/variables.tf b/modules/aws/phishing-server/variables.tf
index cbe587b..db876f3 100644
--- a/modules/aws/phishing-server/variables.tf
+++ b/modules/aws/phishing-server/variables.tf
@@ -2,7 +2,7 @@ variable "subnet_id" {}
 
 variable "vpc_id" {}
 
-variable "count" {
+variable "count_vm" {
   default = 1
 }
 
@@ -13,13 +13,13 @@ variable "ansible_playbook" {
 
 variable "ansible_arguments" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Additional Ansible Arguments"
 }
 
 variable "ansible_vars" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Environment variables"
 }
 
@@ -29,17 +29,17 @@ variable "instance_type" {
 
 /*
 variable "install" {
-  type = "map"
+  type = map(string)
   default = {
-    "empire" = "./scripts/install_empire.sh"
-    "metasploit" = "./scripts/install_metasploit.sh"
-    "cobaltstrike" = "./scripts/install_cobalt_strike.sh"
+    "empire" = "./data/scripts/install_empire.sh"
+    "metasploit" = "./data/scripts/install_metasploit.sh"
+    "cobaltstrike" = "./data/scripts/install_cobalt_strike.sh"
   }
 }
 */
 
 variable "amis" {
-  type = "map"
+  type = map(string)
   default = {
 
     // Taken from https://wiki.debian.org/Cloud/AmazonEC2Image/Stretch
diff --git a/modules/aws/smtp/README.md b/modules/aws/smtp/README.md
index 69c98c4..2635f26 100644
--- a/modules/aws/smtp/README.md
+++ b/modules/aws/smtp/README.md
@@ -14,7 +14,7 @@ module "mail" {
     source = "./modules/aws/smtp"
     domain = "example.com"
     mx_subdomain = "mail"
-    zone_id = "${module.zone.zone_id}"
+    zone_id = module.zone.zone_id
 }
 
 output "smtp_name_servers" {
@@ -22,15 +22,15 @@ output "smtp_name_servers" {
 }
 
 output "smtp_server" {
-    value = "${module.smtp.smtp_server}"
+    value = module.smtp.smtp_server
 }
 
 output "smtp_user" {
-    value = "${module.smtp.smtp_username}"
+    value = module.smtp.smtp_username
 }
 
 output "smtp_password" {
-    value = "${module.smtp.smtp_password}"
+    value = module.smtp.smtp_password
 }
 ```
 
diff --git a/modules/aws/smtp/main.tf b/modules/aws/smtp/main.tf
index a541fd3..73983b5 100644
--- a/modules/aws/smtp/main.tf
+++ b/modules/aws/smtp/main.tf
@@ -3,7 +3,7 @@ data "aws_region" "current" {}
 # Random ID generator
 resource "random_id" "username" {
   keepers = {
-    zone_id = "${var.zone_id}"
+    zone_id = var.zone_id
   }
 
   byte_length = 6
@@ -17,7 +17,7 @@ resource "aws_iam_user" "smtp_user" {
 # IAM policy to send emails via SMTP through SES
 resource "aws_iam_user_policy" "smtp_policy" {
   name = "${aws_iam_user.smtp_user.name}-policy"
-  user = "${aws_iam_user.smtp_user.name}"
+  user = aws_iam_user.smtp_user.name
 
   policy = <<EOF
 {
@@ -43,28 +43,28 @@ EOF
 
 # IAM access key for SES SMTP user
 resource "aws_iam_access_key" "smtp_access_key" {
-  user = "${aws_iam_user.smtp_user.name}"
+  user = aws_iam_user.smtp_user.name
 }
 
 # SES domain Identity
 resource "aws_ses_domain_identity" "identity" {
-  domain = "${var.domain}"
+  domain = var.domain
 }
 
 # SES domain DKIM
 resource "aws_ses_domain_dkim" "dkim" {
-  domain = "${aws_ses_domain_identity.identity.domain}"
+  domain = aws_ses_domain_identity.identity.domain
 }
 
 # SES domain mail sender
 resource "aws_ses_domain_mail_from" "mail_from" {
-  domain           = "${aws_ses_domain_identity.identity.domain}"
-  mail_from_domain = "${var.mx_subdomain}.${aws_ses_domain_identity.identity.domain}"
+  domain           = aws_ses_domain_identity.identity.domain
+  mail_from_domain = var.mx_subdomain}.${aws_ses_domain_identity.identity.domain
 }
 
 # Route53 TXT record for SES validation
 resource "aws_route53_record" "ses_txt_record" {
-  zone_id = "${var.zone_id}"
+  zone_id = var.zone_id
   name    = "_amazonses.${aws_ses_domain_identity.identity.domain}"
   type    = "TXT"
   ttl     = "600"
@@ -73,8 +73,8 @@ resource "aws_route53_record" "ses_txt_record" {
 
 # Route53 MX record
 resource "aws_route53_record" "mx_record" {
-  zone_id = "${var.zone_id}"
-  name    = "${aws_ses_domain_mail_from.mail_from.mail_from_domain}"
+  zone_id = var.zone_id
+  name    = aws_ses_domain_mail_from.mail_from.mail_from_domain
   type    = "MX"
   ttl     = "600"
   records = ["10 feedback-smtp.${data.aws_region.current.name}.amazonses.com"]
@@ -82,8 +82,8 @@ resource "aws_route53_record" "mx_record" {
 
 # Route53 TXT record for SPF
 resource "aws_route53_record" "spf_record" {
-  zone_id = "${var.zone_id}"
-  name    = "${aws_ses_domain_mail_from.mail_from.mail_from_domain}"
+  zone_id = var.zone_id
+  name    = aws_ses_domain_mail_from.mail_from.mail_from_domain
   type    = "TXT"
   ttl     = "600"
   records = ["v=spf1 include:amazonses.com -all"]
@@ -92,8 +92,8 @@ resource "aws_route53_record" "spf_record" {
 # Route53 CNAME records for DKIM
 resource "aws_route53_record" "dkim_record" {
   count   = 3
-  zone_id = "${var.zone_id}"
-  name    = "${element(aws_ses_domain_dkim.dkim.dkim_tokens, count.index)}._domainkey.${aws_ses_domain_identity.identity.domain}"
+  zone_id = var.zone_id
+  name    = element(aws_ses_domain_dkim.dkim.dkim_tokens, count.index)}._domainkey.${aws_ses_domain_identity.identity.domain
   type    = "CNAME"
   ttl     = "600"
   records = ["${element(aws_ses_domain_dkim.dkim.dkim_tokens, count.index)}.dkim.amazonses.com"]
diff --git a/modules/aws/smtp/outputs.tf b/modules/aws/smtp/outputs.tf
index 1375187..98dfdbd 100644
--- a/modules/aws/smtp/outputs.tf
+++ b/modules/aws/smtp/outputs.tf
@@ -3,9 +3,9 @@ output "smtp_server" {
 }
 
 output "smtp_username" {
-  value = "${aws_iam_access_key.smtp_access_key.id}"
+  value = aws_iam_access_key.smtp_access_key.id
 }
 
 output "smtp_password" {
-  value = "${aws_iam_access_key.smtp_access_key.ses_smtp_password}"
+  value = aws_iam_access_key.smtp_access_key.ses_smtp_password
 }
diff --git a/modules/azure/create-resource-group/main.tf b/modules/azure/create-resource-group/main.tf
index 77b3df2..d75d276 100644
--- a/modules/azure/create-resource-group/main.tf
+++ b/modules/azure/create-resource-group/main.tf
@@ -5,7 +5,7 @@ resource "random_id" "rand" {
 }
 
 resource "azurerm_resource_group" "rg" {
-  count    = "${var.count}"
-  location = "${element(var.locations, count.index)}"
-  name     = "${var.resource_group_name}-${count.index}-${random_id.rand.hex}"
+  count    = var.count_vm
+  location = element(var.locations, count.index)
+  name     = var.resource_group_name}-${count.index}-${random_id.rand.hex
 }
diff --git a/modules/azure/create-resource-group/outputs.tf b/modules/azure/create-resource-group/outputs.tf
index c466555..39b94df 100644
--- a/modules/azure/create-resource-group/outputs.tf
+++ b/modules/azure/create-resource-group/outputs.tf
@@ -1,7 +1,7 @@
 output "resource_group_names" {
-  value = "${azurerm_resource_group.rg.*.name}"
+  value = azurerm_resource_group.rg.*.name
 }
 
 output "locations" {
-  value = "${azurerm_resource_group.rg.*.location}"
+  value = azurerm_resource_group.rg.*.location
 }
diff --git a/modules/azure/create-resource-group/variables.tf b/modules/azure/create-resource-group/variables.tf
index 8d76392..874d717 100644
--- a/modules/azure/create-resource-group/variables.tf
+++ b/modules/azure/create-resource-group/variables.tf
@@ -1,4 +1,4 @@
-variable "count" {
+variable "count_vm" {
   default = 1
 }
 
@@ -8,6 +8,6 @@ variable "resource_group_name" {
 }
 
 variable "locations" {
-  type    = "list"
+  type    = list(string)
   default = ["eastus2"]
 }
diff --git a/modules/azure/create-storage-account/main.tf b/modules/azure/create-storage-account/main.tf
index 5faff1c..115928a 100644
--- a/modules/azure/create-storage-account/main.tf
+++ b/modules/azure/create-storage-account/main.tf
@@ -1,25 +1,25 @@
 resource "random_id" "rand" {
   keepers = {
     # Generate a new ID only when a new resource group is defined
-    storage_account = "${var.resource_group_names[count.index]}"
+    storage_account = var.resource_group_names[count.index]
   }
 
   byte_length = 6
 }
 
 resource "azurerm_storage_account" "sa" {
-  count                    = "${var.count}"
+  count                    = var.count_vm
   name                     = "redbaron${count.index}${random_id.rand.hex}"
-  resource_group_name      = "${var.resource_group_names[count.index]}"
-  location                 = "${var.locations[count.index]}"
+  resource_group_name      = var.resource_group_names[count.index]
+  location                 = var.locations[count.index]
   account_tier             = "Standard"
   account_replication_type = "LRS"
 }
 
 resource "azurerm_storage_container" "sc" {
-  count                 = "${var.count}"
+  count                 = var.count_vm
   name                  = "vhds"
-  storage_account_name  = "${element(azurerm_storage_account.sa.*.name, count.index)}"
-  resource_group_name   = "${var.resource_group_names[count.index]}"
+  storage_account_name  = element(azurerm_storage_account.sa.*.name, count.index)
+  resource_group_name   = var.resource_group_names[count.index]
   container_access_type = "private"
 }
diff --git a/modules/azure/create-storage-account/outputs.tf b/modules/azure/create-storage-account/outputs.tf
index 15b114a..de9efa1 100644
--- a/modules/azure/create-storage-account/outputs.tf
+++ b/modules/azure/create-storage-account/outputs.tf
@@ -1,7 +1,7 @@
 output "primary_blob_endpoints" {
-  value = "${azurerm_storage_account.sa.*.primary_blob_endpoint}"
+  value = azurerm_storage_account.sa.*.primary_blob_endpoint
 }
 
 output "storage_container_names" {
-  value = "${azurerm_storage_container.sc.*.name}"
+  value = azurerm_storage_container.sc.*.name
 }
diff --git a/modules/azure/create-storage-account/variables.tf b/modules/azure/create-storage-account/variables.tf
index 248d133..85da266 100644
--- a/modules/azure/create-storage-account/variables.tf
+++ b/modules/azure/create-storage-account/variables.tf
@@ -1,12 +1,12 @@
-variable "count" {
+variable "count_vm" {
   default = 1
 }
 
 variable "resource_group_names" {
-  type = "list"
+  type = list(string)
 }
 
 variable "locations" {
-  type    = "list"
+  type    = list(string)
   default = ["eastus2"]
 }
diff --git a/modules/azure/dns-c2/README.md b/modules/azure/dns-c2/README.md
index 282548c..2e0a5f0 100644
--- a/modules/azure/dns-c2/README.md
+++ b/modules/azure/dns-c2/README.md
@@ -22,7 +22,7 @@ module "dns_c2" {
 |`storage_container_names`  | Yes      | List       | Names of the Storage Containers for VM hard drives
 |`primary_blob_endpoints`   | Yes      | List       | Names of the Storage Endpoints for VM hard drives
 |`size`                     | No       | String     | VM size to launch. Defaults to `Standard_D2`.
-|`install`                  | No       | List       | Scripts to run on VM creation. Defaults to "./scripts/core_deps.sh".
+|`install`                  | No       | List       | Scripts to run on VM creation. Defaults to "./data/scripts/core_deps.sh".
 |`locations`                | No       | List       | Locations to create VM(s) in. Defaults to `eastus2`. A list of available locations can be found on the [Azure Website](https://azure.microsoft.com/en-us/global-infrastructure/services/).
 |`username`                 | No       | String     | Name of the user account to create. Defaults to `c2user`.
 
diff --git a/modules/azure/dns-c2/main.tf b/modules/azure/dns-c2/main.tf
index e11eac3..ab53c9e 100644
--- a/modules/azure/dns-c2/main.tf
+++ b/modules/azure/dns-c2/main.tf
@@ -1,57 +1,57 @@
 provider "azure" {}
 
 resource "tls_private_key" "ssh" {
-  count     = "${var.count}"
+  count     = var.count_vm
   algorithm = "RSA"
   rsa_bits  = 4096
 }
 
 resource "azurerm_virtual_network" "vnet" {
-  count               = "${var.count}"
+  count               = var.count_vm
   name                = "dns-c2-vnet"
   address_space       = ["10.0.0.0/8"]
-  location            = "${var.locations[count.index]}"
-  resource_group_name = "${var.resource_group_names[count.index]}"
+  location            = var.locations[count.index]
+  resource_group_name = var.resource_group_names[count.index]
 }
 
 resource "azurerm_subnet" "subnet" {
-  count                = "${var.count}"
+  count                = var.count_vm
   name                 = "subnet01"
-  resource_group_name  = "${var.resource_group_names[count.index]}"
-  virtual_network_name = "${element(azurerm_virtual_network.vnet.*.name, count.index)}"
+  resource_group_name  = var.resource_group_names[count.index]
+  virtual_network_name = element(azurerm_virtual_network.vnet.*.name, count.index)
   address_prefix       = "10.1.0.0/24"
 }
 
 resource "azurerm_public_ip" "pip" {
-  count                        = "${var.count}"
+  count                        = var.count_vm
   name                         = "dns-c2-pip-${count.index}"
-  location                     = "${var.locations[count.index]}"
-  resource_group_name          = "${var.resource_group_names[count.index]}"
+  location                     = var.locations[count.index]
+  resource_group_name          = var.resource_group_names[count.index]
   public_ip_address_allocation = "static"
 }
 
 resource "azurerm_network_interface" "nic" {
-  count                     = "${var.count}"
+  count                     = var.count_vm
   name                      = "dns-c2-nic-${count.index}"
-  location                  = "${var.locations[count.index]}"
-  resource_group_name       = "${var.resource_group_names[count.index]}"
-  network_security_group_id = "${element(azurerm_network_security_group.nsg.*.id, count.index)}"
+  location                  = var.locations[count.index]
+  resource_group_name       = var.resource_group_names[count.index]
+  network_security_group_id = element(azurerm_network_security_group.nsg.*.id, count.index)
 
   ip_configuration {
     name                          = "dns-c2-nic-config"
-    subnet_id                     = "${element(azurerm_subnet.subnet.*.id, count.index)}"
+    subnet_id                     = element(azurerm_subnet.subnet.*.id, count.index)
     private_ip_address_allocation = "dynamic"
-    public_ip_address_id          = "${element(azurerm_public_ip.pip.*.id, count.index )}"
+    public_ip_address_id          = element(azurerm_public_ip.pip.*.id, count.index )
   }
 }
 
 resource "azurerm_virtual_machine" "dns-c2" {
-  count                 = "${var.count}"
+  count                 = var.count_vm
   name                  = "dns-c2-${count.index}"
-  location              = "${var.locations[count.index]}"
-  resource_group_name   = "${var.resource_group_names[count.index]}"
+  location              = var.locations[count.index]
+  resource_group_name   = var.resource_group_names[count.index]
   network_interface_ids = ["${element(azurerm_network_interface.nic.*.id, count.index)}"]
-  vm_size               = "${var.size}"
+  vm_size               = var.size
 
   delete_os_disk_on_termination    = true
   delete_data_disks_on_termination = true
@@ -65,7 +65,7 @@ resource "azurerm_virtual_machine" "dns-c2" {
   }
 
   storage_os_disk {
-    count         = "${var.count}"
+    count         = var.count_vm
     name          = "dns-c2-${count.index}-os"
     vhd_uri       = "${var.primary_blob_endpoints[count.index]}${var.storage_container_name[count.index]}/dns-c2-${count.index}-os.vhd"
     caching       = "ReadWrite"
@@ -74,7 +74,7 @@ resource "azurerm_virtual_machine" "dns-c2" {
 
   os_profile {
     computer_name  = "dns-c2-${count.index}"
-    admin_username = "${var.username}"
+    admin_username = var.username
   }
 
   os_profile_linux_config {
@@ -82,18 +82,18 @@ resource "azurerm_virtual_machine" "dns-c2" {
 
     ssh_keys {
       path     = "/home/${var.username}/.ssh/authorized_keys"
-      key_data = "${tls_private_key.ssh.*.public_key_openssh[count.index]}"
+      key_data = tls_private_key.ssh.*.public_key_openssh[count.index]
     }
   }
 
   provisioner "remote-exec" {
-    scripts = "${concat(list("./scripts/core_deps.sh"), var.install)}"
+    scripts = concat(list("./data/scripts/core_deps.sh"), var.install)
 
     connection {
       type        = "ssh"
-      host        = "${element(azurerm_public_ip.pip.*.ip_address, count.index )}"
-      user        = "${var.username}"
-      private_key = "${tls_private_key.ssh.*.private_key_pem[count.index]}"
+      host        = element(azurerm_public_ip.pip.*.ip_address, count.index )
+      user        = var.username
+      private_key = tls_private_key.ssh.*.private_key_pem[count.index]
     }
   }
 
@@ -108,19 +108,19 @@ resource "azurerm_virtual_machine" "dns-c2" {
 }
 
 resource "null_resource" "ansible_provisioner" {
-  count = "${signum(length(var.ansible_playbook)) == 1 ? var.count : 0}"
+  count = signum(length(var.ansible_playbook)) == 1 ? var.count_vm : 0
 
-  depends_on = ["azurerm_virtual_machine.dns-c2"]
+  depends_on = [azurerm_virtual_machine.dns-c2]
 
-  triggers {
-    droplet_creation = "${join("," , azurerm_virtual_machine.dns-c2.*.id)}"
-    policy_sha1 = "${sha1(file(var.ansible_playbook))}"
+  triggers = {
+    droplet_creation = join("," , azurerm_virtual_machine.dns-c2.*.id)
+    policy_sha1 = sha1(file(var.ansible_playbook))
   }
 
   provisioner "local-exec" {
     command = "ansible-playbook ${join(" ", compact(var.ansible_arguments))} --user=${var.username} --private-key=./data/ssh_keys/${element(azurerm_public_ip.pip.*.ip_address, count.index)} -e host=${element(azurerm_public_ip.pip.*.ip_address, count.index)} ${var.ansible_playbook}"
 
-    environment {
+    environment = {
       ANSIBLE_HOST_KEY_CHECKING = "False"
     }
   }
@@ -132,27 +132,27 @@ resource "null_resource" "ansible_provisioner" {
 
 data "template_file" "ssh_config" {
 
-  count    = "${var.count}"
+  count    = var.count_vm
 
-  template = "${file("./data/templates/ssh_config.tpl")}"
+  template = file("./data/templates/ssh_config.tpl")
 
-  depends_on = ["azurerm_virtual_machine.dns-c2"]
+  depends_on = [azurerm_virtual_machine.dns-c2]
 
-  vars {
+  vars = {
     name = "dns_c2_${element(azurerm_public_ip.pip.*.ip_address, count.index)}"
-    hostname = "${element(azurerm_public_ip.pip.*.ip_address, count.index)}"
-    user = "${var.username}"
-    identityfile = "${path.root}/data/ssh_keys/${element(azurerm_public_ip.pip.*.ip_address, count.index)}"
+    hostname = element(azurerm_public_ip.pip.*.ip_address, count.index)
+    user = var.username
+    identityfile = path.root}/data/ssh_keys/${element(azurerm_public_ip.pip.*.ip_address, count.index)
   }
 
 }
 
 resource "null_resource" "gen_ssh_config" {
 
-  count = "${var.count}"
+  count = var.count_vm
 
-  triggers {
-    template_rendered = "${data.template_file.ssh_config.*.rendered[count.index]}"
+  triggers = {
+    template_rendered = data.template_file.ssh_config.*.rendered[count.index]
   }
 
   provisioner "local-exec" {
@@ -160,7 +160,7 @@ resource "null_resource" "gen_ssh_config" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_configs/config_${random_id.server.*.hex[count.index]}"
   }
 
diff --git a/modules/azure/dns-c2/network-security-group.tf b/modules/azure/dns-c2/network-security-group.tf
index bb83e76..184ad88 100644
--- a/modules/azure/dns-c2/network-security-group.tf
+++ b/modules/azure/dns-c2/network-security-group.tf
@@ -1,8 +1,8 @@
 resource "azurerm_network_security_group" "nsg" {
-  count               = "${var.count}"
+  count               = var.count_vm
   name                = "dns-c2-${count.index}-nsg"
-  location            = "${var.locations[count.index]}"
-  resource_group_name = "${var.resource_group_names[count.index]}"
+  location            = var.locations[count.index]
+  resource_group_name = var.resource_group_names[count.index]
 
   security_rule {
     name                       = "SSH-In"
diff --git a/modules/azure/dns-c2/outputs.tf b/modules/azure/dns-c2/outputs.tf
index 3e3efc6..895ecaa 100644
--- a/modules/azure/dns-c2/outputs.tf
+++ b/modules/azure/dns-c2/outputs.tf
@@ -3,5 +3,5 @@ output "ips" {
 }
 
 output "ssh_user" {
-  value = "${var.username}"
+  value = var.username
 }
\ No newline at end of file
diff --git a/modules/azure/dns-c2/variables.tf b/modules/azure/dns-c2/variables.tf
index 5519d00..2956319 100644
--- a/modules/azure/dns-c2/variables.tf
+++ b/modules/azure/dns-c2/variables.tf
@@ -1,21 +1,21 @@
 variable "resource_group_names" {
-  type = "list"
+  type = list(string)
 }
 
 variable "primary_blob_endpoints" {
-  type = "list"
+  type = list(string)
 }
 
 variable "storage_container_names" {
-  type = "list"
+  type = list(string)
 }
 
 variable "locations" {
-  type    = "list"
+  type    = list(string)
   default = ["eastus2"]
 }
 
-variable "count" {
+variable "count_vm" {
   default = 1
 }
 
@@ -26,13 +26,13 @@ variable "ansible_playbook" {
 
 variable "ansible_arguments" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Additional Ansible Arguments"
 }
 
 variable "ansible_vars" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Environment variables"
 }
 
@@ -45,6 +45,6 @@ variable "size" {
 }
 
 variable "install" {
-  type    = "list"
+  type    = list(string)
   default = []
 }
diff --git a/modules/azure/dns-rdir/README.md b/modules/azure/dns-rdir/README.md
index 401007d..a683d47 100644
--- a/modules/azure/dns-rdir/README.md
+++ b/modules/azure/dns-rdir/README.md
@@ -24,7 +24,7 @@ module "dns_rdir" {
 |`storage_container_names`  | Yes      | List       | Names of the Storage Containers for VM hard drives
 |`primary_blob_endpoints`   | Yes      | List       | Names of the Storage Endpoints for VM hard drives
 |`size`                     | No       | String     | VM size to launch. Defaults to `Standard_D2`.
-|`install`                  | No       | List       | Scripts to run on VM creation. Defaults to "./scripts/core_deps.sh".
+|`install`                  | No       | List       | Scripts to run on VM creation. Defaults to "./data/scripts/core_deps.sh".
 |`locations`                | No       | List       | Locations to create VM(s) in. Defaults to `eastus2`. A list of available locations can be found on the [Azure Website](https://azure.microsoft.com/en-us/global-infrastructure/services/).
 |`username`                 | No       | String     | Name of the user account to create. Defaults to `c2user`.
 
diff --git a/modules/azure/dns-rdir/main.tf b/modules/azure/dns-rdir/main.tf
index 8b3792c..6a0d421 100644
--- a/modules/azure/dns-rdir/main.tf
+++ b/modules/azure/dns-rdir/main.tf
@@ -1,57 +1,57 @@
 provider "azure" {}
 
 resource "tls_private_key" "ssh" {
-  count     = "${var.count}"
+  count     = var.count_vm
   algorithm = "RSA"
   rsa_bits  = 4096
 }
 
 resource "azurerm_virtual_network" "vnet" {
-  count               = "${var.count}"
+  count               = var.count_vm
   name                = "dns-rdir-vnet"
   address_space       = ["10.0.0.0/8"]
-  location            = "${var.locations[count.index]}"
-  resource_group_name = "${var.resource_group_names[count.index]}"
+  location            = var.locations[count.index]
+  resource_group_name = var.resource_group_names[count.index]
 }
 
 resource "azurerm_subnet" "subnet" {
-  count                = "${var.count}"
+  count                = var.count_vm
   name                 = "subnet01"
-  resource_group_name  = "${var.resource_group_names[count.index]}"
-  virtual_network_name = "${element(azurerm_virtual_network.vnet.*.name, count.index)}"
+  resource_group_name  = var.resource_group_names[count.index]
+  virtual_network_name = element(azurerm_virtual_network.vnet.*.name, count.index)
   address_prefix       = "10.1.0.0/24"
 }
 
 resource "azurerm_public_ip" "pip" {
-  count                        = "${var.count}"
+  count                        = var.count_vm
   name                         = "dns-rdir-pip-${count.index}"
-  location                     = "${var.locations[count.index]}"
-  resource_group_name          = "${var.resource_group_names[count.index]}"
+  location                     = var.locations[count.index]
+  resource_group_name          = var.resource_group_names[count.index]
   public_ip_address_allocation = "static"
 }
 
 resource "azurerm_network_interface" "nic" {
-  count                     = "${var.count}"
+  count                     = var.count_vm
   name                      = "dns-rdir-nic-${count.index}"
-  location                  = "${var.locations[count.index]}"
-  resource_group_name       = "${var.resource_group_names[count.index]}"
-  network_security_group_id = "${element(azurerm_network_security_group.nsg.*.id, count.index)}"
+  location                  = var.locations[count.index]
+  resource_group_name       = var.resource_group_names[count.index]
+  network_security_group_id = element(azurerm_network_security_group.nsg.*.id, count.index)
 
   ip_configuration {
     name                          = "dns-rdir-nic-config"
-    subnet_id                     = "${element(azurerm_subnet.subnet.*.id, count.index)}"
+    subnet_id                     = element(azurerm_subnet.subnet.*.id, count.index)
     private_ip_address_allocation = "dynamic"
-    public_ip_address_id          = "${element(azurerm_public_ip.pip.*.id, count.index )}"
+    public_ip_address_id          = element(azurerm_public_ip.pip.*.id, count.index )
   }
 }
 
 resource "azurerm_virtual_machine" "dns-rdir" {
-  count                 = "${var.count}"
+  count                 = var.count_vm
   name                  = "dns-rdir-${count.index}"
-  location              = "${var.locations[count.index]}"
-  resource_group_name   = "${var.resource_group_names[count.index]}"
+  location              = var.locations[count.index]
+  resource_group_name   = var.resource_group_names[count.index]
   network_interface_ids = ["${element(azurerm_network_interface.nic.*.id, count.index)}"]
-  vm_size               = "${var.size}"
+  vm_size               = var.size
 
   delete_os_disk_on_termination    = true
   delete_data_disks_on_termination = true
@@ -73,7 +73,7 @@ resource "azurerm_virtual_machine" "dns-rdir" {
 
   os_profile {
     computer_name  = "dns-rdir-${count.index}"
-    admin_username = "${var.username}"
+    admin_username = var.username
   }
 
   os_profile_linux_config {
@@ -81,7 +81,7 @@ resource "azurerm_virtual_machine" "dns-rdir" {
 
     ssh_keys {
       path     = "/home/${var.username}/.ssh/authorized_keys"
-      key_data = "${tls_private_key.ssh.*.public_key_openssh[count.index]}"
+      key_data = tls_private_key.ssh.*.public_key_openssh[count.index]
     }
   }
 
@@ -94,9 +94,9 @@ resource "azurerm_virtual_machine" "dns-rdir" {
 
     connection {
       type        = "ssh"
-      host        = "${element(azurerm_public_ip.pip.*.ip_address, count.index )}"
-      user        = "${var.username}"
-      private_key = "${tls_private_key.ssh.*.private_key_pem[count.index]}"
+      host        = element(azurerm_public_ip.pip.*.ip_address, count.index )
+      user        = var.username
+      private_key = tls_private_key.ssh.*.private_key_pem[count.index]
     }
   }
 
@@ -111,19 +111,19 @@ resource "azurerm_virtual_machine" "dns-rdir" {
 }
 
 resource "null_resource" "ansible_provisioner" {
-  count = "${signum(length(var.ansible_playbook)) == 1 ? var.count : 0}"
+  count = signum(length(var.ansible_playbook)) == 1 ? var.count_vm : 0
 
-  depends_on = ["azurerm_virtual_machine.dns-rdir"]
+  depends_on = [azurerm_virtual_machine.dns-rdir]
 
-  triggers {
-    droplet_creation = "${join("," , azurerm_virtual_machine.dns-rdir.*.id)}"
-    policy_sha1 = "${sha1(file(var.ansible_playbook))}"
+  triggers = {
+    droplet_creation = join("," , azurerm_virtual_machine.dns-rdir.*.id)
+    policy_sha1 = sha1(file(var.ansible_playbook))
   }
 
   provisioner "local-exec" {
     command = "ansible-playbook ${join(" ", compact(var.ansible_arguments))} --user=${var.username} --private-key=./data/ssh_keys/${element(azurerm_public_ip.pip.*.ip_address, count.index)} -e host=${element(azurerm_public_ip.pip.*.ip_address, count.index)} ${var.ansible_playbook}"
 
-    environment {
+    environment = {
       ANSIBLE_HOST_KEY_CHECKING = "False"
     }
   }
@@ -135,27 +135,27 @@ resource "null_resource" "ansible_provisioner" {
 
 data "template_file" "ssh_config" {
 
-  count    = "${var.count}"
+  count    = var.count_vm
 
-  template = "${file("./data/templates/ssh_config.tpl")}"
+  template = file("./data/templates/ssh_config.tpl")
 
-  depends_on = ["azurerm_virtual_machine.dns-rdir"]
+  depends_on = [azurerm_virtual_machine.dns-rdir]
 
-  vars {
+  vars = {
     name = "dns_c2_${element(azurerm_public_ip.pip.*.ip_address, count.index)}"
-    hostname = "${element(azurerm_public_ip.pip.*.ip_address, count.index)}"
-    user = "${var.username}"
-    identityfile = "${path.root}/data/ssh_keys/${element(azurerm_public_ip.pip.*.ip_address, count.index)}"
+    hostname = element(azurerm_public_ip.pip.*.ip_address, count.index)
+    user = var.username
+    identityfile = path.root}/data/ssh_keys/${element(azurerm_public_ip.pip.*.ip_address, count.index)
   }
 
 }
 
 resource "null_resource" "gen_ssh_config" {
 
-  count = "${var.count}"
+  count = var.count_vm
 
-  triggers {
-    template_rendered = "${data.template_file.ssh_config.*.rendered[count.index]}"
+  triggers = {
+    template_rendered = data.template_file.ssh_config.*.rendered[count.index]
   }
 
   provisioner "local-exec" {
@@ -163,7 +163,7 @@ resource "null_resource" "gen_ssh_config" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_configs/config_${random_id.server.*.hex[count.index]}"
   }
 
diff --git a/modules/azure/dns-rdir/network-security-group.tf b/modules/azure/dns-rdir/network-security-group.tf
index f67d0f4..ef21f48 100644
--- a/modules/azure/dns-rdir/network-security-group.tf
+++ b/modules/azure/dns-rdir/network-security-group.tf
@@ -1,8 +1,8 @@
 resource "azurerm_network_security_group" "nsg" {
-  count               = "${var.count}"
+  count               = var.count_vm
   name                = "dns-rdir-${count.index}-nsg"
-  location            = "${var.locations[count.index]}"
-  resource_group_name = "${var.resource_group_names[count.index]}"
+  location            = var.locations[count.index]
+  resource_group_name = var.resource_group_names[count.index]
 
   security_rule {
     name                       = "SSH-In"
diff --git a/modules/azure/dns-rdir/outputs.tf b/modules/azure/dns-rdir/outputs.tf
index 3e3efc6..895ecaa 100644
--- a/modules/azure/dns-rdir/outputs.tf
+++ b/modules/azure/dns-rdir/outputs.tf
@@ -3,5 +3,5 @@ output "ips" {
 }
 
 output "ssh_user" {
-  value = "${var.username}"
+  value = var.username
 }
\ No newline at end of file
diff --git a/modules/azure/dns-rdir/variables.tf b/modules/azure/dns-rdir/variables.tf
index 39a7efe..871841e 100644
--- a/modules/azure/dns-rdir/variables.tf
+++ b/modules/azure/dns-rdir/variables.tf
@@ -1,21 +1,21 @@
 variable "resource_group_names" {
-  type = "list"
+  type = list(string)
 }
 
 variable "primary_blob_endpoints" {
-  type = "list"
+  type = list(string)
 }
 
 variable "storage_container_names" {
-  type = "list"
+  type = list(string)
 }
 
 variable "locations" {
-  type    = "list"
+  type    = list(string)
   default = ["eastus2"]
 }
 
-variable "count" {
+variable "count_vm" {
   default = 1
 }
 
@@ -26,18 +26,18 @@ variable "ansible_playbook" {
 
 variable "ansible_arguments" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Additional Ansible Arguments"
 }
 
 variable "ansible_vars" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Environment variables"
 }
 
 variable "redirect_to" {
-  type = "list"
+  type = list(string)
 }
 
 variable "username" {
@@ -45,7 +45,7 @@ variable "username" {
 }
 
 variable "install" {
-  type    = "list"
+  type    = list(string)
   default = []
 }
 
diff --git a/modules/azure/http-c2/README.md b/modules/azure/http-c2/README.md
index 34ff55e..b3dc826 100644
--- a/modules/azure/http-c2/README.md
+++ b/modules/azure/http-c2/README.md
@@ -22,7 +22,7 @@ module "http_c2" {
 |`storage_container_names`  | Yes      | List       | Names of the Storage Containers for VM hard drives
 |`primary_blob_endpoints`   | Yes      | List       | Names of the Storage Endpoints for VM hard drives
 |`size`                     | No       | String     | VM size to launch. Defaults to `Standard_D2`.
-|`install`                  | No       | List       | Scripts to run on VM creation. Defaults to "./scripts/core_deps.sh".
+|`install`                  | No       | List       | Scripts to run on VM creation. Defaults to "./data/scripts/core_deps.sh".
 |`locations`                | No       | List       | Locations to create VM(s) in. Defaults to `eastus2`. A list of available locations can be found on the [Azure Website](https://azure.microsoft.com/en-us/global-infrastructure/services/).
 |`username`                 | No       | String     | Name of the user account to create. Defaults to `c2user`.
 
diff --git a/modules/azure/http-c2/main.tf b/modules/azure/http-c2/main.tf
index d864fdc..641f79b 100644
--- a/modules/azure/http-c2/main.tf
+++ b/modules/azure/http-c2/main.tf
@@ -1,57 +1,57 @@
 provider "azure" {}
 
 resource "tls_private_key" "ssh" {
-  count     = "${var.count}"
+  count     = var.count_vm
   algorithm = "RSA"
   rsa_bits  = 4096
 }
 
 resource "azurerm_virtual_network" "vnet" {
-  count               = "${var.count}"
+  count               = var.count_vm
   name                = "http-c2-vnet"
   address_space       = ["10.0.0.0/8"]
-  location            = "${var.locations[count.index]}"
-  resource_group_name = "${var.resource_group_names[count.index]}"
+  location            = var.locations[count.index]
+  resource_group_name = var.resource_group_names[count.index]
 }
 
 resource "azurerm_subnet" "subnet" {
-  count                = "${var.count}"
+  count                = var.count_vm
   name                 = "subnet01"
-  resource_group_name  = "${var.resource_group_names[count.index]}"
-  virtual_network_name = "${element(azurerm_virtual_network.vnet.*.name, count.index)}"
+  resource_group_name  = var.resource_group_names[count.index]
+  virtual_network_name = element(azurerm_virtual_network.vnet.*.name, count.index)
   address_prefix       = "10.1.0.0/24"
 }
 
 resource "azurerm_public_ip" "pip" {
-  count                        = "${var.count}"
+  count                        = var.count_vm
   name                         = "http-c2-pip-${count.index}"
-  location                     = "${var.locations[count.index]}"
-  resource_group_name          = "${var.resource_group_names[count.index]}"
+  location                     = var.locations[count.index]
+  resource_group_name          = var.resource_group_names[count.index]
   public_ip_address_allocation = "static"
 }
 
 resource "azurerm_network_interface" "nic" {
-  count                     = "${var.count}"
+  count                     = var.count_vm
   name                      = "http-c2-nic-${count.index}"
-  location                  = "${var.locations[count.index]}"
-  resource_group_name       = "${var.resource_group_names[count.index]}"
-  network_security_group_id = "${element(azurerm_network_security_group.nsg.*.id, count.index)}"
+  location                  = var.locations[count.index]
+  resource_group_name       = var.resource_group_names[count.index]
+  network_security_group_id = element(azurerm_network_security_group.nsg.*.id, count.index)
 
   ip_configuration {
     name                          = "http-c2-nic-config"
-    subnet_id                     = "${element(azurerm_subnet.subnet.*.id, count.index)}"
+    subnet_id                     = element(azurerm_subnet.subnet.*.id, count.index)
     private_ip_address_allocation = "dynamic"
-    public_ip_address_id          = "${element(azurerm_public_ip.pip.*.id, count.index )}"
+    public_ip_address_id          = element(azurerm_public_ip.pip.*.id, count.index )
   }
 }
 
 resource "azurerm_virtual_machine" "http-c2" {
-  count                 = "${var.count}"
+  count                 = var.count_vm
   name                  = "http-c2-${count.index}"
-  location              = "${var.locations[count.index]}"
-  resource_group_name   = "${var.resource_group_names[count.index]}"
+  location              = var.locations[count.index]
+  resource_group_name   = var.resource_group_names[count.index]
   network_interface_ids = ["${element(azurerm_network_interface.nic.*.id, count.index)}"]
-  vm_size               = "${var.size}"
+  vm_size               = var.size
 
   delete_os_disk_on_termination    = true
   delete_data_disks_on_termination = true
@@ -73,7 +73,7 @@ resource "azurerm_virtual_machine" "http-c2" {
 
   os_profile {
     computer_name  = "http-c2-${count.index}"
-    admin_username = "${var.username}"
+    admin_username = var.username
   }
 
   os_profile_linux_config {
@@ -81,18 +81,18 @@ resource "azurerm_virtual_machine" "http-c2" {
 
     ssh_keys {
       path     = "/home/${var.username}/.ssh/authorized_keys"
-      key_data = "${tls_private_key.ssh.*.public_key_openssh[count.index]}"
+      key_data = tls_private_key.ssh.*.public_key_openssh[count.index]
     }
   }
 
   provisioner "remote-exec" {
-    scripts = "${concat(list("./scripts/core_deps.sh"), var.install)}"
+    scripts = concat(list("./data/scripts/core_deps.sh"), var.install)
 
     connection {
       type        = "ssh"
-      host        = "${element(azurerm_public_ip.pip.*.ip_address, count.index )}"
-      user        = "${var.username}"
-      private_key = "${tls_private_key.ssh.*.private_key_pem[count.index]}"
+      host        = element(azurerm_public_ip.pip.*.ip_address, count.index )
+      user        = var.username
+      private_key = tls_private_key.ssh.*.private_key_pem[count.index]
     }
   }
 
@@ -107,19 +107,19 @@ resource "azurerm_virtual_machine" "http-c2" {
 }
 
 resource "null_resource" "ansible_provisioner" {
-  count = "${signum(length(var.ansible_playbook)) == 1 ? var.count : 0}"
+  count = signum(length(var.ansible_playbook)) == 1 ? var.count_vm : 0
 
-  depends_on = ["azurerm_virtual_machine.http-c2"]
+  depends_on = [azurerm_virtual_machine.http-c2]
 
-  triggers {
-    droplet_creation = "${join("," , azurerm_virtual_machine.http-c2.*.id)}"
-    policy_sha1 = "${sha1(file(var.ansible_playbook))}"
+  triggers = {
+    droplet_creation = join("," , azurerm_virtual_machine.http-c2.*.id)
+    policy_sha1 = sha1(file(var.ansible_playbook))
   }
 
   provisioner "local-exec" {
     command = "ansible-playbook ${join(" ", compact(var.ansible_arguments))} --user=${var.username} --private-key=./data/ssh_keys/${element(azurerm_public_ip.pip.*.ip_address, count.index)} -e host=${element(azurerm_public_ip.pip.*.ip_address, count.index)} ${var.ansible_playbook}"
 
-    environment {
+    environment = {
       ANSIBLE_HOST_KEY_CHECKING = "False"
     }
   }
@@ -131,27 +131,27 @@ resource "null_resource" "ansible_provisioner" {
 
 data "template_file" "ssh_config" {
 
-  count    = "${var.count}"
+  count    = var.count_vm
 
-  template = "${file("./data/templates/ssh_config.tpl")}"
+  template = file("./data/templates/ssh_config.tpl")
 
-  depends_on = ["azurerm_virtual_machine.http-c2"]
+  depends_on = [azurerm_virtual_machine.http-c2]
 
-  vars {
+  vars = {
     name = "dns_c2_${element(azurerm_public_ip.pip.*.ip_address, count.index)}"
-    hostname = "${element(azurerm_public_ip.pip.*.ip_address, count.index)}"
-    user = "${var.username}"
-    identityfile = "${path.root}/data/ssh_keys/${element(azurerm_public_ip.pip.*.ip_address, count.index)}"
+    hostname = element(azurerm_public_ip.pip.*.ip_address, count.index)
+    user = var.username
+    identityfile = path.root}/data/ssh_keys/${element(azurerm_public_ip.pip.*.ip_address, count.index)
   }
 
 }
 
 resource "null_resource" "gen_ssh_config" {
 
-  count = "${var.count}"
+  count = var.count_vm
 
-  triggers {
-    template_rendered = "${data.template_file.ssh_config.*.rendered[count.index]}"
+  triggers = {
+    template_rendered = data.template_file.ssh_config.*.rendered[count.index]
   }
 
   provisioner "local-exec" {
@@ -159,7 +159,7 @@ resource "null_resource" "gen_ssh_config" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_configs/config_${random_id.server.*.hex[count.index]}"
   }
 
diff --git a/modules/azure/http-c2/network_security_group.tf b/modules/azure/http-c2/network_security_group.tf
index 6839590..922e9cc 100644
--- a/modules/azure/http-c2/network_security_group.tf
+++ b/modules/azure/http-c2/network_security_group.tf
@@ -3,10 +3,10 @@ terraform {
 }
 
 resource "azurerm_network_security_group" "nsg" {
-  count               = "${var.count}"
+  count               = var.count_vm
   name                = "http-c2-${count.index}-nsg"
-  location            = "${var.locations[count.index]}"
-  resource_group_name = "${var.resource_group_names[count.index]}"
+  location            = var.locations[count.index]
+  resource_group_name = var.resource_group_names[count.index]
 
   security_rule {
     name                       = "SSH-In"
diff --git a/modules/azure/http-c2/outputs.tf b/modules/azure/http-c2/outputs.tf
index 3e3efc6..895ecaa 100644
--- a/modules/azure/http-c2/outputs.tf
+++ b/modules/azure/http-c2/outputs.tf
@@ -3,5 +3,5 @@ output "ips" {
 }
 
 output "ssh_user" {
-  value = "${var.username}"
+  value = var.username
 }
\ No newline at end of file
diff --git a/modules/azure/http-c2/variables.tf b/modules/azure/http-c2/variables.tf
index 11eb808..a22ff4f 100644
--- a/modules/azure/http-c2/variables.tf
+++ b/modules/azure/http-c2/variables.tf
@@ -1,21 +1,21 @@
 variable "resource_group_names" {
-  type = "list"
+  type = list(string)
 }
 
 variable "primary_blob_endpoints" {
-  type = "list"
+  type = list(string)
 }
 
 variable "storage_container_names" {
-  type = "list"
+  type = list(string)
 }
 
 variable "locations" {
-  type    = "list"
+  type    = list(string)
   default = ["eastus2"]
 }
 
-variable "count" {
+variable "count_vm" {
   default = 1
 }
 
@@ -26,13 +26,13 @@ variable "ansible_playbook" {
 
 variable "ansible_arguments" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Additional Ansible Arguments"
 }
 
 variable "ansible_vars" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Environment variables"
 }
 
@@ -45,17 +45,17 @@ variable "size" {
 }
 
 variable "install" {
-  type    = "list"
+  type    = list(string)
   default = []
 }
 
 /*
 variable "install" {
-  type = "map"
+  type = map(string)
   default = {
-    "empire" = "./scripts/install_empire.sh"
-    "metasploit" = "./scripts/install_metasploit.sh"
-    "cobaltstrike" = "./scripts/install_cobalt_strike.sh"
+    "empire" = "./data/scripts/install_empire.sh"
+    "metasploit" = "./data/scripts/install_metasploit.sh"
+    "cobaltstrike" = "./data/scripts/install_cobalt_strike.sh"
   }
 }
 */
diff --git a/modules/azure/http-rdir/README.md b/modules/azure/http-rdir/README.md
index 45ff96a..10c4414 100644
--- a/modules/azure/http-rdir/README.md
+++ b/modules/azure/http-rdir/README.md
@@ -24,7 +24,7 @@ module "http_rdir" {
 |`storage_container_names`  | Yes      | List       | Names of the Storage Containers for VM hard drives
 |`primary_blob_endpoints`   | Yes      | List       | Names of the Storage Endpoints for VM hard drives
 |`size`                     | No       | String     | VM size to launch. Defaults to `Standard_D2`.
-|`install`                  | No       | List       | Scripts to run on VM creation. Defaults to "./scripts/core_deps.sh".
+|`install`                  | No       | List       | Scripts to run on VM creation. Defaults to "./data/scripts/core_deps.sh".
 |`locations`                | No       | List       | Locations to create VM(s) in. Defaults to `eastus2`. A list of available locations can be found on the [Azure Website](https://azure.microsoft.com/en-us/global-infrastructure/services/).
 |`username`                 | No       | String     | Name of the user account to create. Defaults to `c2user`.
 
diff --git a/modules/azure/http-rdir/main.tf b/modules/azure/http-rdir/main.tf
index 48723e2..17446e6 100644
--- a/modules/azure/http-rdir/main.tf
+++ b/modules/azure/http-rdir/main.tf
@@ -1,57 +1,57 @@
 provider "azure" {}
 
 resource "tls_private_key" "ssh" {
-  count     = "${var.count}"
+  count     = var.count_vm
   algorithm = "RSA"
   rsa_bits  = 4096
 }
 
 resource "azurerm_virtual_network" "vnet" {
-  count               = "${var.count}"
+  count               = var.count_vm
   name                = "http-rdir-vnet"
   address_space       = ["10.0.0.0/8"]
-  location            = "${var.locations[count.index]}"
-  resource_group_name = "${var.resource_group_names[count.index]}"
+  location            = var.locations[count.index]
+  resource_group_name = var.resource_group_names[count.index]
 }
 
 resource "azurerm_subnet" "subnet" {
-  count                = "${var.count}"
+  count                = var.count_vm
   name                 = "subnet01"
-  resource_group_name  = "${var.resource_group_names[count.index]}"
-  virtual_network_name = "${element(azurerm_virtual_network.vnet.*.name, count.index)}"
+  resource_group_name  = var.resource_group_names[count.index]
+  virtual_network_name = element(azurerm_virtual_network.vnet.*.name, count.index)
   address_prefix       = "10.1.0.0/24"
 }
 
 resource "azurerm_public_ip" "pip" {
-  count                        = "${var.count}"
+  count                        = var.count_vm
   name                         = "http-rdir-pip-${count.index}"
-  location                     = "${var.locations[count.index]}"
-  resource_group_name          = "${var.resource_group_names[count.index]}"
+  location                     = var.locations[count.index]
+  resource_group_name          = var.resource_group_names[count.index]
   public_ip_address_allocation = "static"
 }
 
 resource "azurerm_network_interface" "nic" {
-  count                     = "${var.count}"
+  count                     = var.count_vm
   name                      = "http-rdir-nic-${count.index}"
-  location                  = "${var.locations[count.index]}"
-  resource_group_name       = "${var.resource_group_names[count.index]}"
-  network_security_group_id = "${element(azurerm_network_security_group.nsg.*.id, count.index)}"
+  location                  = var.locations[count.index]
+  resource_group_name       = var.resource_group_names[count.index]
+  network_security_group_id = element(azurerm_network_security_group.nsg.*.id, count.index)
 
   ip_configuration {
     name                          = "http-rdir-nic-config"
-    subnet_id                     = "${element(azurerm_subnet.subnet.*.id, count.index)}"
+    subnet_id                     = element(azurerm_subnet.subnet.*.id, count.index)
     private_ip_address_allocation = "dynamic"
-    public_ip_address_id          = "${element(azurerm_public_ip.pip.*.id, count.index )}"
+    public_ip_address_id          = element(azurerm_public_ip.pip.*.id, count.index )
   }
 }
 
 resource "azurerm_virtual_machine" "http-rdir" {
-  count                 = "${var.count}"
+  count                 = var.count_vm
   name                  = "http-rdir-${count.index}"
-  location              = "${var.locations[count.index]}"
-  resource_group_name   = "${var.resource_group_names[count.index]}"
+  location              = var.locations[count.index]
+  resource_group_name   = var.resource_group_names[count.index]
   network_interface_ids = ["${element(azurerm_network_interface.nic.*.id, count.index)}"]
-  vm_size               = "${var.size}"
+  vm_size               = var.size
 
   delete_os_disk_on_termination    = true
   delete_data_disks_on_termination = true
@@ -73,7 +73,7 @@ resource "azurerm_virtual_machine" "http-rdir" {
 
   os_profile {
     computer_name  = "http-rdir-${count.index}"
-    admin_username = "${var.username}"
+    admin_username = var.username
   }
 
   os_profile_linux_config {
@@ -81,7 +81,7 @@ resource "azurerm_virtual_machine" "http-rdir" {
 
     ssh_keys {
       path     = "/home/${var.username}/.ssh/authorized_keys"
-      key_data = "${tls_private_key.ssh.*.public_key_openssh[count.index]}"
+      key_data = tls_private_key.ssh.*.public_key_openssh[count.index]
     }
   }
 
@@ -96,9 +96,9 @@ resource "azurerm_virtual_machine" "http-rdir" {
 
     connection {
       type        = "ssh"
-      host        = "${element(azurerm_public_ip.pip.*.ip_address, count.index )}"
-      user        = "${var.username}"
-      private_key = "${tls_private_key.ssh.*.private_key_pem[count.index]}"
+      host        = element(azurerm_public_ip.pip.*.ip_address, count.index )
+      user        = var.username
+      private_key = tls_private_key.ssh.*.private_key_pem[count.index]
     }
   }
 
@@ -113,19 +113,19 @@ resource "azurerm_virtual_machine" "http-rdir" {
 }
 
 resource "null_resource" "ansible_provisioner" {
-  count = "${signum(length(var.ansible_playbook)) == 1 ? var.count : 0}"
+  count = signum(length(var.ansible_playbook)) == 1 ? var.count_vm : 0
 
-  depends_on = ["azurerm_virtual_machine.http-rdir"]
+  depends_on = [azurerm_virtual_machine.http-rdir]
 
-  triggers {
-    droplet_creation = "${join("," , azurerm_virtual_machine.http-rdir.*.id)}"
-    policy_sha1 = "${sha1(file(var.ansible_playbook))}"
+  triggers = {
+    droplet_creation = join("," , azurerm_virtual_machine.http-rdir.*.id)
+    policy_sha1 = sha1(file(var.ansible_playbook))
   }
 
   provisioner "local-exec" {
     command = "ansible-playbook ${join(" ", compact(var.ansible_arguments))} --user=${var.username} --private-key=./data/ssh_keys/${element(azurerm_public_ip.pip.*.ip_address, count.index)} -e host=${element(azurerm_public_ip.pip.*.ip_address, count.index)} ${var.ansible_playbook}"
 
-    environment {
+    environment = {
       ANSIBLE_HOST_KEY_CHECKING = "False"
     }
   }
@@ -137,27 +137,27 @@ resource "null_resource" "ansible_provisioner" {
 
 data "template_file" "ssh_config" {
 
-  count    = "${var.count}"
+  count    = var.count_vm
 
-  template = "${file("./data/templates/ssh_config.tpl")}"
+  template = file("./data/templates/ssh_config.tpl")
 
-  depends_on = ["azurerm_virtual_machine.http-rdir"]
+  depends_on = [azurerm_virtual_machine.http-rdir]
 
-  vars {
+  vars = {
     name = "dns_c2_${element(azurerm_public_ip.pip.*.ip_address, count.index)}"
-    hostname = "${element(azurerm_public_ip.pip.*.ip_address, count.index)}"
-    user = "${var.username}"
-    identityfile = "${path.root}/data/ssh_keys/${element(azurerm_public_ip.pip.*.ip_address, count.index)}"
+    hostname = element(azurerm_public_ip.pip.*.ip_address, count.index)
+    user = var.username
+    identityfile = path.root}/data/ssh_keys/${element(azurerm_public_ip.pip.*.ip_address, count.index)
   }
 
 }
 
 resource "null_resource" "gen_ssh_config" {
 
-  count = "${var.count}"
+  count = var.count_vm
 
-  triggers {
-    template_rendered = "${data.template_file.ssh_config.*.rendered[count.index]}"
+  triggers = {
+    template_rendered = data.template_file.ssh_config.*.rendered[count.index]
   }
 
   provisioner "local-exec" {
@@ -165,7 +165,7 @@ resource "null_resource" "gen_ssh_config" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_configs/config_${random_id.server.*.hex[count.index]}"
   }
 
diff --git a/modules/azure/http-rdir/network_security_group.tf b/modules/azure/http-rdir/network_security_group.tf
index cb98273..a68e00d 100644
--- a/modules/azure/http-rdir/network_security_group.tf
+++ b/modules/azure/http-rdir/network_security_group.tf
@@ -3,10 +3,10 @@ terraform {
 }
 
 resource "azurerm_network_security_group" "nsg" {
-  count               = "${var.count}"
+  count               = var.count_vm
   name                = "http-rdir-${count.index}-nsg"
-  location            = "${var.locations[count.index]}"
-  resource_group_name = "${var.resource_group_names[count.index]}"
+  location            = var.locations[count.index]
+  resource_group_name = var.resource_group_names[count.index]
 
   security_rule {
     name                       = "SSH-In"
diff --git a/modules/azure/http-rdir/outputs.tf b/modules/azure/http-rdir/outputs.tf
index 3e3efc6..895ecaa 100644
--- a/modules/azure/http-rdir/outputs.tf
+++ b/modules/azure/http-rdir/outputs.tf
@@ -3,5 +3,5 @@ output "ips" {
 }
 
 output "ssh_user" {
-  value = "${var.username}"
+  value = var.username
 }
\ No newline at end of file
diff --git a/modules/azure/http-rdir/variables.tf b/modules/azure/http-rdir/variables.tf
index 1df0d33..8dbb084 100644
--- a/modules/azure/http-rdir/variables.tf
+++ b/modules/azure/http-rdir/variables.tf
@@ -1,21 +1,21 @@
 variable "resource_group_names" {
-  type = "list"
+  type = list(string)
 }
 
 variable "primary_blob_endpoints" {
-  type = "list"
+  type = list(string)
 }
 
 variable "storage_container_names" {
-  type = "list"
+  type = list(string)
 }
 
 variable "locations" {
-  type    = "list"
+  type    = list(string)
   default = ["eastus2"]
 }
 
-variable "count" {
+variable "count_vm" {
   default = 1
 }
 
@@ -26,18 +26,18 @@ variable "ansible_playbook" {
 
 variable "ansible_arguments" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Additional Ansible Arguments"
 }
 
 variable "ansible_vars" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Environment variables"
 }
 
 variable "redirect_to" {
-  type = "list"
+  type = list(string)
 }
 
 variable "username" {
@@ -49,17 +49,17 @@ variable "size" {
 }
 
 variable "install" {
-  type    = "list"
+  type    = list(string)
   default = []
 }
 
 /*
 variable "install" {
-  type = "map"
+  type = map(string)
   default = {
-    "empire" = "./scripts/install_empire.sh"
-    "metasploit" = "./scripts/install_metasploit.sh"
-    "cobaltstrike" = "./scripts/install_cobalt_strike.sh"
+    "empire" = "./data/scripts/install_empire.sh"
+    "metasploit" = "./data/scripts/install_metasploit.sh"
+    "cobaltstrike" = "./data/scripts/install_cobalt_strike.sh"
   }
 }
 */
diff --git a/modules/azure/phishing-server/main.tf b/modules/azure/phishing-server/main.tf
index dafe629..46b82b0 100644
--- a/modules/azure/phishing-server/main.tf
+++ b/modules/azure/phishing-server/main.tf
@@ -1,57 +1,57 @@
 provider "azure" {}
 
 resource "tls_private_key" "ssh" {
-  count     = "${var.count}"
+  count     = var.count_vm
   algorithm = "RSA"
   rsa_bits  = 4096
 }
 
 resource "azurerm_virtual_network" "vnet" {
-  count               = "${var.count}"
+  count               = var.count_vm
   name                = "phishing-server-vnet"
   address_space       = ["10.0.0.0/8"]
-  location            = "${var.locations[count.index]}"
-  resource_group_name = "${var.resource_group_names[count.index]}"
+  location            = var.locations[count.index]
+  resource_group_name = var.resource_group_names[count.index]
 }
 
 resource "azurerm_subnet" "subnet" {
-  count                = "${var.count}"
+  count                = var.count_vm
   name                 = "subnet01"
-  resource_group_name  = "${var.resource_group_names[count.index]}"
-  virtual_network_name = "${element(azurerm_virtual_network.vnet.*.name, count.index)}"
+  resource_group_name  = var.resource_group_names[count.index]
+  virtual_network_name = element(azurerm_virtual_network.vnet.*.name, count.index)
   address_prefix       = "10.1.0.0/24"
 }
 
 resource "azurerm_public_ip" "pip" {
-  count                        = "${var.count}"
+  count                        = var.count_vm
   name                         = "phishing-server-pip-${count.index}"
-  location                     = "${var.locations[count.index]}"
-  resource_group_name          = "${var.resource_group_names[count.index]}"
+  location                     = var.locations[count.index]
+  resource_group_name          = var.resource_group_names[count.index]
   public_ip_address_allocation = "static"
 }
 
 resource "azurerm_network_interface" "nic" {
-  count                     = "${var.count}"
+  count                     = var.count_vm
   name                      = "phishing-server-nic-${count.index}"
-  location                  = "${var.locations[count.index]}"
-  resource_group_name       = "${var.resource_group_names[count.index]}"
-  network_security_group_id = "${element(azurerm_network_security_group.nsg.*.id, count.index)}"
+  location                  = var.locations[count.index]
+  resource_group_name       = var.resource_group_names[count.index]
+  network_security_group_id = element(azurerm_network_security_group.nsg.*.id, count.index)
 
   ip_configuration {
     name                          = "phishing-server-nic-config"
-    subnet_id                     = "${element(azurerm_subnet.subnet.*.id, count.index)}"
+    subnet_id                     = element(azurerm_subnet.subnet.*.id, count.index)
     private_ip_address_allocation = "dynamic"
-    public_ip_address_id          = "${element(azurerm_public_ip.pip.*.id, count.index )}"
+    public_ip_address_id          = element(azurerm_public_ip.pip.*.id, count.index )
   }
 }
 
 resource "azurerm_virtual_machine" "phishing-server" {
-  count                 = "${var.count}"
+  count                 = var.count_vm
   name                  = "phishing-server-${count.index}"
-  location              = "${var.locations[count.index]}"
-  resource_group_name   = "${var.resource_group_names[count.index]}"
+  location              = var.locations[count.index]
+  resource_group_name   = var.resource_group_names[count.index]
   network_interface_ids = ["${element(azurerm_network_interface.nic.*.id, count.index)}"]
-  vm_size               = "${var.size}"
+  vm_size               = var.size
 
   delete_os_disk_on_termination    = true
   delete_data_disks_on_termination = true
@@ -73,7 +73,7 @@ resource "azurerm_virtual_machine" "phishing-server" {
 
   os_profile {
     computer_name  = "phishing-server-${count.index}"
-    admin_username = "${var.username}"
+    admin_username = var.username
   }
 
   os_profile_linux_config {
@@ -81,7 +81,7 @@ resource "azurerm_virtual_machine" "phishing-server" {
 
     ssh_keys {
       path     = "/home/${var.username}/.ssh/authorized_keys"
-      key_data = "${tls_private_key.ssh.*.public_key_openssh[count.index]}"
+      key_data = tls_private_key.ssh.*.public_key_openssh[count.index]
     }
   }
 
@@ -95,9 +95,9 @@ resource "azurerm_virtual_machine" "phishing-server" {
 
     connection {
       type        = "ssh"
-      host        = "${element(azurerm_public_ip.pip.*.ip_address, count.index )}"
-      user        = "${var.username}"
-      private_key = "${tls_private_key.ssh.*.private_key_pem[count.index]}"
+      host        = element(azurerm_public_ip.pip.*.ip_address, count.index )
+      user        = var.username
+      private_key = tls_private_key.ssh.*.private_key_pem[count.index]
     }
   }
 
@@ -112,19 +112,19 @@ resource "azurerm_virtual_machine" "phishing-server" {
 }
 
 resource "null_resource" "ansible_provisioner" {
-  count = "${signum(length(var.ansible_playbook)) == 1 ? var.count : 0}"
+  count = signum(length(var.ansible_playbook)) == 1 ? var.count_vm : 0
 
-  depends_on = ["azurerm_virtual_machine.phishing-server"]
+  depends_on = [azurerm_virtual_machine.phishing-server]
 
-  triggers {
-    droplet_creation = "${join("," , azurerm_virtual_machine.phishing-server.*.id)}"
-    policy_sha1 = "${sha1(file(var.ansible_playbook))}"
+  triggers = {
+    droplet_creation = join("," , azurerm_virtual_machine.phishing-server.*.id)
+    policy_sha1 = sha1(file(var.ansible_playbook))
   }
 
   provisioner "local-exec" {
     command = "ansible-playbook ${join(" ", compact(var.ansible_arguments))} --user=${var.username} --private-key=./data/ssh_keys/${element(azurerm_public_ip.pip.*.ip_address, count.index)} -e host=${element(azurerm_public_ip.pip.*.ip_address, count.index)} ${var.ansible_playbook}"
 
-    environment {
+    environment = {
       ANSIBLE_HOST_KEY_CHECKING = "False"
     }
   }
@@ -136,27 +136,27 @@ resource "null_resource" "ansible_provisioner" {
 
 data "template_file" "ssh_config" {
 
-  count    = "${var.count}"
+  count    = var.count_vm
 
-  template = "${file("./data/templates/ssh_config.tpl")}"
+  template = file("./data/templates/ssh_config.tpl")
 
-  depends_on = ["azurerm_virtual_machine.phishing-server"]
+  depends_on = [azurerm_virtual_machine.phishing-server]
 
-  vars {
+  vars = {
     name = "dns_c2_${element(azurerm_public_ip.pip.*.ip_address, count.index)}"
-    hostname = "${element(azurerm_public_ip.pip.*.ip_address, count.index)}"
-    user = "${var.username}"
-    identityfile = "${path.root}/data/ssh_keys/${element(azurerm_public_ip.pip.*.ip_address, count.index)}"
+    hostname = element(azurerm_public_ip.pip.*.ip_address, count.index)
+    user = var.username
+    identityfile = path.root}/data/ssh_keys/${element(azurerm_public_ip.pip.*.ip_address, count.index)
   }
 
 }
 
 resource "null_resource" "gen_ssh_config" {
 
-  count = "${var.count}"
+  count = var.count_vm
 
-  triggers {
-    template_rendered = "${data.template_file.ssh_config.*.rendered[count.index]}"
+  triggers = {
+    template_rendered = data.template_file.ssh_config.*.rendered[count.index]
   }
 
   provisioner "local-exec" {
@@ -164,7 +164,7 @@ resource "null_resource" "gen_ssh_config" {
 phishing-server  }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_configs/config_${random_id.server.*.hex[count.index]}"
   }
 
diff --git a/modules/azure/phishing-server/network_security_group.tf b/modules/azure/phishing-server/network_security_group.tf
index adc0c30..7420635 100644
--- a/modules/azure/phishing-server/network_security_group.tf
+++ b/modules/azure/phishing-server/network_security_group.tf
@@ -3,10 +3,10 @@ terraform {
 }
 
 resource "azurerm_network_security_group" "nsg" {
-  count               = "${var.count}"
+  count               = var.count_vm
   name                = "phishing-server-${count.index}-nsg"
-  location            = "${var.locations[count.index]}"
-  resource_group_name = "${var.resource_group_names[count.index]}"
+  location            = var.locations[count.index]
+  resource_group_name = var.resource_group_names[count.index]
 
   security_rule {
     name                       = "SSH-In"
diff --git a/modules/azure/phishing-server/outputs.tf b/modules/azure/phishing-server/outputs.tf
index 3e3efc6..895ecaa 100644
--- a/modules/azure/phishing-server/outputs.tf
+++ b/modules/azure/phishing-server/outputs.tf
@@ -3,5 +3,5 @@ output "ips" {
 }
 
 output "ssh_user" {
-  value = "${var.username}"
+  value = var.username
 }
\ No newline at end of file
diff --git a/modules/azure/phishing-server/variables.tf b/modules/azure/phishing-server/variables.tf
index 6898d7b..cdde980 100644
--- a/modules/azure/phishing-server/variables.tf
+++ b/modules/azure/phishing-server/variables.tf
@@ -1,21 +1,21 @@
 variable "resource_group_names" {
-  type = "list"
+  type = list(string)
 }
 
 variable "primary_blob_endpoints" {
-  type = "list"
+  type = list(string)
 }
 
 variable "storage_container_names" {
-  type = "list"
+  type = list(string)
 }
 
 variable "locations" {
-  type    = "list"
+  type    = list(string)
   default = ["eastus2"]
 }
 
-variable "count" {
+variable "count_vm" {
   default = 1
 }
 
@@ -26,13 +26,13 @@ variable "ansible_playbook" {
 
 variable "ansible_arguments" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Additional Ansible Arguments"
 }
 
 variable "ansible_vars" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Environment variables"
 }
 
@@ -46,11 +46,11 @@ variable "size" {
 
 /*
 variable "install" {
-  type = "map"
+  type = map(string)
   default = {
-    "empire" = "./scripts/install_empire.sh"
-    "metasploit" = "./scripts/install_metasploit.sh"
-    "cobaltstrike" = "./scripts/install_cobalt_strike.sh"
+    "empire" = "./data/scripts/install_empire.sh"
+    "metasploit" = "./data/scripts/install_metasploit.sh"
+    "cobaltstrike" = "./data/scripts/install_cobalt_strike.sh"
   }
 }
 */
diff --git a/modules/digitalocean/create-dns-record/main.tf b/modules/digitalocean/create-dns-record/main.tf
index 9f5f3e8..99ed8c1 100644
--- a/modules/digitalocean/create-dns-record/main.tf
+++ b/modules/digitalocean/create-dns-record/main.tf
@@ -4,9 +4,9 @@ terraform {
 
 # Add a record to the domain
 resource "digitalocean_record" "record" {
-  count  = "${var.count}"
-  domain = "${element(keys(var.records), count.index)}"
-  type   = "${var.type}"
-  value  = "${lookup(var.records, element(keys(var.records), count.index))}"
-  ttl    = "${var.ttl}"
+  count  = var.count_vm
+  domain = element(keys(var.records), count.index)
+  type   = var.type
+  value  = lookup(var.records, element(keys(var.records), count.index))
+  ttl    = var.ttl
 }
diff --git a/modules/digitalocean/create-dns-record/outputs.tf b/modules/digitalocean/create-dns-record/outputs.tf
index 4e0b481..4adec69 100644
--- a/modules/digitalocean/create-dns-record/outputs.tf
+++ b/modules/digitalocean/create-dns-record/outputs.tf
@@ -1,3 +1,3 @@
 output "records" {
-  value = "${var.records}"
+  value = var.records
 }
\ No newline at end of file
diff --git a/modules/digitalocean/create-dns-record/variables.tf b/modules/digitalocean/create-dns-record/variables.tf
index fa88f64..506cb46 100644
--- a/modules/digitalocean/create-dns-record/variables.tf
+++ b/modules/digitalocean/create-dns-record/variables.tf
@@ -2,7 +2,7 @@ variable "domain" {}
 
 variable "type" {}
 
-variable "count" {
+variable "count_vm" {
   default = 1
 }
 
@@ -11,5 +11,5 @@ variable "ttl" {
 }
 
 variable "records" {
-  type = "map"
+  type = map(string)
 }
\ No newline at end of file
diff --git a/modules/digitalocean/dns-c2/README.md b/modules/digitalocean/dns-c2/README.md
index d020359..c472cce 100644
--- a/modules/digitalocean/dns-c2/README.md
+++ b/modules/digitalocean/dns-c2/README.md
@@ -16,7 +16,7 @@ module "dns_c2" {
 |---------------------------| -------- | ---------- | -----------
 |`count`                    | No       | Integer    | Number of droplets to launch. Defaults to 1.
 |`size`                     | No       | Integer    | Droplet size to launch. Defaults to `1gb`.
-|`install`                  | No       | List       | Scripts to run on droplet creation. Defaults to "./scripts/core_deps.sh".
+|`install`                  | No       | List       | Scripts to run on droplet creation. Defaults to "./data/scripts/core_deps.sh".
 |`regions`                  | No       | List       | Regions to create Droplet(s) in. Defaults to `NYC1`. Accepted values are NYC1/2/3, SFO1/2, AMS2/3, SGP1, LON1, FRA1, TOR1, BLR1.
 
 # Outputs
diff --git a/modules/digitalocean/dns-c2/main.tf b/modules/digitalocean/dns-c2/main.tf
index f0e07d3..e92daa3 100644
--- a/modules/digitalocean/dns-c2/main.tf
+++ b/modules/digitalocean/dns-c2/main.tf
@@ -3,37 +3,37 @@ terraform {
 }
 
 resource "random_id" "server" {
-  count = "${var.count}"
+  count = var.count_vm
   byte_length = 4
 }
 
 resource "tls_private_key" "ssh" {
-  count = "${var.count}"
+  count = var.count_vm
   algorithm = "RSA"
   rsa_bits = 4096
 }
 
 resource "digitalocean_ssh_key" "ssh_key" {
-  count = "${var.count}"
+  count = var.count_vm
   name  = "dns-c2-key-${random_id.server.*.hex[count.index]}"
-  public_key = "${tls_private_key.ssh.*.public_key_openssh[count.index]}"
+  public_key = tls_private_key.ssh.*.public_key_openssh[count.index]
 }
 
 resource "digitalocean_droplet" "dns-c2" {
-  count = "${var.count}"
+  count = var.count_vm
   image = "debian-9-x64"
   name = "dns-c2-${random_id.server.*.hex[count.index]}"
-  region = "${var.available_regions[element(var.regions, count.index)]}"
+  region = var.available_regions[element(var.regions, count.index)]
   ssh_keys = ["${digitalocean_ssh_key.ssh_key.*.id[count.index]}"]
-  size = "${var.size}"
+  size = var.size
 
   provisioner "remote-exec" {
-    scripts = "${concat(list("./data/scripts/core_deps.sh"), var.install)}"
+    scripts = concat(list("./data/scripts/core_deps.sh"), var.install)
 
     connection {
         type = "ssh"
         user = "root"
-        private_key = "${tls_private_key.ssh.*.private_key_pem[count.index]}"
+        private_key = tls_private_key.ssh.*.private_key_pem[count.index]
     }
   }
 
@@ -42,25 +42,25 @@ resource "digitalocean_droplet" "dns-c2" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_keys/${self.ipv4_address}*"
   }
 }
 
 resource "null_resource" "ansible_provisioner" {
-  count = "${signum(length(var.ansible_playbook)) == 1 ? var.count : 0}"
+  count = signum(length(var.ansible_playbook)) == 1 ? var.count_vm : 0
 
-  depends_on = ["digitalocean_droplet.dns-c2"]
+  depends_on = [digitalocean_droplet.dns-c2]
 
-  triggers {
-    droplet_creation = "${join("," , digitalocean_droplet.dns-c2.*.id)}"
-    policy_sha1 = "${sha1(file(var.ansible_playbook))}"
+  triggers = {
+    droplet_creation = join("," , digitalocean_droplet.dns-c2.*.id)
+    policy_sha1 = sha1(file(var.ansible_playbook))
   }
 
   provisioner "local-exec" {
     command = "ansible-playbook ${join(" ", compact(var.ansible_arguments))} --user=root --private-key=./data/ssh_keys/${digitalocean_droplet.dns-c2.*.ipv4_address[count.index]} -e host=${digitalocean_droplet.dns-c2.*.ipv4_address[count.index]} ${var.ansible_playbook}"
 
-    environment {
+    environment = {
       ANSIBLE_HOST_KEY_CHECKING = "False"
     }
   }
@@ -72,27 +72,27 @@ resource "null_resource" "ansible_provisioner" {
 
 data "template_file" "ssh_config" {
 
-  count    = "${var.count}"
+  count    = var.count_vm
 
-  template = "${file("./data/templates/ssh_config.tpl")}"
+  template = file("./data/templates/ssh_config.tpl")
 
-  depends_on = ["digitalocean_droplet.dns-c2"]
+  depends_on = [digitalocean_droplet.dns-c2]
 
-  vars {
+  vars = {
     name = "dns_c2_${digitalocean_droplet.dns-c2.*.ipv4_address[count.index]}"
-    hostname = "${digitalocean_droplet.dns-c2.*.ipv4_address[count.index]}"
+    hostname = digitalocean_droplet.dns-c2.*.ipv4_address[count.index]
     user = "root"
-    identityfile = "${path.root}/data/ssh_keys/${digitalocean_droplet.dns-c2.*.ipv4_address[count.index]}"
+    identityfile = path.root}/data/ssh_keys/${digitalocean_droplet.dns-c2.*.ipv4_address[count.index]
   }
 
 }
 
 resource "null_resource" "gen_ssh_config" {
 
-  count = "${var.count}"
+  count = var.count_vm
 
-  triggers {
-    template_rendered = "${data.template_file.ssh_config.*.rendered[count.index]}"
+  triggers = {
+    template_rendered = data.template_file.ssh_config.*.rendered[count.index]
   }
 
   provisioner "local-exec" {
@@ -100,7 +100,7 @@ resource "null_resource" "gen_ssh_config" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_configs/config_${random_id.server.*.hex[count.index]}"
   }
 
diff --git a/modules/digitalocean/dns-c2/variables.tf b/modules/digitalocean/dns-c2/variables.tf
index 0fbda6e..f701e24 100644
--- a/modules/digitalocean/dns-c2/variables.tf
+++ b/modules/digitalocean/dns-c2/variables.tf
@@ -1,9 +1,9 @@
 variable "install" {
-  type = "list"
+  type = list(string)
   default = []
 }
 
-variable "count" {
+variable "count_vm" {
   default = 1
 }
 
@@ -14,13 +14,13 @@ variable "ansible_playbook" {
 
 variable "ansible_arguments" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Additional Ansible Arguments"
 }
 
 variable "ansible_vars" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Environment variables"
 }
 
@@ -29,12 +29,12 @@ variable "size" {
 }
 
 variable "regions" {
-  type = "list"
+  type = list(string)
   default = ["NYC1"]
 }
 
 variable "available_regions" {
-  type = "map"
+  type = map(string)
   default = {
     "NYC1" = "nyc1"
     "NYC2" = "nyc2"
diff --git a/modules/digitalocean/dns-rdir/main.tf b/modules/digitalocean/dns-rdir/main.tf
index 9e189c8..3f1699c 100644
--- a/modules/digitalocean/dns-rdir/main.tf
+++ b/modules/digitalocean/dns-rdir/main.tf
@@ -3,29 +3,29 @@ terraform {
 }
 
 resource "random_id" "server" {
-  count = "${var.count}"
+  count = var.count_vm
   byte_length = 4
 }
 
 resource "tls_private_key" "ssh" {
-  count = "${var.count}"
+  count = var.count_vm
   algorithm = "RSA"
   rsa_bits = 4096
 }
 
 resource "digitalocean_ssh_key" "ssh_key" {
-  count = "${var.count}"
+  count = var.count_vm
   name  = "dns-rdir-key-${random_id.server.*.hex[count.index]}"
-  public_key = "${tls_private_key.ssh.*.public_key_openssh[count.index]}"
+  public_key = tls_private_key.ssh.*.public_key_openssh[count.index]
 }
 
 resource "digitalocean_droplet" "dns-rdir" {
-  count = "${var.count}"
+  count = var.count_vm
   image = "debian-9-x64"
   name = "dns-rdir-${random_id.server.*.hex[count.index]}"
-  region = "${var.available_regions[element(var.regions, count.index)]}"
+  region = var.available_regions[element(var.regions, count.index)]
   ssh_keys = ["${digitalocean_ssh_key.ssh_key.*.id[count.index]}"]
-  size = "${var.size}"
+  size = var.size
 
   provisioner "remote-exec" {
     inline = [
@@ -37,7 +37,7 @@ resource "digitalocean_droplet" "dns-rdir" {
     connection {
         type = "ssh"
         user = "root"
-        private_key = "${tls_private_key.ssh.*.private_key_pem[count.index]}"
+        private_key = tls_private_key.ssh.*.private_key_pem[count.index]
     }
   }
 
@@ -46,26 +46,26 @@ resource "digitalocean_droplet" "dns-rdir" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_keys/${self.ipv4_address}*"
   }
 
 }
 
 resource "null_resource" "ansible_provisioner" {
-  count = "${signum(length(var.ansible_playbook)) == 1 ? var.count : 0}"
+  count = signum(length(var.ansible_playbook)) == 1 ? var.count_vm : 0
 
-  depends_on = ["digitalocean_droplet.dns-rdir"]
+  depends_on = [digitalocean_droplet.dns-rdir]
 
-  triggers {
-    droplet_creation = "${join("," , digitalocean_droplet.dns-rdir.*.id)}"
-    policy_sha1 = "${sha1(file(var.ansible_playbook))}"
+  triggers = {
+    droplet_creation = join("," , digitalocean_droplet.dns-rdir.*.id)
+    policy_sha1 = sha1(file(var.ansible_playbook))
   }
 
   provisioner "local-exec" {
     command = "ansible-playbook ${join(" ", compact(var.ansible_arguments))} --user=root --private-key=./data/ssh_keys/${digitalocean_droplet.dns-rdir.*.ipv4_address[count.index]} -e host=${digitalocean_droplet.dns-rdir.*.ipv4_address[count.index]} ${var.ansible_playbook}"
 
-    environment {
+    environment = {
       ANSIBLE_HOST_KEY_CHECKING = "False"
     }
   }
@@ -77,27 +77,27 @@ resource "null_resource" "ansible_provisioner" {
 
 data "template_file" "ssh_config" {
 
-  count    = "${var.count}"
+  count    = var.count_vm
 
-  template = "${file("./data/templates/ssh_config.tpl")}"
+  template = file("./data/templates/ssh_config.tpl")
 
-  depends_on = ["digitalocean_droplet.dns-rdir"]
+  depends_on = [digitalocean_droplet.dns-rdir]
 
-  vars {
+  vars = {
     name = "dns_rdir_${digitalocean_droplet.dns-rdir.*.ipv4_address[count.index]}"
-    hostname = "${digitalocean_droplet.dns-rdir.*.ipv4_address[count.index]}"
+    hostname = digitalocean_droplet.dns-rdir.*.ipv4_address[count.index]
     user = "root"
-    identityfile = "${path.root}/data/ssh_keys/${digitalocean_droplet.dns-rdir.*.ipv4_address[count.index]}"
+    identityfile = path.root}/data/ssh_keys/${digitalocean_droplet.dns-rdir.*.ipv4_address[count.index]
   }
 
 }
 
 resource "null_resource" "gen_ssh_config" {
 
-  count = "${var.count}"
+  count = var.count_vm
 
-  triggers {
-    template_rendered = "${data.template_file.ssh_config.*.rendered[count.index]}"
+  triggers = {
+    template_rendered = data.template_file.ssh_config.*.rendered[count.index]
   }
 
   provisioner "local-exec" {
@@ -105,7 +105,7 @@ resource "null_resource" "gen_ssh_config" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_configs/config_${random_id.server.*.hex[count.index]}"
   }
 
diff --git a/modules/digitalocean/dns-rdir/variables.tf b/modules/digitalocean/dns-rdir/variables.tf
index 91b1c45..03d8bc0 100644
--- a/modules/digitalocean/dns-rdir/variables.tf
+++ b/modules/digitalocean/dns-rdir/variables.tf
@@ -1,8 +1,8 @@
 variable "redirect_to" {
-  type = "list"
+  type = list(string)
 }
 
-variable "count" {
+variable "count_vm" {
   default = 1
 }
 
@@ -13,13 +13,13 @@ variable "ansible_playbook" {
 
 variable "ansible_arguments" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Additional Ansible Arguments"
 }
 
 variable "ansible_vars" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Environment variables"
 }
 
@@ -28,12 +28,12 @@ variable "size" {
 }
 
 variable "regions" {
-  type = "list"
+  type = list(string)
   default = ["NYC1"]
 }
 
 variable "available_regions" {
-  type = "map"
+  type = map(string)
   default = {
     "NYC1" = "nyc1"
     "NYC2" = "nyc2"
diff --git a/modules/digitalocean/http-c2/README.md b/modules/digitalocean/http-c2/README.md
index da1ae02..04ebd67 100644
--- a/modules/digitalocean/http-c2/README.md
+++ b/modules/digitalocean/http-c2/README.md
@@ -16,7 +16,7 @@ module "http_c2" {
 |---------------------------| -------- | ---------- | -----------
 |`count`                    | No       | Integer    | Number of droplets to launch. Defaults to 1.
 |`size`                     | No       | Integer    | Droplet size to launch. Defaults to `1gb`.
-|`install`                  | No       | List       | Scripts to run on droplet creation. Defaults to "./scripts/core_deps.sh".
+|`install`                  | No       | List       | Scripts to run on droplet creation. Defaults to "./data/scripts/core_deps.sh".
 |`regions`                  | No       | List       | Regions to create Droplet(s) in. Defaults to `NYC1`. Accepted values are NYC1/2/3, SFO1/2, AMS2/3, SGP1, LON1, FRA1, TOR1, BLR1.
 |`ansible_playbook`         | No       | String     | Ansible playbook to run on Droplet creation
 |`ansible_arguments`        | No       | List       | Additional Ansible arguments
diff --git a/modules/digitalocean/http-c2/main.tf b/modules/digitalocean/http-c2/main.tf
index 40af4a5..9ce6678 100644
--- a/modules/digitalocean/http-c2/main.tf
+++ b/modules/digitalocean/http-c2/main.tf
@@ -3,37 +3,37 @@ terraform {
 }
 
 resource "random_id" "server" {
-  count = "${var.count}"
+  count = var.count_vm
   byte_length = 4
 }
 
 resource "tls_private_key" "ssh" {
-  count = "${var.count}"
+  count = var.count_vm
   algorithm = "RSA"
   rsa_bits = 4096
 }
 
 resource "digitalocean_ssh_key" "ssh_key" {
-  count = "${var.count}"
+  count = var.count_vm
   name  = "http-c2-key-${random_id.server.*.hex[count.index]}"
-  public_key = "${tls_private_key.ssh.*.public_key_openssh[count.index]}"
+  public_key = tls_private_key.ssh.*.public_key_openssh[count.index]
 }
 
 resource "digitalocean_droplet" "http-c2" {
-  count = "${var.count}"
+  count = var.count_vm
   image = "debian-9-x64"
   name = "http-c2-${random_id.server.*.hex[count.index]}"
-  region = "${var.available_regions[element(var.regions, count.index)]}"
+  region = var.available_regions[element(var.regions, count.index)]
   ssh_keys = ["${digitalocean_ssh_key.ssh_key.*.id[count.index]}"]
-  size = "${var.size}"
+  size = var.size
 
   provisioner "remote-exec" {
-    scripts = "${concat(list("./data/scripts/core_deps.sh"), var.install)}"
+    scripts = concat(list("./data/scripts/core_deps.sh"), var.install)
 
     connection {
         type = "ssh"
         user = "root"
-        private_key = "${tls_private_key.ssh.*.private_key_pem[count.index]}"
+        private_key = tls_private_key.ssh.*.private_key_pem[count.index]
     }
   }
 
@@ -42,25 +42,25 @@ resource "digitalocean_droplet" "http-c2" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_keys/${self.ipv4_address}*"
   }
 }
 
 resource "null_resource" "ansible_provisioner" {
-  count = "${signum(length(var.ansible_playbook)) == 1 ? var.count : 0}"
+  count = signum(length(var.ansible_playbook)) == 1 ? var.count_vm : 0
 
-  depends_on = ["digitalocean_droplet.http-c2"]
+  depends_on = [digitalocean_droplet.http-c2]
 
-  triggers {
-    droplet_creation = "${join("," , digitalocean_droplet.http-c2.*.id)}"
-    policy_sha1 = "${sha1(file(var.ansible_playbook))}"
+  triggers = {
+    droplet_creation = join("," , digitalocean_droplet.http-c2.*.id)
+    policy_sha1 = sha1(file(var.ansible_playbook))
   }
 
   provisioner "local-exec" {
     command = "ansible-playbook ${join(" ", compact(var.ansible_arguments))} --user=root --private-key=./data/ssh_keys/${digitalocean_droplet.http-c2.*.ipv4_address[count.index]} -e host=${digitalocean_droplet.http-c2.*.ipv4_address[count.index]} ${var.ansible_playbook}"
 
-    environment {
+    environment = {
       ANSIBLE_HOST_KEY_CHECKING = "False"
     }
   }
@@ -72,27 +72,27 @@ resource "null_resource" "ansible_provisioner" {
 
 data "template_file" "ssh_config" {
 
-  count    = "${var.count}"
+  count    = var.count_vm
 
-  template = "${file("./data/templates/ssh_config.tpl")}"
+  template = file("./data/templates/ssh_config.tpl")
 
-  depends_on = ["digitalocean_droplet.http-c2"]
+  depends_on = [digitalocean_droplet.http-c2]
 
-  vars {
+  vars = {
     name = "http_c2_${digitalocean_droplet.http-c2.*.ipv4_address[count.index]}"
-    hostname = "${digitalocean_droplet.http-c2.*.ipv4_address[count.index]}"
+    hostname = digitalocean_droplet.http-c2.*.ipv4_address[count.index]
     user = "root"
-    identityfile = "${path.root}/data/ssh_keys/${digitalocean_droplet.http-c2.*.ipv4_address[count.index]}"
+    identityfile = path.root}/data/ssh_keys/${digitalocean_droplet.http-c2.*.ipv4_address[count.index]
   }
 
 }
 
 resource "null_resource" "gen_ssh_config" {
 
-  count = "${var.count}"
+  count = var.count_vm
 
-  triggers {
-    template_rendered = "${data.template_file.ssh_config.*.rendered[count.index]}"
+  triggers = {
+    template_rendered = data.template_file.ssh_config.*.rendered[count.index]
   }
 
   provisioner "local-exec" {
@@ -100,7 +100,7 @@ resource "null_resource" "gen_ssh_config" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_configs/config_${random_id.server.*.hex[count.index]}"
   }
 
diff --git a/modules/digitalocean/http-c2/variables.tf b/modules/digitalocean/http-c2/variables.tf
index 0fbda6e..f701e24 100644
--- a/modules/digitalocean/http-c2/variables.tf
+++ b/modules/digitalocean/http-c2/variables.tf
@@ -1,9 +1,9 @@
 variable "install" {
-  type = "list"
+  type = list(string)
   default = []
 }
 
-variable "count" {
+variable "count_vm" {
   default = 1
 }
 
@@ -14,13 +14,13 @@ variable "ansible_playbook" {
 
 variable "ansible_arguments" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Additional Ansible Arguments"
 }
 
 variable "ansible_vars" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Environment variables"
 }
 
@@ -29,12 +29,12 @@ variable "size" {
 }
 
 variable "regions" {
-  type = "list"
+  type = list(string)
   default = ["NYC1"]
 }
 
 variable "available_regions" {
-  type = "map"
+  type = map(string)
   default = {
     "NYC1" = "nyc1"
     "NYC2" = "nyc2"
diff --git a/modules/digitalocean/http-rdir/main.tf b/modules/digitalocean/http-rdir/main.tf
index 6b8cd87..d2db245 100644
--- a/modules/digitalocean/http-rdir/main.tf
+++ b/modules/digitalocean/http-rdir/main.tf
@@ -3,29 +3,29 @@ terraform {
 }
 
 resource "random_id" "server" {
-  count = "${var.count}"
+  count = var.count_vm
   byte_length = 4
 }
 
 resource "tls_private_key" "ssh" {
-  count = "${var.count}"
+  count = var.count_vm
   algorithm = "RSA"
   rsa_bits = 4096
 }
 
 resource "digitalocean_ssh_key" "ssh_key" {
-  count = "${var.count}"
+  count = var.count_vm
   name  = "http-rdir-key-${random_id.server.*.hex[count.index]}"
-  public_key = "${tls_private_key.ssh.*.public_key_openssh[count.index]}"
+  public_key = tls_private_key.ssh.*.public_key_openssh[count.index]
 }
 
 resource "digitalocean_droplet" "http-rdir" {
-  count = "${var.count}"
+  count = var.count_vm
   image = "debian-9-x64"
   name = "http-rdir-${random_id.server.*.hex[count.index]}"
-  region = "${var.available_regions[element(var.regions, count.index)]}"
+  region = var.available_regions[element(var.regions, count.index)]
   ssh_keys = ["${digitalocean_ssh_key.ssh_key.*.id[count.index]}"]
-  size = "${var.size}"
+  size = var.size
 
   provisioner "remote-exec" {
     inline = [
@@ -39,7 +39,7 @@ resource "digitalocean_droplet" "http-rdir" {
     connection {
         type = "ssh"
         user = "root"
-        private_key = "${tls_private_key.ssh.*.private_key_pem[count.index]}"
+        private_key = tls_private_key.ssh.*.private_key_pem[count.index]
     }
   }
 
@@ -48,26 +48,26 @@ resource "digitalocean_droplet" "http-rdir" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_keys/${self.ipv4_address}*"
   }
 
 }
 
 resource "null_resource" "ansible_provisioner" {
-  count = "${signum(length(var.ansible_playbook)) == 1 ? var.count : 0}"
+  count = signum(length(var.ansible_playbook)) == 1 ? var.count_vm : 0
 
-  depends_on = ["digitalocean_droplet.http-rdir"]
+  depends_on = [digitalocean_droplet.http-rdir]
 
-  triggers {
-    droplet_creation = "${join("," , digitalocean_droplet.http-rdir.*.id)}"
-    policy_sha1 = "${sha1(file(var.ansible_playbook))}"
+  triggers = {
+    droplet_creation = join("," , digitalocean_droplet.http-rdir.*.id)
+    policy_sha1 = sha1(file(var.ansible_playbook))
   }
 
   provisioner "local-exec" {
     command = "ansible-playbook ${join(" ", compact(var.ansible_arguments))} --user=root --private-key=./data/ssh_keys/${digitalocean_droplet.http-rdir.*.ipv4_address[count.index]} -e host=${digitalocean_droplet.http-rdir.*.ipv4_address[count.index]} ${var.ansible_playbook}"
 
-    environment {
+    environment = {
       ANSIBLE_HOST_KEY_CHECKING = "False"
     }
   }
@@ -79,27 +79,27 @@ resource "null_resource" "ansible_provisioner" {
 
 data "template_file" "ssh_config" {
 
-  count    = "${var.count}"
+  count    = var.count_vm
 
-  template = "${file("./data/templates/ssh_config.tpl")}"
+  template = file("./data/templates/ssh_config.tpl")
 
-  depends_on = ["digitalocean_droplet.http-rdir"]
+  depends_on = [digitalocean_droplet.http-rdir]
 
-  vars {
+  vars = {
     name = "http_rdir_${digitalocean_droplet.http-rdir.*.ipv4_address[count.index]}"
-    hostname = "${digitalocean_droplet.http-rdir.*.ipv4_address[count.index]}"
+    hostname = digitalocean_droplet.http-rdir.*.ipv4_address[count.index]
     user = "root"
-    identityfile = "${path.root}/data/ssh_keys/${digitalocean_droplet.http-rdir.*.ipv4_address[count.index]}"
+    identityfile = path.root}/data/ssh_keys/${digitalocean_droplet.http-rdir.*.ipv4_address[count.index]
   }
 
 }
 
 resource "null_resource" "gen_ssh_config" {
 
-  count = "${var.count}"
+  count = var.count_vm
 
-  triggers {
-    template_rendered = "${data.template_file.ssh_config.*.rendered[count.index]}"
+  triggers = {
+    template_rendered = data.template_file.ssh_config.*.rendered[count.index]
   }
 
   provisioner "local-exec" {
@@ -107,7 +107,7 @@ resource "null_resource" "gen_ssh_config" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_configs/config_${random_id.server.*.hex[count.index]}"
   }
 
diff --git a/modules/digitalocean/http-rdir/variables.tf b/modules/digitalocean/http-rdir/variables.tf
index 91b1c45..03d8bc0 100644
--- a/modules/digitalocean/http-rdir/variables.tf
+++ b/modules/digitalocean/http-rdir/variables.tf
@@ -1,8 +1,8 @@
 variable "redirect_to" {
-  type = "list"
+  type = list(string)
 }
 
-variable "count" {
+variable "count_vm" {
   default = 1
 }
 
@@ -13,13 +13,13 @@ variable "ansible_playbook" {
 
 variable "ansible_arguments" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Additional Ansible Arguments"
 }
 
 variable "ansible_vars" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Environment variables"
 }
 
@@ -28,12 +28,12 @@ variable "size" {
 }
 
 variable "regions" {
-  type = "list"
+  type = list(string)
   default = ["NYC1"]
 }
 
 variable "available_regions" {
-  type = "map"
+  type = map(string)
   default = {
     "NYC1" = "nyc1"
     "NYC2" = "nyc2"
diff --git a/modules/digitalocean/phishing-server/main.tf b/modules/digitalocean/phishing-server/main.tf
index 30d271f..0e3f919 100644
--- a/modules/digitalocean/phishing-server/main.tf
+++ b/modules/digitalocean/phishing-server/main.tf
@@ -3,29 +3,29 @@ terraform {
 }
 
 resource "random_id" "server" {
-  count = "${var.count}"
+  count = var.count_vm
   byte_length = 4
 }
 
 resource "tls_private_key" "ssh" {
-  count = "${var.count}"
+  count = var.count_vm
   algorithm = "RSA"
   rsa_bits = 4096
 }
 
 resource "digitalocean_ssh_key" "ssh_key" {
-  count = "${var.count}"
+  count = var.count_vm
   name  = "phishing-server-key-${random_id.server.*.hex[count.index]}"
-  public_key = "${tls_private_key.ssh.*.public_key_openssh[count.index]}"
+  public_key = tls_private_key.ssh.*.public_key_openssh[count.index]
 }
 
 resource "digitalocean_droplet" "phishing-server" {
-  count = "${var.count}"
+  count = var.count_vm
   image = "debian-9-x64"
   name = "phishing-server-${random_id.server.*.hex[count.index]}"
-  region = "${var.available_regions[element(var.regions, count.index)]}"
+  region = var.available_regions[element(var.regions, count.index)]
   ssh_keys = ["${digitalocean_ssh_key.ssh_key.*.id[count.index]}"]
-  size = "${var.size}"
+  size = var.size
 
   provisioner "remote-exec" {
     inline = [
@@ -38,7 +38,7 @@ resource "digitalocean_droplet" "phishing-server" {
     connection {
         type = "ssh"
         user = "root"
-        private_key = "${tls_private_key.ssh.*.private_key_pem[count.index]}"
+        private_key = tls_private_key.ssh.*.private_key_pem[count.index]
     }
   }
 
@@ -47,26 +47,26 @@ resource "digitalocean_droplet" "phishing-server" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./ssh_keys/${self.ipv4_address}*"
   }
 
 }
 
 resource "null_resource" "ansible_provisioner" {
-  count = "${signum(length(var.ansible_playbook)) == 1 ? var.count : 0}"
+  count = signum(length(var.ansible_playbook)) == 1 ? var.count_vm : 0
 
-  depends_on = ["digitalocean_droplet.phishing-server"]
+  depends_on = [digitalocean_droplet.phishing-server]
 
-  triggers {
-    droplet_creation = "${join("," , digitalocean_droplet.phishing-server.*.id)}"
-    policy_sha1 = "${sha1(file(var.ansible_playbook))}"
+  triggers = {
+    droplet_creation = join("," , digitalocean_droplet.phishing-server.*.id)
+    policy_sha1 = sha1(file(var.ansible_playbook))
   }
 
   provisioner "local-exec" {
     command = "ansible-playbook ${join(" ", compact(var.ansible_arguments))} --user=root --private-key=./data/ssh_keys/${digitalocean_droplet.phishing-server.*.ipv4_address[count.index]} -e host=${digitalocean_droplet.phishing-server.*.ipv4_address[count.index]} ${var.ansible_playbook}"
 
-    environment {
+    environment = {
       ANSIBLE_HOST_KEY_CHECKING = "False"
     }
   }
@@ -78,27 +78,27 @@ resource "null_resource" "ansible_provisioner" {
 
 data "template_file" "ssh_config" {
 
-  count    = "${var.count}"
+  count    = var.count_vm
 
-  template = "${file("./data/templates/ssh_config.tpl")}"
+  template = file("./data/templates/ssh_config.tpl")
 
-  depends_on = ["digitalocean_droplet.phishing-server"]
+  depends_on = [digitalocean_droplet.phishing-server]
 
-  vars {
+  vars = {
     name = "phishing_server_${digitalocean_droplet.phishing-server.*.ipv4_address[count.index]}"
-    hostname = "${digitalocean_droplet.phishing-server.*.ipv4_address[count.index]}"
+    hostname = digitalocean_droplet.phishing-server.*.ipv4_address[count.index]
     user = "root"
-    identityfile = "${path.root}/data/ssh_keys/${digitalocean_droplet.phishing-server.*.ipv4_address[count.index]}"
+    identityfile = path.root}/data/ssh_keys/${digitalocean_droplet.phishing-server.*.ipv4_address[count.index]
   }
 
 }
 
 resource "null_resource" "gen_ssh_config" {
 
-  count = "${var.count}"
+  count = var.count_vm
 
-  triggers {
-    template_rendered = "${data.template_file.ssh_config.*.rendered[count.index]}"
+  triggers = {
+    template_rendered = data.template_file.ssh_config.*.rendered[count.index]
   }
 
   provisioner "local-exec" {
@@ -106,7 +106,7 @@ resource "null_resource" "gen_ssh_config" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_configs/config_${random_id.server.*.hex[count.index]}"
   }
 
diff --git a/modules/digitalocean/phishing-server/variables.tf b/modules/digitalocean/phishing-server/variables.tf
index 916007c..a547826 100644
--- a/modules/digitalocean/phishing-server/variables.tf
+++ b/modules/digitalocean/phishing-server/variables.tf
@@ -1,4 +1,4 @@
-variable "count" {
+variable "count_vm" {
   default = 1
 }
 
@@ -9,13 +9,13 @@ variable "ansible_playbook" {
 
 variable "ansible_arguments" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Additional Ansible Arguments"
 }
 
 variable "ansible_vars" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Environment variables"
 }
 
@@ -24,12 +24,12 @@ variable "size" {
 }
 
 variable "regions" {
-  type = "list"
+  type = list(string)
   default = ["NYC1"]
 }
 
 variable "available_regions" {
-  type = "map"
+  type = map(string)
   default = {
     "NYC1" = "nyc1"
     "NYC2" = "nyc2"
diff --git a/modules/godaddy/create-dns-record/main.tf b/modules/godaddy/create-dns-record/main.tf
index e2760cd..206c31e 100644
--- a/modules/godaddy/create-dns-record/main.tf
+++ b/modules/godaddy/create-dns-record/main.tf
@@ -3,13 +3,13 @@ terraform {
 }
 
 resource "godaddy_domain_record" "record" {
-  count = "${var.count}"
-  domain   = "${var.domain}"
+  count = var.count_vm
+  domain   = var.domain
 
   record {
-    name = "${element(keys(var.records), count.index)}"
-    type = "${var.type}"
-    data = "${lookup(var.records, element(keys(var.records), count.index))}"
-    ttl = "${var.ttl}"
+    name = element(keys(var.records), count.index)
+    type = var.type
+    data = lookup(var.records, element(keys(var.records), count.index))
+    ttl = var.ttl
   }
 }
diff --git a/modules/godaddy/create-dns-record/outputs.tf b/modules/godaddy/create-dns-record/outputs.tf
index 4e0b481..4adec69 100644
--- a/modules/godaddy/create-dns-record/outputs.tf
+++ b/modules/godaddy/create-dns-record/outputs.tf
@@ -1,3 +1,3 @@
 output "records" {
-  value = "${var.records}"
+  value = var.records
 }
\ No newline at end of file
diff --git a/modules/godaddy/create-dns-record/variables.tf b/modules/godaddy/create-dns-record/variables.tf
index fa88f64..506cb46 100644
--- a/modules/godaddy/create-dns-record/variables.tf
+++ b/modules/godaddy/create-dns-record/variables.tf
@@ -2,7 +2,7 @@ variable "domain" {}
 
 variable "type" {}
 
-variable "count" {
+variable "count_vm" {
   default = 1
 }
 
@@ -11,5 +11,5 @@ variable "ttl" {
 }
 
 variable "records" {
-  type = "map"
+  type = map(string)
 }
\ No newline at end of file
diff --git a/modules/google/dns-c2/main.tf b/modules/google/dns-c2/main.tf
index b180dd3..315cb84 100644
--- a/modules/google/dns-c2/main.tf
+++ b/modules/google/dns-c2/main.tf
@@ -3,25 +3,25 @@ terraform {
 }
 
 provider "google" {
-  project = "${var.project}"
+  project = var.project
 }
 
 resource "tls_private_key" "ssh" {
-  count = "${var.count}"
+  count = var.count_vm
   algorithm = "RSA"
   rsa_bits = 4096
 }
 
 resource "random_id" "server" {
-  count = "${var.count}"
+  count = var.count_vm
   byte_length = 4
 }
 
 resource "google_compute_instance" "dns-c2" {
-  count = "${var.count}"
-  machine_type = "${var.machine_type}"
+  count = var.count_vm
+  machine_type = var.machine_type
   name = "dns-c2-${random_id.server.*.hex[count.index]}"
-  zone = "${var.available_zones[element(var.zones, count.index)]}"
+  zone = var.available_zones[element(var.zones, count.index)]
   can_ip_forward = true
 
   boot_disk {
@@ -36,12 +36,12 @@ resource "google_compute_instance" "dns-c2" {
   }
   
   provisioner "remote-exec" {
-    scripts = "${concat(list("./scripts/core_deps.sh"), var.install)}"
+    scripts = concat(list("./data/scripts/core_deps.sh"), var.install)
 
     connection {
       type = "ssh"
       user = "root"
-      private_key = "${tls_private_key.ssh.*.private_key_pem[count.index]}"
+      private_key = tls_private_key.ssh.*.private_key_pem[count.index]
     }
   }
 
@@ -64,25 +64,25 @@ resource "google_compute_instance" "dns-c2" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_keys/${self.network_interface.0.access_config.0.assigned_nat_ip}*"
   }
 }
 
 resource "null_resource" "ansible_provisioner" {
-  count = "${signum(length(var.ansible_playbook)) == 1 ? var.count : 0}"
+  count = signum(length(var.ansible_playbook)) == 1 ? var.count_vm : 0
 
-  depends_on = ["google_compute_instance.dns-c2"]
+  depends_on = [google_compute_instance.dns-c2]
 
-  triggers {
-    droplet_creation = "${join("," , google_compute_instance.dns-c2.*.id)}"
-    policy_sha1 = "${sha1(file(var.ansible_playbook))}"
+  triggers = {
+    droplet_creation = join("," , google_compute_instance.dns-c2.*.id)
+    policy_sha1 = sha1(file(var.ansible_playbook))
   }
 
   provisioner "local-exec" {
     command = "ansible-playbook ${join(" ", compact(var.ansible_arguments))} --user=root --private-key=./data/ssh_keys/${google_compute_instance.dns-c2.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]} -e host=${google_compute_instance.dns-c2.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]} ${var.ansible_playbook}"
 
-    environment {
+    environment = {
       ANSIBLE_HOST_KEY_CHECKING = "False"
     }
   }
@@ -94,27 +94,27 @@ resource "null_resource" "ansible_provisioner" {
 
 data "template_file" "ssh_config" {
 
-  count    = "${var.count}"
+  count    = var.count_vm
 
-  template = "${file("./data/templates/ssh_config.tpl")}"
+  template = file("./data/templates/ssh_config.tpl")
 
-  depends_on = ["google_compute_instance.dns-c2"]
+  depends_on = [google_compute_instance.dns-c2]
 
-  vars {
+  vars = {
     name = "dns_c2_${google_compute_instance.dns-c2.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]}"
-    hostname = "${google_compute_instance.dns-c2.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]}"
+    hostname = google_compute_instance.dns-c2.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]
     user = "root"
-    identityfile = "${path.root}/data/ssh_keys/${google_compute_instance.dns-c2.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]}"
+    identityfile = path.root}/data/ssh_keys/${google_compute_instance.dns-c2.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]
   }
 
 }
 
 resource "null_resource" "gen_ssh_config" {
 
-  count = "${var.count}"
+  count = var.count_vm
 
-  triggers {
-    template_rendered = "${data.template_file.ssh_config.*.rendered[count.index]}"
+  triggers = {
+    template_rendered = data.template_file.ssh_config.*.rendered[count.index]
   }
 
   provisioner "local-exec" {
@@ -122,7 +122,7 @@ resource "null_resource" "gen_ssh_config" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_configs/config_${random_id.server.*.hex[count.index]}"
   }
 
diff --git a/modules/google/dns-c2/variables.tf b/modules/google/dns-c2/variables.tf
index d1b5b88..a12dd7e 100644
--- a/modules/google/dns-c2/variables.tf
+++ b/modules/google/dns-c2/variables.tf
@@ -1,8 +1,8 @@
 variable "redirect_to" {
-  type = "list"
+  type = list(string)
 }
 
-variable "count" {
+variable "count_vm" {
   default = 1
 }
 
@@ -13,13 +13,13 @@ variable "ansible_playbook" {
 
 variable "ansible_arguments" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Additional Ansible Arguments"
 }
 
 variable "ansible_vars" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Environment variables"
 }
 
@@ -32,12 +32,12 @@ variable "project" {
 }
 
 variable "zones" {
-  type = "list"
+  type = list(string)
   default = ["Canada-1"]
 }
 
 variable "available_zones" {
-  type = "map"
+  type = map(string)
   default = {
     "Canada-1" = "northamerica-northeast1-a"
     "Canada-2" = "northamerica-northeast1-b"
diff --git a/modules/google/dns-rdir/main.tf b/modules/google/dns-rdir/main.tf
index f32d522..9adf393 100644
--- a/modules/google/dns-rdir/main.tf
+++ b/modules/google/dns-rdir/main.tf
@@ -3,25 +3,25 @@ terraform {
 }
 
 provider "google" {
-  project = "${var.project}"
+  project = var.project
 }
 
 resource "tls_private_key" "ssh" {
-  count = "${var.count}"
+  count = var.count_vm
   algorithm = "RSA"
   rsa_bits = 4096
 }
 
 resource "random_id" "server" {
-  count = "${var.count}"
+  count = var.count_vm
   byte_length = 4
 }
 
 resource "google_compute_instance" "dns-rdir" {
-  count = "${var.count}"
-  machine_type = "${var.machine_type}"
+  count = var.count_vm
+  machine_type = var.machine_type
   name = "dns-rdir-${random_id.server.*.hex[count.index]}"
-  zone = "${var.available_zones[element(var.zones, count.index)]}"
+  zone = var.available_zones[element(var.zones, count.index)]
   can_ip_forward = true
 
   boot_disk {
@@ -45,7 +45,7 @@ resource "google_compute_instance" "dns-rdir" {
     connection {
       type = "ssh"
       user = "root"
-      private_key = "${tls_private_key.ssh.*.private_key_pem[count.index]}"
+      private_key = tls_private_key.ssh.*.private_key_pem[count.index]
     }
   }
 
@@ -68,25 +68,25 @@ resource "google_compute_instance" "dns-rdir" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_keys/${self.network_interface.0.access_config.0.assigned_nat_ip}*"
   }
 }
 
 resource "null_resource" "ansible_provisioner" {
-  count = "${signum(length(var.ansible_playbook)) == 1 ? var.count : 0}"
+  count = signum(length(var.ansible_playbook)) == 1 ? var.count_vm : 0
 
-  depends_on = ["google_compute_instance.dns-rdir"]
+  depends_on = [google_compute_instance.dns-rdir]
 
-  triggers {
-    droplet_creation = "${join("," , google_compute_instance.dns-rdir.*.id)}"
-    policy_sha1 = "${sha1(file(var.ansible_playbook))}"
+  triggers = {
+    droplet_creation = join("," , google_compute_instance.dns-rdir.*.id)
+    policy_sha1 = sha1(file(var.ansible_playbook))
   }
 
   provisioner "local-exec" {
     command = "ansible-playbook ${join(" ", compact(var.ansible_arguments))} --user=root --private-key=./data/ssh_keys/${google_compute_instance.dns-rdir.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]} -e host=${google_compute_instance.dns-rdir.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]} ${var.ansible_playbook}"
 
-    environment {
+    environment = {
       ANSIBLE_HOST_KEY_CHECKING = "False"
     }
   }
@@ -98,26 +98,26 @@ resource "null_resource" "ansible_provisioner" {
 
 data "template_file" "ssh_config" {
 
-  count    = "${var.count}"
+  count    = var.count_vm
 
-  template = "${file("./data/templates/ssh_config.tpl")}"
+  template = file("./data/templates/ssh_config.tpl")
 
-  depends_on = ["google_compute_instance.dns-rdir"]
+  depends_on = [google_compute_instance.dns-rdir]
 
-  vars {
+  vars = {
     name = "dns_c2_${google_compute_instance.dns-rdir.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]}"
-    hostname = "${google_compute_instance.dns-rdir.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]}"
+    hostname = google_compute_instance.dns-rdir.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]
     user = "root"
-    identityfile = "${path.root}/data/ssh_keys/${google_compute_instance.dns-rdir.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]}"
+    identityfile = path.root}/data/ssh_keys/${google_compute_instance.dns-rdir.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]
   }
 }
 
 resource "null_resource" "gen_ssh_config" {
 
-  count = "${var.count}"
+  count = var.count_vm
 
-  triggers {
-    template_rendered = "${data.template_file.ssh_config.*.rendered[count.index]}"
+  triggers = {
+    template_rendered = data.template_file.ssh_config.*.rendered[count.index]
   }
 
   provisioner "local-exec" {
@@ -125,7 +125,7 @@ resource "null_resource" "gen_ssh_config" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_configs/config_${random_id.server.*.hex[count.index]}"
   }
 
diff --git a/modules/google/dns-rdir/variables.tf b/modules/google/dns-rdir/variables.tf
index d1b5b88..a12dd7e 100644
--- a/modules/google/dns-rdir/variables.tf
+++ b/modules/google/dns-rdir/variables.tf
@@ -1,8 +1,8 @@
 variable "redirect_to" {
-  type = "list"
+  type = list(string)
 }
 
-variable "count" {
+variable "count_vm" {
   default = 1
 }
 
@@ -13,13 +13,13 @@ variable "ansible_playbook" {
 
 variable "ansible_arguments" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Additional Ansible Arguments"
 }
 
 variable "ansible_vars" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Environment variables"
 }
 
@@ -32,12 +32,12 @@ variable "project" {
 }
 
 variable "zones" {
-  type = "list"
+  type = list(string)
   default = ["Canada-1"]
 }
 
 variable "available_zones" {
-  type = "map"
+  type = map(string)
   default = {
     "Canada-1" = "northamerica-northeast1-a"
     "Canada-2" = "northamerica-northeast1-b"
diff --git a/modules/google/http-c2/main.tf b/modules/google/http-c2/main.tf
index ef90eb7..8224a68 100644
--- a/modules/google/http-c2/main.tf
+++ b/modules/google/http-c2/main.tf
@@ -3,25 +3,25 @@ terraform {
 }
 
 provider "google" {
-  project = "${var.project}"
+  project = var.project
 }
 
 resource "tls_private_key" "ssh" {
-  count = "${var.count}"
+  count = var.count_vm
   algorithm = "RSA"
   rsa_bits = 4096
 }
 
 resource "random_id" "server" {
-  count = "${var.count}"
+  count = var.count_vm
   byte_length = 4
 }
 
 resource "google_compute_instance" "http-c2" {
-  count = "${var.count}"
-  machine_type = "${var.machine_type}"
+  count = var.count_vm
+  machine_type = var.machine_type
   name = "http-c2-${random_id.server.*.hex[count.index]}"
-  zone = "${var.available_zones[element(var.zones, count.index)]}"
+  zone = var.available_zones[element(var.zones, count.index)]
   can_ip_forward = true  
 
   boot_disk {
@@ -50,12 +50,12 @@ resource "google_compute_instance" "http-c2" {
   }
 
   provisioner "remote-exec" {
-    scripts = "${concat(list("./scripts/core_deps.sh"), var.install)}"
+    scripts = concat(list("./data/scripts/core_deps.sh"), var.install)
     
     connection {
       type = "ssh"
       user = "root"
-      private_key = "${tls_private_key.ssh.*.private_key_pem[count.index]}"
+      private_key = tls_private_key.ssh.*.private_key_pem[count.index]
     }
   }
 
@@ -64,25 +64,25 @@ resource "google_compute_instance" "http-c2" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_keys/${self.network_interface.0.access_config.0.assigned_nat_ip}*"
   }
 }
 
 resource "null_resource" "ansible_provisioner" {
-  count = "${signum(length(var.ansible_playbook)) == 1 ? var.count : 0}"
+  count = signum(length(var.ansible_playbook)) == 1 ? var.count_vm : 0
 
-  depends_on = ["google_compute_instance.http-c2"]
+  depends_on = [google_compute_instance.http-c2]
 
-  triggers {
-    droplet_creation = "${join("," , google_compute_instance.http-c2.*.id)}"
-    policy_sha1 = "${sha1(file(var.ansible_playbook))}"
+  triggers = {
+    droplet_creation = join("," , google_compute_instance.http-c2.*.id)
+    policy_sha1 = sha1(file(var.ansible_playbook))
   }
 
   provisioner "local-exec" {
     command = "ansible-playbook ${join(" ", compact(var.ansible_arguments))} --user=root --private-key=./data/ssh_keys/${google_compute_instance.http-c2.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]} -e host=${google_compute_instance.http-c2.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]} ${var.ansible_playbook}"
 
-    environment {
+    environment = {
       ANSIBLE_HOST_KEY_CHECKING = "False"
     }
   }
@@ -94,26 +94,26 @@ resource "null_resource" "ansible_provisioner" {
 
 data "template_file" "ssh_config" {
 
-  count    = "${var.count}"
+  count    = var.count_vm
 
-  template = "${file("./data/templates/ssh_config.tpl")}"
+  template = file("./data/templates/ssh_config.tpl")
 
-  depends_on = ["google_compute_instance.http-c2"]
+  depends_on = [google_compute_instance.http-c2]
 
-  vars {
+  vars = {
     name = "dns_c2_${google_compute_instance.http-c2.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]}"
-    hostname = "${google_compute_instance.http-c2.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]}"
+    hostname = google_compute_instance.http-c2.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]
     user = "root"
-    identityfile = "${path.root}/data/ssh_keys/${google_compute_instance.http-c2.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]}"
+    identityfile = path.root}/data/ssh_keys/${google_compute_instance.http-c2.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]
   }
 }
 
 resource "null_resource" "gen_ssh_config" {
 
-  count = "${var.count}"
+  count = var.count_vm
 
-  triggers {
-    template_rendered = "${data.template_file.ssh_config.*.rendered[count.index]}"
+  triggers = {
+    template_rendered = data.template_file.ssh_config.*.rendered[count.index]
   }
 
   provisioner "local-exec" {
@@ -121,7 +121,7 @@ resource "null_resource" "gen_ssh_config" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_configs/config_${random_id.server.*.hex[count.index]}"
   }
 
diff --git a/modules/google/http-c2/variables.tf b/modules/google/http-c2/variables.tf
index 475b6a0..948a660 100644
--- a/modules/google/http-c2/variables.tf
+++ b/modules/google/http-c2/variables.tf
@@ -1,4 +1,4 @@
-variable "count" {
+variable "count_vm" {
   default = 1
 }
 
@@ -9,13 +9,13 @@ variable "ansible_playbook" {
 
 variable "ansible_arguments" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Additional Ansible Arguments"
 }
 
 variable "ansible_vars" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Environment variables"
 }
 
@@ -28,28 +28,28 @@ variable "project" {
 }
 
 variable "zones" {
-  type = "list"
+  type = list(string)
   default = ["Canada-1"]
 }
 
 variable "install" {
-  type = "list"
+  type = list(string)
   default = []
 }
 
 /*
 variable "install" {
-  type = "map"
+  type = map(string)
   default = {
-    "empire" = "./scripts/install_empire.sh"
-    "metasploit" = "./scripts/install_metasploit.sh"
-    "cobaltstrike" = "./scripts/install_cobalt_strike.sh"
+    "empire" = "./data/scripts/install_empire.sh"
+    "metasploit" = "./data/scripts/install_metasploit.sh"
+    "cobaltstrike" = "./data/scripts/install_cobalt_strike.sh"
   }
 }
 */
 
 variable "available_zones" {
-  type = "map"
+  type = map(string)
   default = {
     "Canada-1" = "northamerica-northeast1-a"
     "Canada-2" = "northamerica-northeast1-b"
diff --git a/modules/google/http-rdir/main.tf b/modules/google/http-rdir/main.tf
index 17c80a7..e8b1264 100644
--- a/modules/google/http-rdir/main.tf
+++ b/modules/google/http-rdir/main.tf
@@ -3,25 +3,25 @@ terraform {
 }
 
 provider "google" {
-  project = "${var.project}"
+  project = var.project
 }
 
 resource "tls_private_key" "ssh" {
-  count = "${var.count}"
+  count = var.count_vm
   algorithm = "RSA"
   rsa_bits = 4096
 }
 
 resource "random_id" "server" {
-  count = "${var.count}"
+  count = var.count_vm
   byte_length = 4
 }
 
 resource "google_compute_instance" "http-rdir" {
-  count = "${var.count}"
-  machine_type = "${var.machine_type}"
+  count = var.count_vm
+  machine_type = var.machine_type
   name = "http-rdir-${random_id.server.*.hex[count.index]}"
-  zone = "${var.available_zones[element(var.zones, count.index)]}"
+  zone = var.available_zones[element(var.zones, count.index)]
   can_ip_forward = true
 
   boot_disk {
@@ -47,7 +47,7 @@ resource "google_compute_instance" "http-rdir" {
     connection {
       type = "ssh"
       user = "root"
-      private_key = "${tls_private_key.ssh.*.private_key_pem[count.index]}"
+      private_key = tls_private_key.ssh.*.private_key_pem[count.index]
     }
   }
 
@@ -70,25 +70,25 @@ resource "google_compute_instance" "http-rdir" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_keys/${self.network_interface.0.access_config.0.assigned_nat_ip}*"
   }
 }
 
 resource "null_resource" "ansible_provisioner" {
-  count = "${signum(length(var.ansible_playbook)) == 1 ? var.count : 0}"
+  count = signum(length(var.ansible_playbook)) == 1 ? var.count_vm : 0
 
-  depends_on = ["google_compute_instance.http-rdir"]
+  depends_on = [google_compute_instance.http-rdir]
 
-  triggers {
-    droplet_creation = "${join("," , google_compute_instance.http-rdir.*.id)}"
-    policy_sha1 = "${sha1(file(var.ansible_playbook))}"
+  triggers = {
+    droplet_creation = join("," , google_compute_instance.http-rdir.*.id)
+    policy_sha1 = sha1(file(var.ansible_playbook))
   }
 
   provisioner "local-exec" {
     command = "ansible-playbook ${join(" ", compact(var.ansible_arguments))} --user=root --private-key=./data/ssh_keys/${google_compute_instance.http-rdir.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]} -e host=${google_compute_instance.http-rdir.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]} ${var.ansible_playbook}"
 
-    environment {
+    environment = {
       ANSIBLE_HOST_KEY_CHECKING = "False"
     }
   }
@@ -100,26 +100,26 @@ resource "null_resource" "ansible_provisioner" {
 
 data "template_file" "ssh_config" {
 
-  count    = "${var.count}"
+  count    = var.count_vm
 
-  template = "${file("./data/templates/ssh_config.tpl")}"
+  template = file("./data/templates/ssh_config.tpl")
 
-  depends_on = ["google_compute_instance.http-rdir"]
+  depends_on = [google_compute_instance.http-rdir]
 
-  vars {
+  vars = {
     name = "dns_c2_${google_compute_instance.http-rdir.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]}"
-    hostname = "${google_compute_instance.http-rdir.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]}"
+    hostname = google_compute_instance.http-rdir.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]
     user = "root"
-    identityfile = "${path.root}/data/ssh_keys/${google_compute_instance.http-rdir.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]}"
+    identityfile = path.root}/data/ssh_keys/${google_compute_instance.http-rdir.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]
   }
 }
 
 resource "null_resource" "gen_ssh_config" {
 
-  count = "${var.count}"
+  count = var.count_vm
 
-  triggers {
-    template_rendered = "${data.template_file.ssh_config.*.rendered[count.index]}"
+  triggers = {
+    template_rendered = data.template_file.ssh_config.*.rendered[count.index]
   }
 
   provisioner "local-exec" {
@@ -127,7 +127,7 @@ resource "null_resource" "gen_ssh_config" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_configs/config_${random_id.server.*.hex[count.index]}"
   }
 }
\ No newline at end of file
diff --git a/modules/google/http-rdir/variables.tf b/modules/google/http-rdir/variables.tf
index d1b5b88..a12dd7e 100644
--- a/modules/google/http-rdir/variables.tf
+++ b/modules/google/http-rdir/variables.tf
@@ -1,8 +1,8 @@
 variable "redirect_to" {
-  type = "list"
+  type = list(string)
 }
 
-variable "count" {
+variable "count_vm" {
   default = 1
 }
 
@@ -13,13 +13,13 @@ variable "ansible_playbook" {
 
 variable "ansible_arguments" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Additional Ansible Arguments"
 }
 
 variable "ansible_vars" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Environment variables"
 }
 
@@ -32,12 +32,12 @@ variable "project" {
 }
 
 variable "zones" {
-  type = "list"
+  type = list(string)
   default = ["Canada-1"]
 }
 
 variable "available_zones" {
-  type = "map"
+  type = map(string)
   default = {
     "Canada-1" = "northamerica-northeast1-a"
     "Canada-2" = "northamerica-northeast1-b"
diff --git a/modules/google/phishing-server/main.tf b/modules/google/phishing-server/main.tf
index 5cb7f59..9c91102 100644
--- a/modules/google/phishing-server/main.tf
+++ b/modules/google/phishing-server/main.tf
@@ -3,25 +3,25 @@ terraform {
 }
 
 provider "google" {
-  project = "${var.project}"
+  project = var.project
 }
 
 resource "tls_private_key" "ssh" {
-  count = "${var.count}"
+  count = var.count_vm
   algorithm = "RSA"
   rsa_bits = 4096
 }
 
 resource "random_id" "server" {
-  count = "${var.count}"
+  count = var.count_vm
   byte_length = 4
 }
 
 resource "google_compute_instance" "phishing-server" {
-  count = "${var.count}"
-  machine_type = "${var.machine_type}"
+  count = var.count_vm
+  machine_type = var.machine_type
   name = "phishing-server-${random_id.server.*.hex[count.index]}"
-  zone = "${var.available_zones[element(var.zones, count.index)]}"
+  zone = var.available_zones[element(var.zones, count.index)]
   can_ip_forward = true
 
   boot_disk {
@@ -46,7 +46,7 @@ resource "google_compute_instance" "phishing-server" {
     connection {
       type = "ssh"
       user = "root"
-      private_key = "${tls_private_key.ssh.*.private_key_pem[count.index]}"
+      private_key = tls_private_key.ssh.*.private_key_pem[count.index]
     }
   }
 
@@ -69,25 +69,25 @@ resource "google_compute_instance" "phishing-server" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_keys/${self.network_interface.0.access_config.0.assigned_nat_ip}*"
   }
 }
 
 resource "null_resource" "ansible_provisioner" {
-  count = "${signum(length(var.ansible_playbook)) == 1 ? var.count : 0}"
+  count = signum(length(var.ansible_playbook)) == 1 ? var.count_vm : 0
 
-  depends_on = ["google_compute_instance.phishing-server"]
+  depends_on = [google_compute_instance.phishing-server]
 
-  triggers {
-    droplet_creation = "${join("," , google_compute_instance.phishing-server.*.id)}"
-    policy_sha1 = "${sha1(file(var.ansible_playbook))}"
+  triggers = {
+    droplet_creation = join("," , google_compute_instance.phishing-server.*.id)
+    policy_sha1 = sha1(file(var.ansible_playbook))
   }
 
   provisioner "local-exec" {
     command = "ansible-playbook ${join(" ", compact(var.ansible_arguments))} --user=root --private-key=./data/ssh_keys/${google_compute_instance.phishing-server.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]} -e host=${google_compute_instance.phishing-server.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]} ${var.ansible_playbook}"
 
-    environment {
+    environment = {
       ANSIBLE_HOST_KEY_CHECKING = "False"
     }
   }
@@ -99,26 +99,26 @@ resource "null_resource" "ansible_provisioner" {
 
 data "template_file" "ssh_config" {
 
-  count    = "${var.count}"
+  count    = var.count_vm
 
-  template = "${file("./data/templates/ssh_config.tpl")}"
+  template = file("./data/templates/ssh_config.tpl")
 
-  depends_on = ["google_compute_instance.phishing-server"]
+  depends_on = [google_compute_instance.phishing-server]
 
-  vars {
+  vars = {
     name = "dns_c2_${google_compute_instance.phishing-server.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]}"
-    hostname = "${google_compute_instance.phishing-server.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]}"
+    hostname = google_compute_instance.phishing-server.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]
     user = "root"
-    identityfile = "${path.root}/data/ssh_keys/${google_compute_instance.phishing-server.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]}"
+    identityfile = path.root}/data/ssh_keys/${google_compute_instance.phishing-server.*.network_interface.0.access_config.0.assigned_nat_ip[count.index]
   }
 }
 
 resource "null_resource" "gen_ssh_config" {
 
-  count = "${var.count}"
+  count = var.count_vm
 
-  triggers {
-    template_rendered = "${data.template_file.ssh_config.*.rendered[count.index]}"
+  triggers = {
+    template_rendered = data.template_file.ssh_config.*.rendered[count.index]
   }
 
   provisioner "local-exec" {
@@ -126,7 +126,7 @@ resource "null_resource" "gen_ssh_config" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_configs/config_${random_id.server.*.hex[count.index]}"
   }
 }
\ No newline at end of file
diff --git a/modules/google/phishing-server/variables.tf b/modules/google/phishing-server/variables.tf
index d1b5b88..a12dd7e 100644
--- a/modules/google/phishing-server/variables.tf
+++ b/modules/google/phishing-server/variables.tf
@@ -1,8 +1,8 @@
 variable "redirect_to" {
-  type = "list"
+  type = list(string)
 }
 
-variable "count" {
+variable "count_vm" {
   default = 1
 }
 
@@ -13,13 +13,13 @@ variable "ansible_playbook" {
 
 variable "ansible_arguments" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Additional Ansible Arguments"
 }
 
 variable "ansible_vars" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Environment variables"
 }
 
@@ -32,12 +32,12 @@ variable "project" {
 }
 
 variable "zones" {
-  type = "list"
+  type = list(string)
   default = ["Canada-1"]
 }
 
 variable "available_zones" {
-  type = "map"
+  type = map(string)
   default = {
     "Canada-1" = "northamerica-northeast1-a"
     "Canada-2" = "northamerica-northeast1-b"
diff --git a/modules/letsencrypt/create-cert-dns/main.tf b/modules/letsencrypt/create-cert-dns/main.tf
index fdb2083..93cdf61 100644
--- a/modules/letsencrypt/create-cert-dns/main.tf
+++ b/modules/letsencrypt/create-cert-dns/main.tf
@@ -4,31 +4,31 @@ terraform {
 
 # Create the private key for the registration (not the certificate)
 resource "tls_private_key" "private_key" {
-  count = "${var.count}"
+  count = var.count_vm
   algorithm = "RSA"
-  rsa_bits = "${var.key_type}"
+  rsa_bits = var.key_type
 }
 
 provider "acme" {
-  server_url = "${lookup(var.server_urls, var.server_url)}"
+  server_url = lookup(var.server_urls, var.server_url)
 }
 
 # Set up a registration using a private key from tls_private_key
 resource "acme_registration" "reg" {
-  count = "${var.count}"
-  account_key_pem = "${element(tls_private_key.private_key.*.private_key_pem, count.index)}"
-  email_address   = "${var.reg_email}"
+  count = var.count_vm
+  account_key_pem = element(tls_private_key.private_key.*.private_key_pem, count.index)
+  email_address   = var.reg_email
 }
 
 # Create a certificate
 resource "acme_certificate" "certificate" {
-  count                     = "${var.count}"
-  account_key_pem           = "${element(acme_registration.reg.*.account_key_pem, count.index)}"
-  common_name               = "${element(var.domains, count.index)}"
-  subject_alternative_names = "${length(var.subject_alternative_names) > 0 ? var.subject_alternative_names[element(var.domains, count.index)] : []}"
+  count                     = var.count_vm
+  account_key_pem           = element(acme_registration.reg.*.account_key_pem, count.index)
+  common_name               = element(var.domains, count.index)
+  subject_alternative_names = length(var.subject_alternative_names) > 0 ? var.subject_alternative_names[element(var.domains, count.index)] : []
 
   dns_challenge {
-    provider = "${var.provider}"
+    provider = var.provider
   }
 
   provisioner "local-exec" {
@@ -36,7 +36,7 @@ resource "acme_certificate" "certificate" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/certificates/${self.common_name}*"
   }
 }
\ No newline at end of file
diff --git a/modules/letsencrypt/create-cert-dns/variables.tf b/modules/letsencrypt/create-cert-dns/variables.tf
index 2c68cbe..c1454b5 100644
--- a/modules/letsencrypt/create-cert-dns/variables.tf
+++ b/modules/letsencrypt/create-cert-dns/variables.tf
@@ -2,15 +2,15 @@ variable "provider" {
 }
 
 variable "domains" {
-  type = "list"
+  type = list(string)
 }
 
 variable "subject_alternative_names" {
-  type = "map"
+  type = map(string)
   default = {}
 }
 
-variable "count" {
+variable "count_vm" {
   default = 1
 }
 
@@ -19,7 +19,7 @@ variable "server_url" {
 }
 
 variable "server_urls" {
-  type = "map"
+  type = map(string)
   default = {
     "staging" = "https://acme-staging-v02.api.letsencrypt.org/directory"
     "production" = "https://acme-v02.api.letsencrypt.org/directory"
diff --git a/modules/linode/dns-c2/README.md b/modules/linode/dns-c2/README.md
index e4f58aa..e12a5c8 100644
--- a/modules/linode/dns-c2/README.md
+++ b/modules/linode/dns-c2/README.md
@@ -16,7 +16,7 @@ module "dns_c2" {
 |---------------------------| -------- | ---------- | -----------
 |`count`                    | No       | Integer    | Number of instances to launch. Defaults to 1.
 |`size`                     | No       | Integer    | Linode size to launch. Defaults to 1024.
-|`install`                  | No       | List       | Scripts to run on instance creation. Defaults to "./scripts/core_deps.sh".
+|`install`                  | No       | List       | Scripts to run on instance creation. Defaults to "./data/scripts/core_deps.sh".
 |`regions`                  | No       | List       | Regions to create Linode(s) in. Defaults to NJ. Accepted values are NJ, CA, TX, GA, UK, JP, JP2, SG and DE.
 |`group`                    | No       | String     | Group name for created Linode(s). Defaults to "Red Baron"
 
diff --git a/modules/linode/dns-c2/main.tf b/modules/linode/dns-c2/main.tf
index 01b8cde..9d889b4 100644
--- a/modules/linode/dns-c2/main.tf
+++ b/modules/linode/dns-c2/main.tf
@@ -3,18 +3,18 @@ terraform {
 }
 
 resource "random_id" "server" {
-  count = "${var.count}"
+  count = var.count_vm
   byte_length = 4
 }
 
 resource "random_string" "password" {
-  count = "${var.count}"
+  count = var.count_vm
   length = 16
   special = true
 }
 
 resource "tls_private_key" "ssh" {
-  count = "${var.count}"
+  count = var.count_vm
   algorithm = "RSA"
   rsa_bits = 4096
 }
@@ -22,25 +22,25 @@ resource "tls_private_key" "ssh" {
 resource "linode_linode" "dns-c2" {
   // Due to a current limitation the count parameter cannot be a dynamic value :(
   // https://github.com/hashicorp/terraform/issues/14677
-  // count = "${length(var.dns_c2_ips)}"
+  // count = length(var.dns_c2_ips)
 
-  count = "${var.count}"
+  count = var.count_vm
   image = "Debian 9"
   kernel = "Latest 64 bit"
   name = "dns-c2-${random_id.server.*.hex[count.index]}"
-  group = "${var.group}"
-  region = "${var.available_regions[element(var.regions, count.index)]}"
-  size = "${var.size}"
-  ssh_key = "${tls_private_key.ssh.*.public_key_openssh[count.index]}"
-  root_password = "${random_string.password.*.result[count.index]}"
+  group = var.group
+  region = var.available_regions[element(var.regions, count.index)]
+  size = var.size
+  ssh_key = tls_private_key.ssh.*.public_key_openssh[count.index]
+  root_password = random_string.password.*.result[count.index]
 
   provisioner "remote-exec" {
-    scripts = "${concat(list("./scripts/core_deps.sh"), var.install)}"
+    scripts = concat(list("./data/scripts/core_deps.sh"), var.install)
 
     connection {
         type = "ssh"
         user = "root"
-        private_key = "${tls_private_key.ssh.*.private_key_pem[count.index]}"
+        private_key = tls_private_key.ssh.*.private_key_pem[count.index]
     }
   }
 
@@ -49,25 +49,25 @@ resource "linode_linode" "dns-c2" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_keys/${self.ip_address}*"
   }
 }
 
 resource "null_resource" "ansible_provisioner" {
-  count = "${signum(length(var.ansible_playbook)) == 1 ? var.count : 0}"
+  count = signum(length(var.ansible_playbook)) == 1 ? var.count_vm : 0
 
-  depends_on = ["linode_linode.dns-c2"]
+  depends_on = [linode_linode.dns-c2]
 
-  triggers {
-    droplet_creation = "${join("," , linode_linode.dns-c2.*.id)}"
-    policy_sha1 = "${sha1(file(var.ansible_playbook))}"
+  triggers = {
+    droplet_creation = join("," , linode_linode.dns-c2.*.id)
+    policy_sha1 = sha1(file(var.ansible_playbook))
   }
 
   provisioner "local-exec" {
     command = "ansible-playbook ${join(" ", compact(var.ansible_arguments))} --user=root --private-key=./data/ssh_keys/${linode_linode.dns-c2.*.ip_address[count.index]} -e host=${linode_linode.dns-c2.*.ip_address[count.index]} ${var.ansible_playbook}"
 
-    environment {
+    environment = {
       ANSIBLE_HOST_KEY_CHECKING = "False"
     }
   }
@@ -79,27 +79,27 @@ resource "null_resource" "ansible_provisioner" {
 
 data "template_file" "ssh_config" {
 
-  count    = "${var.count}"
+  count    = var.count_vm
 
-  template = "${file("./data/templates/ssh_config.tpl")}"
+  template = file("./data/templates/ssh_config.tpl")
 
-  depends_on = ["linode_linode.dns-c2"]
+  depends_on = [linode_linode.dns-c2]
 
-  vars {
+  vars = {
     name = "dns_c2_${linode_linode.dns-c2.*.ip_address[count.index]}"
-    hostname = "${linode_linode.dns-c2.*.ip_address[count.index]}"
+    hostname = linode_linode.dns-c2.*.ip_address[count.index]
     user = "root"
-    identityfile = "${path.root}/data/ssh_keys/${linode_linode.dns-c2.*.ip_address[count.index]}"
+    identityfile = path.root}/data/ssh_keys/${linode_linode.dns-c2.*.ip_address[count.index]
   }
 
 }
 
 resource "null_resource" "gen_ssh_config" {
 
-  count = "${var.count}"
+  count = var.count_vm
 
-  triggers {
-    template_rendered = "${data.template_file.ssh_config.*.rendered[count.index]}"
+  triggers = {
+    template_rendered = data.template_file.ssh_config.*.rendered[count.index]
   }
 
   provisioner "local-exec" {
@@ -107,7 +107,7 @@ resource "null_resource" "gen_ssh_config" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_configs/config_${random_id.server.*.hex[count.index]}"
   }
 
diff --git a/modules/linode/dns-c2/variables.tf b/modules/linode/dns-c2/variables.tf
index 57d9c6e..a649bdd 100644
--- a/modules/linode/dns-c2/variables.tf
+++ b/modules/linode/dns-c2/variables.tf
@@ -1,9 +1,9 @@
 variable "install" {
-  type = "list"
+  type = list(string)
   default = []
 }
 
-variable "count" {
+variable "count_vm" {
   default = 1
 }
 
@@ -14,13 +14,13 @@ variable "ansible_playbook" {
 
 variable "ansible_arguments" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Additional Ansible Arguments"
 }
 
 variable "ansible_vars" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Environment variables"
 }
 
@@ -29,12 +29,12 @@ variable "size" {
 }
 
 variable "regions" {
-  type = "list"
+  type = list(string)
   default = ["NJ"]
 }
 
 variable "available_regions" {
-  type = "map"
+  type = map(string)
   default = {
     "NJ" = "Newark, NJ, USA"
     "CA" = "Freemont, CA, USA"
diff --git a/modules/linode/dns-rdir/main.tf b/modules/linode/dns-rdir/main.tf
index a4697c6..7da4650 100644
--- a/modules/linode/dns-rdir/main.tf
+++ b/modules/linode/dns-rdir/main.tf
@@ -3,18 +3,18 @@ terraform {
 }
 
 resource "random_id" "server" {
-  count = "${var.count}"
+  count = var.count_vm
   byte_length = 4
 }
 
 resource "random_string" "password" {
-  count = "${var.count}"
+  count = var.count_vm
   length = 16
   special = true
 }
 
 resource "tls_private_key" "ssh" {
-  count = "${var.count}"
+  count = var.count_vm
   algorithm = "RSA"
   rsa_bits = 4096
 }
@@ -22,17 +22,17 @@ resource "tls_private_key" "ssh" {
 resource "linode_linode" "dns-rdir" {
   // Due to a current limitation the count parameter cannot be a dynamic value :(
   // https://github.com/hashicorp/terraform/issues/14677
-  // count = "${length(var.redirect_to)}"
+  // count = length(var.redirect_to)
 
-  count = "${var.count}"
+  count = var.count_vm
   image = "Debian 9"
   kernel = "Latest 64 bit"
   name = "dns-rdir-${random_id.server.*.hex[count.index]}"
-  group = "${var.group}"
-  region = "${var.available_regions[element(var.regions, count.index)]}"
-  size = "${var.size}"
-  ssh_key = "${tls_private_key.ssh.*.public_key_openssh[count.index]}"
-  root_password = "${random_string.password.*.result[count.index]}"
+  group = var.group
+  region = var.available_regions[element(var.regions, count.index)]
+  size = var.size
+  ssh_key = tls_private_key.ssh.*.public_key_openssh[count.index]
+  root_password = random_string.password.*.result[count.index]
 
   provisioner "remote-exec" {
     inline = [
@@ -44,7 +44,7 @@ resource "linode_linode" "dns-rdir" {
     connection {
         type = "ssh"
         user = "root"
-        private_key = "${tls_private_key.ssh.*.private_key_pem[count.index]}"
+        private_key = tls_private_key.ssh.*.private_key_pem[count.index]
     }
   }
 
@@ -53,26 +53,26 @@ resource "linode_linode" "dns-rdir" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_keys/${self.ip_address}*"
   }
 
 }
 
 resource "null_resource" "ansible_provisioner" {
-  count = "${signum(length(var.ansible_playbook)) == 1 ? var.count : 0}"
+  count = signum(length(var.ansible_playbook)) == 1 ? var.count_vm : 0
 
-  depends_on = ["linode_linode.dns-rdir"]
+  depends_on = [linode_linode.dns-rdir]
 
-  triggers {
-    droplet_creation = "${join("," , linode_linode.dns-rdir.*.id)}"
-    policy_sha1 = "${sha1(file(var.ansible_playbook))}"
+  triggers = {
+    droplet_creation = join("," , linode_linode.dns-rdir.*.id)
+    policy_sha1 = sha1(file(var.ansible_playbook))
   }
 
   provisioner "local-exec" {
     command = "ansible-playbook ${join(" ", compact(var.ansible_arguments))} --user=root --private-key=./data/ssh_keys/${linode_linode.dns-rdir.*.ip_address[count.index]} -e host=${linode_linode.dns-rdir.*.ip_address[count.index]} ${var.ansible_playbook}"
 
-    environment {
+    environment = {
       ANSIBLE_HOST_KEY_CHECKING = "False"
     }
   }
@@ -84,27 +84,27 @@ resource "null_resource" "ansible_provisioner" {
 
 data "template_file" "ssh_config" {
 
-  count    = "${var.count}"
+  count    = var.count_vm
 
-  template = "${file("./data/templates/ssh_config.tpl")}"
+  template = file("./data/templates/ssh_config.tpl")
 
-  depends_on = ["linode_linode.dns-rdir"]
+  depends_on = [linode_linode.dns-rdir]
 
-  vars {
+  vars = {
     name = "dns_rdir_${linode_linode.dns-rdir.*.ip_address[count.index]}"
-    hostname = "${linode_linode.dns-rdir.*.ip_address[count.index]}"
+    hostname = linode_linode.dns-rdir.*.ip_address[count.index]
     user = "root"
-    identityfile = "${path.root}/data/ssh_keys/${linode_linode.dns-rdir.*.ip_address[count.index]}"
+    identityfile = path.root}/data/ssh_keys/${linode_linode.dns-rdir.*.ip_address[count.index]
   }
 
 }
 
 resource "null_resource" "gen_ssh_config" {
 
-  count = "${var.count}"
+  count = var.count_vm
 
-  triggers {
-    template_rendered = "${data.template_file.ssh_config.*.rendered[count.index]}"
+  triggers = {
+    template_rendered = data.template_file.ssh_config.*.rendered[count.index]
   }
 
   provisioner "local-exec" {
@@ -112,7 +112,7 @@ resource "null_resource" "gen_ssh_config" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_configs/config_${random_id.server.*.hex[count.index]}"
   }
 
diff --git a/modules/linode/dns-rdir/variables.tf b/modules/linode/dns-rdir/variables.tf
index dc259b7..7d5e134 100644
--- a/modules/linode/dns-rdir/variables.tf
+++ b/modules/linode/dns-rdir/variables.tf
@@ -1,8 +1,8 @@
 variable "redirect_to" {
-  type = "list"
+  type = list(string)
 }
 
-variable "count" {
+variable "count_vm" {
   default = 1
 }
 
@@ -13,13 +13,13 @@ variable "ansible_playbook" {
 
 variable "ansible_arguments" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Additional Ansible Arguments"
 }
 
 variable "ansible_vars" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Environment variables"
 }
 
@@ -28,12 +28,12 @@ variable "size" {
 }
 
 variable "regions" {
-  type = "list"
+  type = list(string)
   default = ["NJ"]
 }
 
 variable "available_regions" {
-  type = "map"
+  type = map(string)
   default = {
     "NJ" = "Newark, NJ, USA"
     "CA" = "Freemont, CA, USA"
diff --git a/modules/linode/http-c2/README.md b/modules/linode/http-c2/README.md
index fcc7a23..3645a32 100644
--- a/modules/linode/http-c2/README.md
+++ b/modules/linode/http-c2/README.md
@@ -16,7 +16,7 @@ module "http_c2" {
 |---------------------------| -------- | ---------- | -----------
 |`count`                    | No       | Integer    | Number of instances to launch. Defaults to 1.
 |`size`                     | No       | Integer    | Linode size to launch. Defaults to 1024.
-|`install`                  | No       | List       | Scripts to run on instance creation. Defaults to "./scripts/core_deps.sh".
+|`install`                  | No       | List       | Scripts to run on instance creation. Defaults to "./data/scripts/core_deps.sh".
 |`regions`                  | No       | List       | Regions to create Linode(s) in. Defaults to NJ. Accepted values are NJ, CA, TX, GA, UK, JP, JP2, SG and DE.
 |`group`                    | No       | String     | Group name for created Linode(s). Defaults to "Red Baron"
 
diff --git a/modules/linode/http-c2/main.tf b/modules/linode/http-c2/main.tf
index 939447b..930db59 100644
--- a/modules/linode/http-c2/main.tf
+++ b/modules/linode/http-c2/main.tf
@@ -3,18 +3,18 @@ terraform {
 }
 
 resource "random_id" "server" {
-  count = "${var.count}"
+  count = var.count_vm
   byte_length = 4
 }
 
 resource "random_string" "password" {
-  count = "${var.count}"
+  count = var.count_vm
   length = 16
   special = true
 }
 
 resource "tls_private_key" "ssh" {
-  count = "${var.count}"
+  count = var.count_vm
   algorithm = "RSA"
   rsa_bits = 4096
 }
@@ -22,25 +22,25 @@ resource "tls_private_key" "ssh" {
 resource "linode_linode" "http-c2" {
   // Due to a current limitation the count parameter cannot be a dynamic value :(
   // https://github.com/hashicorp/terraform/issues/14677
-  // count = "${length(var.http_c2_ips)}"
+  // count = length(var.http_c2_ips)
 
-  count = "${var.count}"
+  count = var.count_vm
   image = "Debian 9"
   kernel = "Latest 64 bit"
   name = "http-c2-${random_id.server.*.hex[count.index]}"
-  group = "${var.group}"
-  region = "${var.available_regions[element(var.regions, count.index)]}"
-  size = "${var.size}"
-  ssh_key = "${tls_private_key.ssh.*.public_key_openssh[count.index]}"
-  root_password = "${random_string.password.*.result[count.index]}"
+  group = var.group
+  region = var.available_regions[element(var.regions, count.index)]
+  size = var.size
+  ssh_key = tls_private_key.ssh.*.public_key_openssh[count.index]
+  root_password = random_string.password.*.result[count.index]
 
   provisioner "remote-exec" {
-    scripts = "${concat(list("./scripts/core_deps.sh"), var.install)}"
+    scripts = concat(list("./data/scripts/core_deps.sh"), var.install)
 
     connection {
         type = "ssh"
         user = "root"
-        private_key = "${tls_private_key.ssh.*.private_key_pem[count.index]}"
+        private_key = tls_private_key.ssh.*.private_key_pem[count.index]
     }
   }
 
@@ -49,26 +49,26 @@ resource "linode_linode" "http-c2" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_keys/${self.ip_address}*"
   }
 
 }
 
 resource "null_resource" "ansible_provisioner" {
-  count = "${signum(length(var.ansible_playbook)) == 1 ? var.count : 0}"
+  count = signum(length(var.ansible_playbook)) == 1 ? var.count_vm : 0
 
-  depends_on = ["linode_linode.http-c2"]
+  depends_on = [linode_linode.http-c2]
 
-  triggers {
-    droplet_creation = "${join("," , linode_linode.http-c2.*.id)}"
-    policy_sha1 = "${sha1(file(var.ansible_playbook))}"
+  triggers = {
+    droplet_creation = join("," , linode_linode.http-c2.*.id)
+    policy_sha1 = sha1(file(var.ansible_playbook))
   }
 
   provisioner "local-exec" {
     command = "ansible-playbook ${join(" ", compact(var.ansible_arguments))} --user=root --private-key=./data/ssh_keys/${linode_linode.http-c2.*.ip_address[count.index]} -e host=${linode_linode.http-c2.*.ip_address[count.index]} ${var.ansible_playbook}"
 
-    environment {
+    environment = {
       ANSIBLE_HOST_KEY_CHECKING = "False"
     }
   }
@@ -80,27 +80,27 @@ resource "null_resource" "ansible_provisioner" {
 
 data "template_file" "ssh_config" {
 
-  count    = "${var.count}"
+  count    = var.count_vm
 
-  template = "${file("./data/templates/ssh_config.tpl")}"
+  template = file("./data/templates/ssh_config.tpl")
 
-  depends_on = ["linode_linode.http-c2"]
+  depends_on = [linode_linode.http-c2]
 
-  vars {
+  vars = {
     name = "http_c2_${linode_linode.http-c2.*.ip_address[count.index]}"
-    hostname = "${linode_linode.http-c2.*.ip_address[count.index]}"
+    hostname = linode_linode.http-c2.*.ip_address[count.index]
     user = "root"
-    identityfile = "${path.root}/data/ssh_keys/${linode_linode.http-c2.*.ip_address[count.index]}"
+    identityfile = path.root}/data/ssh_keys/${linode_linode.http-c2.*.ip_address[count.index]
   }
 
 }
 
 resource "null_resource" "gen_ssh_config" {
 
-  count = "${var.count}"
+  count = var.count_vm
 
-  triggers {
-    template_rendered = "${data.template_file.ssh_config.*.rendered[count.index]}"
+  triggers = {
+    template_rendered = data.template_file.ssh_config.*.rendered[count.index]
   }
 
   provisioner "local-exec" {
@@ -108,7 +108,7 @@ resource "null_resource" "gen_ssh_config" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_configs/config_${random_id.server.*.hex[count.index]}"
   }
 
diff --git a/modules/linode/http-c2/variables.tf b/modules/linode/http-c2/variables.tf
index 57d9c6e..a649bdd 100644
--- a/modules/linode/http-c2/variables.tf
+++ b/modules/linode/http-c2/variables.tf
@@ -1,9 +1,9 @@
 variable "install" {
-  type = "list"
+  type = list(string)
   default = []
 }
 
-variable "count" {
+variable "count_vm" {
   default = 1
 }
 
@@ -14,13 +14,13 @@ variable "ansible_playbook" {
 
 variable "ansible_arguments" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Additional Ansible Arguments"
 }
 
 variable "ansible_vars" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Environment variables"
 }
 
@@ -29,12 +29,12 @@ variable "size" {
 }
 
 variable "regions" {
-  type = "list"
+  type = list(string)
   default = ["NJ"]
 }
 
 variable "available_regions" {
-  type = "map"
+  type = map(string)
   default = {
     "NJ" = "Newark, NJ, USA"
     "CA" = "Freemont, CA, USA"
diff --git a/modules/linode/http-rdir/main.tf b/modules/linode/http-rdir/main.tf
index 0c3fe19..018994e 100644
--- a/modules/linode/http-rdir/main.tf
+++ b/modules/linode/http-rdir/main.tf
@@ -3,18 +3,18 @@ terraform {
 }
 
 resource "random_id" "server" {
-  count = "${var.count}"
+  count = var.count_vm
   byte_length = 4
 }
 
 resource "random_string" "password" {
-  count = "${var.count}"
+  count = var.count_vm
   length = 16
   special = true
 }
 
 resource "tls_private_key" "ssh" {
-  count = "${var.count}"
+  count = var.count_vm
   algorithm = "RSA"
   rsa_bits = 4096
 }
@@ -22,17 +22,17 @@ resource "tls_private_key" "ssh" {
 resource "linode_linode" "http-rdir" {
   // Due to a current limitation the count parameter cannot be a dynamic value :(
   // https://github.com/hashicorp/terraform/issues/14677
-  // count = "${length(var.redirect_to)}"
+  // count = length(var.redirect_to)
 
-  count = "${var.count}"
+  count = var.count_vm
   image = "Debian 9"
   kernel = "Latest 64 bit"
   name = "http-rdir-${random_id.server.*.hex[count.index]}"
-  group = "${var.group}"
-  region = "${var.available_regions[element(var.regions, count.index)]}"
-  size = "${var.size}"
-  ssh_key = "${tls_private_key.ssh.*.public_key_openssh[count.index]}"
-  root_password = "${random_string.password.*.result[count.index]}"
+  group = var.group
+  region = var.available_regions[element(var.regions, count.index)]
+  size = var.size
+  ssh_key = tls_private_key.ssh.*.public_key_openssh[count.index]
+  root_password = random_string.password.*.result[count.index]
 
   provisioner "remote-exec" {
     inline = [
@@ -46,7 +46,7 @@ resource "linode_linode" "http-rdir" {
     connection {
         type = "ssh"
         user = "root"
-        private_key = "${tls_private_key.ssh.*.private_key_pem[count.index]}"
+        private_key = tls_private_key.ssh.*.private_key_pem[count.index]
     }
   }
 
@@ -55,26 +55,26 @@ resource "linode_linode" "http-rdir" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_keys/${self.ip_address}*"
   }
 
 }
 
 resource "null_resource" "ansible_provisioner" {
-  count = "${signum(length(var.ansible_playbook)) == 1 ? var.count : 0}"
+  count = signum(length(var.ansible_playbook)) == 1 ? var.count_vm : 0
 
-  depends_on = ["linode_linode.http-rdir"]
+  depends_on = [linode_linode.http-rdir]
 
-  triggers {
-    droplet_creation = "${join("," , linode_linode.http-rdir.*.id)}"
-    policy_sha1 = "${sha1(file(var.ansible_playbook))}"
+  triggers = {
+    droplet_creation = join("," , linode_linode.http-rdir.*.id)
+    policy_sha1 = sha1(file(var.ansible_playbook))
   }
 
   provisioner "local-exec" {
     command = "ansible-playbook ${join(" ", compact(var.ansible_arguments))} --user=root --private-key=./data/ssh_keys/${linode_linode.http-rdir.*.ip_address[count.index]} -e host=${linode_linode.http-rdir.*.ip_address[count.index]} ${var.ansible_playbook}"
 
-    environment {
+    environment = {
       ANSIBLE_HOST_KEY_CHECKING = "False"
     }
   }
@@ -86,27 +86,27 @@ resource "null_resource" "ansible_provisioner" {
 
 data "template_file" "ssh_config" {
 
-  count    = "${var.count}"
+  count    = var.count_vm
 
-  template = "${file("./data/templates/ssh_config.tpl")}"
+  template = file("./data/templates/ssh_config.tpl")
 
-  depends_on = ["linode_linode.http-rdir"]
+  depends_on = [linode_linode.http-rdir]
 
-  vars {
+  vars = {
     name = "http_rdir_${linode_linode.http-rdir.*.ip_address[count.index]}"
-    hostname = "${linode_linode.http-rdir.*.ip_address[count.index]}"
+    hostname = linode_linode.http-rdir.*.ip_address[count.index]
     user = "root"
-    identityfile = "${path.root}/data/ssh_keys/${linode_linode.http-rdir.*.ip_address[count.index]}"
+    identityfile = path.root}/data/ssh_keys/${linode_linode.http-rdir.*.ip_address[count.index]
   }
 
 }
 
 resource "null_resource" "gen_ssh_config" {
 
-  count = "${var.count}"
+  count = var.count_vm
 
-  triggers {
-    template_rendered = "${data.template_file.ssh_config.*.rendered[count.index]}"
+  triggers = {
+    template_rendered = data.template_file.ssh_config.*.rendered[count.index]
   }
 
   provisioner "local-exec" {
@@ -114,7 +114,7 @@ resource "null_resource" "gen_ssh_config" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_configs/config_${random_id.server.*.hex[count.index]}"
   }
 
diff --git a/modules/linode/http-rdir/variables.tf b/modules/linode/http-rdir/variables.tf
index dc259b7..7d5e134 100644
--- a/modules/linode/http-rdir/variables.tf
+++ b/modules/linode/http-rdir/variables.tf
@@ -1,8 +1,8 @@
 variable "redirect_to" {
-  type = "list"
+  type = list(string)
 }
 
-variable "count" {
+variable "count_vm" {
   default = 1
 }
 
@@ -13,13 +13,13 @@ variable "ansible_playbook" {
 
 variable "ansible_arguments" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Additional Ansible Arguments"
 }
 
 variable "ansible_vars" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Environment variables"
 }
 
@@ -28,12 +28,12 @@ variable "size" {
 }
 
 variable "regions" {
-  type = "list"
+  type = list(string)
   default = ["NJ"]
 }
 
 variable "available_regions" {
-  type = "map"
+  type = map(string)
   default = {
     "NJ" = "Newark, NJ, USA"
     "CA" = "Freemont, CA, USA"
diff --git a/modules/linode/phishing-server/main.tf b/modules/linode/phishing-server/main.tf
index 291857a..de625f3 100644
--- a/modules/linode/phishing-server/main.tf
+++ b/modules/linode/phishing-server/main.tf
@@ -3,18 +3,18 @@ terraform {
 }
 
 resource "random_id" "server" {
-  count = "${var.count}"
+  count = var.count_vm
   byte_length = 4
 }
 
 resource "random_string" "password" {
-  count = "${var.count}"
+  count = var.count_vm
   length = 16
   special = true
 }
 
 resource "tls_private_key" "ssh" {
-  count = "${var.count}"
+  count = var.count_vm
   algorithm = "RSA"
   rsa_bits = 4096
 }
@@ -22,17 +22,17 @@ resource "tls_private_key" "ssh" {
 resource "linode_linode" "phishing-server" {
   // Due to a current limitation the count parameter cannot be a dynamic value :(
   // https://github.com/hashicorp/terraform/issues/14677
-  // count = "${length(var.http_c2_ips)}"
+  // count = length(var.http_c2_ips)
 
-  count = "${var.count}"
+  count = var.count_vm
   image = "Debian 9"
   kernel = "Latest 64 bit"
   name = "phishing-server-${random_id.server.*.hex[count.index]}"
-  group = "${var.group}"
-  region = "${var.available_regions[element(var.regions, count.index)]}"
-  size = "${var.size}"
-  ssh_key = "${tls_private_key.ssh.*.public_key_openssh[count.index]}"
-  root_password = "${random_string.password.*.result[count.index]}"
+  group = var.group
+  region = var.available_regions[element(var.regions, count.index)]
+  size = var.size
+  ssh_key = tls_private_key.ssh.*.public_key_openssh[count.index]
+  root_password = random_string.password.*.result[count.index]
 
   provisioner "remote-exec" {
     inline = [
@@ -45,7 +45,7 @@ resource "linode_linode" "phishing-server" {
     connection {
         type = "ssh"
         user = "root"
-        private_key = "${tls_private_key.ssh.*.private_key_pem[count.index]}"
+        private_key = tls_private_key.ssh.*.private_key_pem[count.index]
     }
   }
 
@@ -54,26 +54,26 @@ resource "linode_linode" "phishing-server" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_keys/${self.ip_address}*"
   }
 
 }
 
 resource "null_resource" "ansible_provisioner" {
-  count = "${signum(length(var.ansible_playbook)) == 1 ? var.count : 0}"
+  count = signum(length(var.ansible_playbook)) == 1 ? var.count_vm : 0
 
-  depends_on = ["linode_linode.phishing-server"]
+  depends_on = [linode_linode.phishing-server]
 
-  triggers {
-    droplet_creation = "${join("," , linode_linode.phishing-server.*.id)}"
-    policy_sha1 = "${sha1(file(var.ansible_playbook))}"
+  triggers = {
+    droplet_creation = join("," , linode_linode.phishing-server.*.id)
+    policy_sha1 = sha1(file(var.ansible_playbook))
   }
 
   provisioner "local-exec" {
     command = "ansible-playbook ${join(" ", compact(var.ansible_arguments))} --user=root --private-key=./data/ssh_keys/${linode_linode.phishing-server.*.ip_address[count.index]} -e host=${linode_linode.phishing-server.*.ip_address[count.index]} ${var.ansible_playbook}"
 
-    environment {
+    environment = {
       ANSIBLE_HOST_KEY_CHECKING = "False"
     }
   }
@@ -85,27 +85,27 @@ resource "null_resource" "ansible_provisioner" {
 
 data "template_file" "ssh_config" {
 
-  count    = "${var.count}"
+  count    = var.count_vm
 
-  template = "${file("./data/templates/ssh_config.tpl")}"
+  template = file("./data/templates/ssh_config.tpl")
 
-  depends_on = ["linode_linode.phishing-server"]
+  depends_on = [linode_linode.phishing-server]
 
-  vars {
+  vars = {
     name = "phishing_server_${linode_linode.phishing-server.*.ip_address[count.index]}"
-    hostname = "${linode_linode.phishing-server.*.ip_address[count.index]}"
+    hostname = linode_linode.phishing-server.*.ip_address[count.index]
     user = "root"
-    identityfile = "${path.root}/data/ssh_keys/${linode_linode.phishing-server.*.ip_address[count.index]}"
+    identityfile = path.root}/data/ssh_keys/${linode_linode.phishing-server.*.ip_address[count.index]
   }
 
 }
 
 resource "null_resource" "gen_ssh_config" {
 
-  count = "${var.count}"
+  count = var.count_vm
 
-  triggers {
-    template_rendered = "${data.template_file.ssh_config.*.rendered[count.index]}"
+  triggers = {
+    template_rendered = data.template_file.ssh_config.*.rendered[count.index]
   }
 
   provisioner "local-exec" {
@@ -113,8 +113,8 @@ resource "null_resource" "gen_ssh_config" {
   }
 
   provisioner "local-exec" {
-    when = "destroy"
+    when = destroy
     command = "rm ./data/ssh_configs/config_${random_id.server.*.hex[count.index]}"
   }
 
-}
\ No newline at end of file
+}
diff --git a/modules/linode/phishing-server/variables.tf b/modules/linode/phishing-server/variables.tf
index e657175..c89d468 100644
--- a/modules/linode/phishing-server/variables.tf
+++ b/modules/linode/phishing-server/variables.tf
@@ -1,4 +1,4 @@
-variable "count" {
+variable "count_vm" {
   default = 1
 }
 
@@ -9,13 +9,13 @@ variable "ansible_playbook" {
 
 variable "ansible_arguments" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Additional Ansible Arguments"
 }
 
 variable "ansible_vars" {
   default = []
-  type    = "list"
+  type    = list(string)
   description = "Environment variables"
 }
 
@@ -24,12 +24,12 @@ variable "size" {
 }
 
 variable "regions" {
-  type = "list"
+  type = list(string)
   default = ["NJ"]
 }
 
 variable "available_regions" {
-  type = "map"
+  type = map(string)
   default = {
     "NJ" = "Newark, NJ, USA"
     "CA" = "Freemont, CA, USA"