diff --git a/terraform/010-cluster/README.md b/modules/010-cluster/README.md
similarity index 100%
rename from terraform/010-cluster/README.md
rename to modules/010-cluster/README.md
diff --git a/terraform/010-cluster/main.tf b/modules/010-cluster/main.tf
similarity index 100%
rename from terraform/010-cluster/main.tf
rename to modules/010-cluster/main.tf
diff --git a/terraform/010-cluster/outputs.tf b/modules/010-cluster/outputs.tf
similarity index 100%
rename from terraform/010-cluster/outputs.tf
rename to modules/010-cluster/outputs.tf
diff --git a/terraform/010-cluster/variables.tf b/modules/010-cluster/variables.tf
similarity index 100%
rename from terraform/010-cluster/variables.tf
rename to modules/010-cluster/variables.tf
diff --git a/terraform/010-cluster/versions.tf b/modules/010-cluster/versions.tf
similarity index 100%
rename from terraform/010-cluster/versions.tf
rename to modules/010-cluster/versions.tf
diff --git a/terraform/032-db-backup/README.md b/modules/032-db-backup/README.md
similarity index 100%
rename from terraform/032-db-backup/README.md
rename to modules/032-db-backup/README.md
diff --git a/terraform/032-db-backup/main.tf b/modules/032-db-backup/main.tf
similarity index 100%
rename from terraform/032-db-backup/main.tf
rename to modules/032-db-backup/main.tf
diff --git a/terraform/032-db-backup/outputs.tf b/modules/032-db-backup/outputs.tf
similarity index 100%
rename from terraform/032-db-backup/outputs.tf
rename to modules/032-db-backup/outputs.tf
diff --git a/terraform/032-db-backup/task-definition.json.tftpl b/modules/032-db-backup/task-definition.json.tftpl
similarity index 100%
rename from terraform/032-db-backup/task-definition.json.tftpl
rename to modules/032-db-backup/task-definition.json.tftpl
diff --git a/terraform/032-db-backup/variables.tf b/modules/032-db-backup/variables.tf
similarity index 100%
rename from terraform/032-db-backup/variables.tf
rename to modules/032-db-backup/variables.tf
diff --git a/terraform/032-db-backup/versions.tf b/modules/032-db-backup/versions.tf
similarity index 100%
rename from terraform/032-db-backup/versions.tf
rename to modules/032-db-backup/versions.tf
diff --git a/terraform/040-id-broker/README.md b/modules/040-id-broker/README.md
similarity index 100%
rename from terraform/040-id-broker/README.md
rename to modules/040-id-broker/README.md
diff --git a/terraform/040-id-broker/main.tf b/modules/040-id-broker/main.tf
similarity index 100%
rename from terraform/040-id-broker/main.tf
rename to modules/040-id-broker/main.tf
diff --git a/terraform/040-id-broker/outputs.tf b/modules/040-id-broker/outputs.tf
similarity index 100%
rename from terraform/040-id-broker/outputs.tf
rename to modules/040-id-broker/outputs.tf
diff --git a/terraform/040-id-broker/task-definition.json.tftpl b/modules/040-id-broker/task-definition.json.tftpl
similarity index 100%
rename from terraform/040-id-broker/task-definition.json.tftpl
rename to modules/040-id-broker/task-definition.json.tftpl
diff --git a/terraform/040-id-broker/variables.tf b/modules/040-id-broker/variables.tf
similarity index 100%
rename from terraform/040-id-broker/variables.tf
rename to modules/040-id-broker/variables.tf
diff --git a/terraform/040-id-broker/versions.tf b/modules/040-id-broker/versions.tf
similarity index 100%
rename from terraform/040-id-broker/versions.tf
rename to modules/040-id-broker/versions.tf
diff --git a/terraform/050-pw-manager/README.md b/modules/050-pw-manager/README.md
similarity index 100%
rename from terraform/050-pw-manager/README.md
rename to modules/050-pw-manager/README.md
diff --git a/terraform/050-pw-manager/main.tf b/modules/050-pw-manager/main.tf
similarity index 100%
rename from terraform/050-pw-manager/main.tf
rename to modules/050-pw-manager/main.tf
diff --git a/terraform/050-pw-manager/outputs.tf b/modules/050-pw-manager/outputs.tf
similarity index 100%
rename from terraform/050-pw-manager/outputs.tf
rename to modules/050-pw-manager/outputs.tf
diff --git a/terraform/050-pw-manager/task-definition-api.json.tftpl b/modules/050-pw-manager/task-definition-api.json.tftpl
similarity index 100%
rename from terraform/050-pw-manager/task-definition-api.json.tftpl
rename to modules/050-pw-manager/task-definition-api.json.tftpl
diff --git a/terraform/050-pw-manager/variables.tf b/modules/050-pw-manager/variables.tf
similarity index 100%
rename from terraform/050-pw-manager/variables.tf
rename to modules/050-pw-manager/variables.tf
diff --git a/terraform/050-pw-manager/versions.tf b/modules/050-pw-manager/versions.tf
similarity index 100%
rename from terraform/050-pw-manager/versions.tf
rename to modules/050-pw-manager/versions.tf
diff --git a/terraform/060-simplesamlphp/README.md b/modules/060-simplesamlphp/README.md
similarity index 100%
rename from terraform/060-simplesamlphp/README.md
rename to modules/060-simplesamlphp/README.md
diff --git a/terraform/060-simplesamlphp/main.tf b/modules/060-simplesamlphp/main.tf
similarity index 100%
rename from terraform/060-simplesamlphp/main.tf
rename to modules/060-simplesamlphp/main.tf
diff --git a/terraform/060-simplesamlphp/outputs.tf b/modules/060-simplesamlphp/outputs.tf
similarity index 100%
rename from terraform/060-simplesamlphp/outputs.tf
rename to modules/060-simplesamlphp/outputs.tf
diff --git a/terraform/060-simplesamlphp/task-definition.json.tftpl b/modules/060-simplesamlphp/task-definition.json.tftpl
similarity index 100%
rename from terraform/060-simplesamlphp/task-definition.json.tftpl
rename to modules/060-simplesamlphp/task-definition.json.tftpl
diff --git a/terraform/060-simplesamlphp/variables.tf b/modules/060-simplesamlphp/variables.tf
similarity index 100%
rename from terraform/060-simplesamlphp/variables.tf
rename to modules/060-simplesamlphp/variables.tf
diff --git a/terraform/060-simplesamlphp/versions.tf b/modules/060-simplesamlphp/versions.tf
similarity index 100%
rename from terraform/060-simplesamlphp/versions.tf
rename to modules/060-simplesamlphp/versions.tf
diff --git a/terraform/070-id-sync/README.md b/modules/070-id-sync/README.md
similarity index 100%
rename from terraform/070-id-sync/README.md
rename to modules/070-id-sync/README.md
diff --git a/terraform/070-id-sync/main.tf b/modules/070-id-sync/main.tf
similarity index 100%
rename from terraform/070-id-sync/main.tf
rename to modules/070-id-sync/main.tf
diff --git a/terraform/070-id-sync/task-definition.json.tftpl b/modules/070-id-sync/task-definition.json.tftpl
similarity index 100%
rename from terraform/070-id-sync/task-definition.json.tftpl
rename to modules/070-id-sync/task-definition.json.tftpl
diff --git a/terraform/070-id-sync/variables.tf b/modules/070-id-sync/variables.tf
similarity index 100%
rename from terraform/070-id-sync/variables.tf
rename to modules/070-id-sync/variables.tf
diff --git a/terraform/070-id-sync/versions.tf b/modules/070-id-sync/versions.tf
similarity index 100%
rename from terraform/070-id-sync/versions.tf
rename to modules/070-id-sync/versions.tf
diff --git a/terraform/ecs-role/main.tf b/modules/ecs-role/main.tf
similarity index 100%
rename from terraform/ecs-role/main.tf
rename to modules/ecs-role/main.tf
diff --git a/terraform/ecs-role/outputs.tf b/modules/ecs-role/outputs.tf
similarity index 100%
rename from terraform/ecs-role/outputs.tf
rename to modules/ecs-role/outputs.tf
diff --git a/terraform/ecs-role/variables.tf b/modules/ecs-role/variables.tf
similarity index 100%
rename from terraform/ecs-role/variables.tf
rename to modules/ecs-role/variables.tf
diff --git a/terraform/ecs-role/versions.tf b/modules/ecs-role/versions.tf
similarity index 100%
rename from terraform/ecs-role/versions.tf
rename to modules/ecs-role/versions.tf
diff --git a/test/010-cluster.tf b/test/010-cluster.tf
index 5bcfc460..e06302ff 100644
--- a/test/010-cluster.tf
+++ b/test/010-cluster.tf
@@ -1,5 +1,5 @@
 module "cluster" {
-  source = "../terraform/010-cluster"
+  source = "../modules/010-cluster"
 
   app_name                       = ""
   app_env                        = ""
diff --git a/test/032-db-backup.tf b/test/032-db-backup.tf
index 25789d96..cc37ca5b 100644
--- a/test/032-db-backup.tf
+++ b/test/032-db-backup.tf
@@ -1,5 +1,5 @@
 module "backup" {
-  source = "../terraform/032-db-backup"
+  source = "../modules/032-db-backup"
 
   app_env                          = ""
   app_name                         = ""
diff --git a/test/040-id-broker.tf b/test/040-id-broker.tf
index b83e5ede..880a99a8 100644
--- a/test/040-id-broker.tf
+++ b/test/040-id-broker.tf
@@ -1,5 +1,5 @@
 module "broker" {
-  source = "../terraform/040-id-broker"
+  source = "../modules/040-id-broker"
 
   abandoned_user_abandoned_period            = ""
   abandoned_user_best_practice_url           = ""
diff --git a/test/050-pw-manager.tf b/test/050-pw-manager.tf
index fbecb8a7..32edfbc3 100644
--- a/test/050-pw-manager.tf
+++ b/test/050-pw-manager.tf
@@ -1,5 +1,5 @@
 module "pw" {
-  source = "../terraform/050-pw-manager"
+  source = "../modules/050-pw-manager"
 
   alb_dns_name                        = ""
   alb_https_listener_arn              = ""
diff --git a/test/060-simplesamlphp.tf b/test/060-simplesamlphp.tf
index ee5c9434..47177a64 100644
--- a/test/060-simplesamlphp.tf
+++ b/test/060-simplesamlphp.tf
@@ -1,5 +1,5 @@
 module "ssp" {
-  source = "../terraform/060-simplesamlphp"
+  source = "../modules/060-simplesamlphp"
 
   admin_email                 = ""
   admin_name                  = ""
diff --git a/test/070-id-sync.tf b/test/070-id-sync.tf
index 44c69a16..8fb5061f 100644
--- a/test/070-id-sync.tf
+++ b/test/070-id-sync.tf
@@ -1,5 +1,5 @@
 module "sync" {
-  source = "../terraform/070-id-sync"
+  source = "../modules/070-id-sync"
 
   alerts_email                 = ""
   allow_empty_email            = true