diff --git a/backups.tf b/backups.tf
deleted file mode 100644
index ee57db1..0000000
--- a/backups.tf
+++ /dev/null
@@ -1,5 +0,0 @@
-module "backups" {
-  source = "./backups"
-
-  use_wesher = var.use_wesher
-}
diff --git a/core.tf b/core.tf
deleted file mode 100644
index 2374f5d..0000000
--- a/core.tf
+++ /dev/null
@@ -1,13 +0,0 @@
-module "databases" {
-  source = "./databases"
-}
-
-module "core" {
-  source = "./core"
-
-  base_hostname = var.base_hostname
-  use_wesher    = var.use_wesher
-
-  # Metrics and Blocky depend on databases
-  depends_on = [module.databases]
-}
diff --git a/core/main.tf b/core/main.tf
index ace746b..a7597b4 100644
--- a/core/main.tf
+++ b/core/main.tf
@@ -26,9 +26,3 @@ resource "nomad_job" "syslog-ng" {
 resource "nomad_job" "ddclient" {
   jobspec = file("${path.module}/ddclient.nomad")
 }
-
-resource "nomad_job" "lldap" {
-  jobspec = templatefile("${path.module}/lldap.nomad", {
-    use_wesher = var.use_wesher,
-  })
-}
diff --git a/core/lldap.nomad b/databases/lldap.nomad
similarity index 100%
rename from core/lldap.nomad
rename to databases/lldap.nomad
diff --git a/databases/main.tf b/databases/main.tf
index 306389e..fc02d74 100644
--- a/databases/main.tf
+++ b/databases/main.tf
@@ -36,3 +36,14 @@ resource "nomad_job" "redis" {
   # Block until deployed as there are servics dependent on this one
   detach = false
 }
+
+resource "nomad_job" "lldap" {
+  jobspec = templatefile("${path.module}/lldap.nomad", {
+    use_wesher = var.use_wesher,
+  })
+
+  depends_on = [resource.nomad_job.mysql-server]
+
+  # Block until deployed as there are servics dependent on this one
+  detach = false
+}
diff --git a/databases/vars.tf b/databases/vars.tf
new file mode 100644
index 0000000..aa5858a
--- /dev/null
+++ b/databases/vars.tf
@@ -0,0 +1,5 @@
+variable "use_wesher" {
+  type        = bool
+  description = "Indicates whether or not services should expose themselves on the wesher network"
+  default     = true
+}
diff --git a/main.tf b/main.tf
new file mode 100644
index 0000000..8af89d2
--- /dev/null
+++ b/main.tf
@@ -0,0 +1,33 @@
+module "databases" {
+  source = "./databases"
+
+  use_wesher = var.use_wesher
+}
+
+module "core" {
+  source = "./core"
+
+  base_hostname = var.base_hostname
+  use_wesher    = var.use_wesher
+
+  # Metrics and Blocky depend on databases
+  depends_on = [module.databases]
+}
+
+module "services" {
+  source = "./services"
+
+  use_wesher = var.use_wesher
+
+  # NOTE: It may be possible to flip this and core so core templates don't
+  # need to be rerendered every time a service goes up or down.
+  depends_on = [module.databases, module.core]
+}
+
+module "backups" {
+  source = "./backups"
+
+  use_wesher = var.use_wesher
+
+  depends_on = [module.databases, module.services, module.core]
+}
diff --git a/services.tf b/services.tf
deleted file mode 100644
index be7d291..0000000
--- a/services.tf
+++ /dev/null
@@ -1,7 +0,0 @@
-module "services" {
-  source = "./services"
-
-  use_wesher = var.use_wesher
-
-  depends_on = [module.databases, module.core]
-}