diff --git a/tofu/main.tf b/tofu/main.tf
index 306cc59..3fa6ddc 100644
--- a/tofu/main.tf
+++ b/tofu/main.tf
@@ -31,7 +31,7 @@ provider "helm" {
 }
 
 module "loadbalancer" {
-  source = "${path.module}/config/metallb"
+  source = "${path.module}/modules/metallb"
   depends_on = [ module.storage ]
 
   metallb_ip_range = var.metallb_ip_range
@@ -39,7 +39,7 @@ module "loadbalancer" {
 
 
 module "database" {
-  source     = "${path.module}/config/maxscale"
+  source     = "${path.module}/modules/maxscale"
   depends_on = [ module.storage, module.loadbalancer ]
 
   mariadb_password      = var.mariadb_password
@@ -57,5 +57,5 @@ module "database" {
 }
 
 module "storage" {
-  source = "${path.module}/config/storage"
+  source = "${path.module}/modules/storage"
 }
\ No newline at end of file
diff --git a/tofu/config/maxscale/charts/maxscale-helm/Chart.yaml b/tofu/modules/maxscale/charts/maxscale-helm/Chart.yaml
similarity index 100%
rename from tofu/config/maxscale/charts/maxscale-helm/Chart.yaml
rename to tofu/modules/maxscale/charts/maxscale-helm/Chart.yaml
diff --git a/tofu/config/maxscale/charts/maxscale-helm/templates/config.yaml b/tofu/modules/maxscale/charts/maxscale-helm/templates/config.yaml
similarity index 100%
rename from tofu/config/maxscale/charts/maxscale-helm/templates/config.yaml
rename to tofu/modules/maxscale/charts/maxscale-helm/templates/config.yaml
diff --git a/tofu/config/maxscale/charts/maxscale-helm/templates/grant.yaml b/tofu/modules/maxscale/charts/maxscale-helm/templates/grant.yaml
similarity index 100%
rename from tofu/config/maxscale/charts/maxscale-helm/templates/grant.yaml
rename to tofu/modules/maxscale/charts/maxscale-helm/templates/grant.yaml
diff --git a/tofu/config/maxscale/charts/maxscale-helm/templates/mariadb-service-0.yaml b/tofu/modules/maxscale/charts/maxscale-helm/templates/mariadb-service-0.yaml
similarity index 100%
rename from tofu/config/maxscale/charts/maxscale-helm/templates/mariadb-service-0.yaml
rename to tofu/modules/maxscale/charts/maxscale-helm/templates/mariadb-service-0.yaml
diff --git a/tofu/config/maxscale/charts/maxscale-helm/templates/mariadb-service-1.yaml b/tofu/modules/maxscale/charts/maxscale-helm/templates/mariadb-service-1.yaml
similarity index 100%
rename from tofu/config/maxscale/charts/maxscale-helm/templates/mariadb-service-1.yaml
rename to tofu/modules/maxscale/charts/maxscale-helm/templates/mariadb-service-1.yaml
diff --git a/tofu/config/maxscale/charts/maxscale-helm/templates/mariadb-service-2.yaml b/tofu/modules/maxscale/charts/maxscale-helm/templates/mariadb-service-2.yaml
similarity index 100%
rename from tofu/config/maxscale/charts/maxscale-helm/templates/mariadb-service-2.yaml
rename to tofu/modules/maxscale/charts/maxscale-helm/templates/mariadb-service-2.yaml
diff --git a/tofu/config/maxscale/charts/maxscale-helm/templates/phpmyadmin-config-map.yaml b/tofu/modules/maxscale/charts/maxscale-helm/templates/phpmyadmin-config-map.yaml
similarity index 100%
rename from tofu/config/maxscale/charts/maxscale-helm/templates/phpmyadmin-config-map.yaml
rename to tofu/modules/maxscale/charts/maxscale-helm/templates/phpmyadmin-config-map.yaml
diff --git a/tofu/config/maxscale/charts/maxscale-helm/templates/phpmyadmin-deployment.yaml b/tofu/modules/maxscale/charts/maxscale-helm/templates/phpmyadmin-deployment.yaml
similarity index 100%
rename from tofu/config/maxscale/charts/maxscale-helm/templates/phpmyadmin-deployment.yaml
rename to tofu/modules/maxscale/charts/maxscale-helm/templates/phpmyadmin-deployment.yaml
diff --git a/tofu/config/maxscale/charts/maxscale-helm/templates/phpmyadmin-service.yaml b/tofu/modules/maxscale/charts/maxscale-helm/templates/phpmyadmin-service.yaml
similarity index 100%
rename from tofu/config/maxscale/charts/maxscale-helm/templates/phpmyadmin-service.yaml
rename to tofu/modules/maxscale/charts/maxscale-helm/templates/phpmyadmin-service.yaml
diff --git a/tofu/config/maxscale/charts/maxscale-helm/templates/user.yaml b/tofu/modules/maxscale/charts/maxscale-helm/templates/user.yaml
similarity index 100%
rename from tofu/config/maxscale/charts/maxscale-helm/templates/user.yaml
rename to tofu/modules/maxscale/charts/maxscale-helm/templates/user.yaml
diff --git a/tofu/config/maxscale/charts/maxscale-helm/values.yaml b/tofu/modules/maxscale/charts/maxscale-helm/values.yaml
similarity index 100%
rename from tofu/config/maxscale/charts/maxscale-helm/values.yaml
rename to tofu/modules/maxscale/charts/maxscale-helm/values.yaml
diff --git a/tofu/config/maxscale/main.tf b/tofu/modules/maxscale/main.tf
similarity index 100%
rename from tofu/config/maxscale/main.tf
rename to tofu/modules/maxscale/main.tf
diff --git a/tofu/config/maxscale/mariadb-secret.yaml b/tofu/modules/maxscale/mariadb-secret.yaml
similarity index 100%
rename from tofu/config/maxscale/mariadb-secret.yaml
rename to tofu/modules/maxscale/mariadb-secret.yaml
diff --git a/tofu/config/maxscale/variables.tf b/tofu/modules/maxscale/variables.tf
similarity index 100%
rename from tofu/config/maxscale/variables.tf
rename to tofu/modules/maxscale/variables.tf
diff --git a/tofu/config/metallb/main.tf b/tofu/modules/metallb/main.tf
similarity index 100%
rename from tofu/config/metallb/main.tf
rename to tofu/modules/metallb/main.tf
diff --git a/tofu/config/metallb/variables.tf b/tofu/modules/metallb/variables.tf
similarity index 100%
rename from tofu/config/metallb/variables.tf
rename to tofu/modules/metallb/variables.tf
diff --git a/tofu/config/storage/main.tf b/tofu/modules/storage/main.tf
similarity index 100%
rename from tofu/config/storage/main.tf
rename to tofu/modules/storage/main.tf