diff --git a/commitlint.config.ts b/commitlint.config.ts
index 1e9ab36906..d6e3dd096c 100644
--- a/commitlint.config.ts
+++ b/commitlint.config.ts
@@ -4,8 +4,15 @@ import * as fs from "fs";
 const Configuration: UserConfig = {
   extends: ["@commitlint/config-conventional"],
   rules: {
-    "scope-enum": [2, "always", fs.readdirSync("app").filter((file) => fs.statSync(`app/${file}`).isDirectory())],
+    "scope-enum": [
+      2,
+      "always",
+      [
+        ...fs.readdirSync("app").filter((file) => fs.statSync(`app/${file}`).isDirectory()),
+        ...fs.readdirSync("infra").filter((file) => fs.statSync(`infra/${file}`).isDirectory()),
+      ],
+    ],
   },
 };
 
-module.exports = Configuration;
+export default Configuration;
diff --git a/infra/terraform/accounts/nonprod/main.tf b/infra/terraform/accounts/nonprod/main.tf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/infra/terraform/accounts/prod/main.tf b/infra/terraform/accounts/prod/main.tf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/infra/terraform/environments/dev/main.tf b/infra/terraform/environments/dev/main.tf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/infra/terraform/environments/int/main.tf b/infra/terraform/environments/int/main.tf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/infra/terraform/environments/prep/main.tf b/infra/terraform/environments/prep/main.tf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/infra/terraform/environments/prod/main.tf b/infra/terraform/environments/prod/main.tf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/infra/terraform/modules/account/main.tf b/infra/terraform/modules/account/main.tf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/infra/terraform/modules/service/main.tf b/infra/terraform/modules/service/main.tf
new file mode 100644
index 0000000000..e69de29bb2