diff --git a/terraform/aws/vpc-all-azs/compute.tf b/terraform/aws/vpc-all-azs/compute.tf
deleted file mode 100644
index 16c87d3..0000000
--- a/terraform/aws/vpc-all-azs/compute.tf
+++ /dev/null
@@ -1,15 +0,0 @@
-# Launch instances across subnets/AZs
-resource "aws_instance" "node" {
-    count                   = "${var.num_nodes}"
-    ami                     = "${data.aws_ami.node_ami.id}"
-    instance_type           = "${var.node_type}"
-    key_name                = "${var.key_pair}"
-    vpc_security_group_ids  = ["${aws_vpc.demo_vpc.default_security_group_id}"]
-    subnet_id               = "${element(aws_subnet.demo_subnet.*.id, count.index)}"
-    tags {
-        Name                = "node-${count.index}"
-        tool                = "terraform"
-        demo                = "terraform"
-        area                = "compute"
-    }
-}
diff --git a/terraform/aws/vpc-all-azs/networking.tf b/terraform/aws/vpc-all-azs/main.tf
similarity index 75%
rename from terraform/aws/vpc-all-azs/networking.tf
rename to terraform/aws/vpc-all-azs/main.tf
index 64bd3d3..9b57db0 100644
--- a/terraform/aws/vpc-all-azs/networking.tf
+++ b/terraform/aws/vpc-all-azs/main.tf
@@ -53,3 +53,19 @@ resource "aws_subnet" "demo_subnet" {
         area                = "networking"
     }
 }
+
+# Launch instances across subnets/AZs
+resource "aws_instance" "node" {
+    count                   = "${var.num_nodes}"
+    ami                     = "${data.aws_ami.node_ami.id}"
+    instance_type           = "${var.node_type}"
+    key_name                = "${var.key_pair}"
+    vpc_security_group_ids  = ["${aws_vpc.demo_vpc.default_security_group_id}"]
+    subnet_id               = "${element(aws_subnet.demo_subnet.*.id, count.index)}"
+    tags {
+        Name                = "node-${count.index}"
+        tool                = "terraform"
+        demo                = "terraform"
+        area                = "compute"
+    }
+}