diff --git a/packages/Jenkinsfile b/Jenkinsfile
similarity index 100%
rename from packages/Jenkinsfile
rename to Jenkinsfile
diff --git a/environments/aws/ca-north-1/live/.terraform-version b/environments/aws/ca-north-1/live/.terraform-version
new file mode 100644
index 0000000..e516bb9
--- /dev/null
+++ b/environments/aws/ca-north-1/live/.terraform-version
@@ -0,0 +1 @@
+1.4.5
diff --git a/environments/aws/ca-north-1/live/backend.tf b/environments/aws/ca-north-1/live/backend.tf
new file mode 100644
index 0000000..3ca62ec
--- /dev/null
+++ b/environments/aws/ca-north-1/live/backend.tf
@@ -0,0 +1,10 @@
+terraform {
+  backend "s3" {
+    bucket         = "vsds-ca-central-1-live-tfstate"
+    key            = "dynatrace/configuration.tfstate"
+    region         = "ca-central-1"
+    encrypt        = true
+    kms_key_id     = "arn:aws:kms:ca-central-1:309171553603:key/76c0ef26-c444-4a6e-b792-e5901a88c4f3"
+    dynamodb_table = "vsds-ca-central-1-live-tfstate-lock"
+  }
+}
diff --git a/environments/aws/ca-north-1/live/terraform.tfvars b/environments/aws/ca-north-1/live/terraform.tfvars
new file mode 100644
index 0000000..e69de29
diff --git a/environments/aws/ca-north-1/prelive/.terraform-version b/environments/aws/ca-north-1/prelive/.terraform-version
new file mode 100644
index 0000000..e516bb9
--- /dev/null
+++ b/environments/aws/ca-north-1/prelive/.terraform-version
@@ -0,0 +1 @@
+1.4.5
diff --git a/environments/aws/ca-north-1/prelive/backend.tf b/environments/aws/ca-north-1/prelive/backend.tf
new file mode 100644
index 0000000..0241c7d
--- /dev/null
+++ b/environments/aws/ca-north-1/prelive/backend.tf
@@ -0,0 +1,10 @@
+terraform {
+  backend "s3" {
+    bucket         = "vsds-ca-central-1-prelive-tfstate"
+    key            = "dynatrace/configuration.tfstate"
+    region         = "ca-central-1"
+    encrypt        = true
+    kms_key_id     = "arn:aws:kms:ca-central-1:764655472117:key/7992822a-76ca-4d2f-bd31-cf6ce371369f"
+    dynamodb_table = "vsds-ca-central-1-prelive-tfstate-lock"
+  }
+}
diff --git a/environments/aws/ca-north-1/prelive/terraform.tfvars b/environments/aws/ca-north-1/prelive/terraform.tfvars
new file mode 100644
index 0000000..e69de29
diff --git a/environments/aws/eu-west-1/int/.terraform-version b/environments/aws/eu-west-1/int/.terraform-version
new file mode 100644
index 0000000..e516bb9
--- /dev/null
+++ b/environments/aws/eu-west-1/int/.terraform-version
@@ -0,0 +1 @@
+1.4.5
diff --git a/packages/us-east-1/prelive/backend.tf b/environments/aws/eu-west-1/int/backend.tf
similarity index 54%
rename from packages/us-east-1/prelive/backend.tf
rename to environments/aws/eu-west-1/int/backend.tf
index 2a6f73b..cd0d7f9 100644
--- a/packages/us-east-1/prelive/backend.tf
+++ b/environments/aws/eu-west-1/int/backend.tf
@@ -1,9 +1,10 @@
 terraform {
   backend "s3" {
-    bucket     = "vsds-eu-west-1-prelive-tfstate"
-    key        = "acdc/dynatrace/us-east-1/prelive/bootstrap.tfstate"
+    bucket     = "fdc-eu-west-1-int-tfstate"
+    key        = "dynatrace/configuration.tfstate"
     region     = "eu-west-1"
     encrypt    = true
+    dynamodb_table = "fdc-eu-west-1-int-tfstate-lock"
     kms_key_id = "arn:aws:kms:eu-west-1:248567303878:key/8d860956-4033-4782-ab30-6cb84b31964e"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/us-east-1/prelive/provider.tf b/environments/aws/eu-west-1/int/provider.tf
similarity index 64%
rename from packages/us-east-1/prelive/provider.tf
rename to environments/aws/eu-west-1/int/provider.tf
index 7024448..b3fecc3 100644
--- a/packages/us-east-1/prelive/provider.tf
+++ b/environments/aws/eu-west-1/int/provider.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     dynatrace = {
-      version = "1.31.0"
+      version = "1.33.0"
       source  = "dynatrace-oss/dynatrace"
     }
     aws = {
@@ -13,4 +13,9 @@ terraform {
 
 provider "aws" {
   region = var.aws_region
-}
\ No newline at end of file
+}
+
+provider "dynatrace" {
+    dt_env_url    = var.dt_env_url
+    dt_api_token  = var.dt_api_token
+}
diff --git a/environments/aws/eu-west-1/int/terraform.tfvars b/environments/aws/eu-west-1/int/terraform.tfvars
new file mode 100644
index 0000000..c39fd24
--- /dev/null
+++ b/environments/aws/eu-west-1/int/terraform.tfvars
@@ -0,0 +1,3 @@
+aws_region = "eu-west-1"
+
+dt_env_url    = "https://console.prelive.eu.mon.vsds.swarm.audi/e/7af68984-f27e-4207-81cb-39b4e6ecf631/api"
diff --git a/environments/aws/eu-west-1/int/variables.tf b/environments/aws/eu-west-1/int/variables.tf
new file mode 100644
index 0000000..ebe6d48
--- /dev/null
+++ b/environments/aws/eu-west-1/int/variables.tf
@@ -0,0 +1,11 @@
+variable "aws_region" {
+  description = "The aws region to deploy in"
+}
+
+variable "dt_env_url" {
+  description = "Dynatrace Environment URL"
+}
+
+variable "dt_api_token" {
+  description = "Dynatrace API Token"
+}
diff --git a/environments/aws/eu-west-1/live/.terraform-version b/environments/aws/eu-west-1/live/.terraform-version
new file mode 100644
index 0000000..e516bb9
--- /dev/null
+++ b/environments/aws/eu-west-1/live/.terraform-version
@@ -0,0 +1 @@
+1.4.5
diff --git a/environments/aws/eu-west-1/live/backend.tf b/environments/aws/eu-west-1/live/backend.tf
new file mode 100644
index 0000000..ce200f3
--- /dev/null
+++ b/environments/aws/eu-west-1/live/backend.tf
@@ -0,0 +1,10 @@
+terraform {
+  backend "s3" {
+    bucket     = "fdc-eu-west-1-live-tfstate"
+    key        = "dynatrace/configuration.tfstate"
+    region     = "eu-west-1"
+    encrypt    = true
+    dynamodb_table = "fdc-eu-west-1-live-tfstate-lock"
+    kms_key_id = "arn:aws:kms:eu-west-1:180756133429:key/972dbf76-bf8d-45e6-94f4-baff1de7a467"
+  }
+}
diff --git a/environments/aws/eu-west-1/live/terraform.tfvars b/environments/aws/eu-west-1/live/terraform.tfvars
new file mode 100644
index 0000000..e69de29
diff --git a/environments/aws/eu-west-1/prelive/.terraform-version b/environments/aws/eu-west-1/prelive/.terraform-version
new file mode 100644
index 0000000..e516bb9
--- /dev/null
+++ b/environments/aws/eu-west-1/prelive/.terraform-version
@@ -0,0 +1 @@
+1.4.5
diff --git a/environments/aws/eu-west-1/prelive/backend.tf b/environments/aws/eu-west-1/prelive/backend.tf
new file mode 100644
index 0000000..7b0a3c5
--- /dev/null
+++ b/environments/aws/eu-west-1/prelive/backend.tf
@@ -0,0 +1,10 @@
+terraform {
+  backend "s3" {
+    bucket     = "fdc-eu-west-1-prelive-tfstate"
+    key        = "dynatrace/configuration.tfstate"
+    region     = "eu-west-1"
+    encrypt    = true
+    dynamodb_table = "fdc-eu-west-1-live-tfstate-lock"
+    kms_key_id = "arn:aws:kms:eu-west-1:626466754332:key/8edf34f3-ac75-4515-b2da-f784e425c87b"
+  }
+}
diff --git a/packages/eu-west-1/int/module.tf b/environments/aws/eu-west-1/prelive/module.tf
similarity index 100%
rename from packages/eu-west-1/int/module.tf
rename to environments/aws/eu-west-1/prelive/module.tf
diff --git a/packages/eu-west-1/int/provider.tf b/environments/aws/eu-west-1/prelive/provider.tf
similarity index 100%
rename from packages/eu-west-1/int/provider.tf
rename to environments/aws/eu-west-1/prelive/provider.tf
diff --git a/packages/eu-west-1/prelive/terraform.tfvars b/environments/aws/eu-west-1/prelive/terraform.tfvars
similarity index 100%
rename from packages/eu-west-1/prelive/terraform.tfvars
rename to environments/aws/eu-west-1/prelive/terraform.tfvars
diff --git a/packages/eu-west-1/int/variables.tf b/environments/aws/eu-west-1/prelive/variables.tf
similarity index 100%
rename from packages/eu-west-1/int/variables.tf
rename to environments/aws/eu-west-1/prelive/variables.tf
diff --git a/environments/aws/us-east-1/live/.terraform-version b/environments/aws/us-east-1/live/.terraform-version
new file mode 100644
index 0000000..e516bb9
--- /dev/null
+++ b/environments/aws/us-east-1/live/.terraform-version
@@ -0,0 +1 @@
+1.4.5
diff --git a/environments/aws/us-east-1/live/backend.tf b/environments/aws/us-east-1/live/backend.tf
new file mode 100644
index 0000000..da4787f
--- /dev/null
+++ b/environments/aws/us-east-1/live/backend.tf
@@ -0,0 +1,10 @@
+terraform {
+  backend "s3" {
+    bucket     = "fdc-us-east-1-live-tfstate"
+    key        = "dynatrace/configuration.tfstate"
+    region     = "us-east-1"
+    encrypt    = true
+    dynamodb_table = "fdc-us-east-1-live-tfstate-lock"
+    kms_key_id = "arn:aws:kms:us-east-1:366757327252:key/59ae3640-d581-4673-bcac-8151280eb850"
+  }
+}
diff --git a/environments/aws/us-east-1/live/terraform.tfvars b/environments/aws/us-east-1/live/terraform.tfvars
new file mode 100644
index 0000000..e69de29
diff --git a/environments/aws/us-east-1/prelive/.terraform-version b/environments/aws/us-east-1/prelive/.terraform-version
new file mode 100644
index 0000000..e516bb9
--- /dev/null
+++ b/environments/aws/us-east-1/prelive/.terraform-version
@@ -0,0 +1 @@
+1.4.5
diff --git a/environments/aws/us-east-1/prelive/backend.tf b/environments/aws/us-east-1/prelive/backend.tf
new file mode 100644
index 0000000..86291de
--- /dev/null
+++ b/environments/aws/us-east-1/prelive/backend.tf
@@ -0,0 +1,10 @@
+terraform {
+  backend "s3" {
+    bucket     = "fdc-us-east-1-prelive-tfstate"
+    key        = "dynatrace/configuration.tfstate"
+    region     = "us-east-1"
+    encrypt    = true
+    dynamodb_table = "fdc-us-east-1-prelive-tfstate-lock"
+    kms_key_id = "arn:aws:kms:us-east-1:188453702655:key/9cfa6079-83e9-4f61-8926-c2a3ae5dcf85"
+  }
+}
diff --git a/packages/eu-west-1/prelive/module.tf b/environments/aws/us-east-1/prelive/module.tf
similarity index 100%
rename from packages/eu-west-1/prelive/module.tf
rename to environments/aws/us-east-1/prelive/module.tf
diff --git a/packages/eu-west-1/prelive/provider.tf b/environments/aws/us-east-1/prelive/provider.tf
similarity index 100%
rename from packages/eu-west-1/prelive/provider.tf
rename to environments/aws/us-east-1/prelive/provider.tf
diff --git a/packages/us-east-1/prelive/terraform.tfvars b/environments/aws/us-east-1/prelive/terraform.tfvars
similarity index 100%
rename from packages/us-east-1/prelive/terraform.tfvars
rename to environments/aws/us-east-1/prelive/terraform.tfvars
diff --git a/packages/eu-west-1/prelive/variables.tf b/environments/aws/us-east-1/prelive/variables.tf
similarity index 100%
rename from packages/eu-west-1/prelive/variables.tf
rename to environments/aws/us-east-1/prelive/variables.tf
diff --git a/modules/.gitkeep b/modules/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/modules/aws/dynatrace/variables.tf b/modules/aws/dynatrace/variables.tf
deleted file mode 100644
index 76bf10a..0000000
--- a/modules/aws/dynatrace/variables.tf
+++ /dev/null
@@ -1,14 +0,0 @@
-variable "name" {
-  description = "Name to be used on all the resources as identifier"
-  type        = string
-}
-
-variable "stage" {
-  description = "Environment stage"
-  type        = string
-}
-
-variable "region" {
-  type        = string
-  description = "The aws region to deploy in"
-}
\ No newline at end of file
diff --git a/packages/eu-west-1/int/backend.tf b/packages/eu-west-1/int/backend.tf
deleted file mode 100644
index a0a6b8d..0000000
--- a/packages/eu-west-1/int/backend.tf
+++ /dev/null
@@ -1,9 +0,0 @@
-terraform {
-  backend "s3" {
-    bucket     = "vsds-eu-west-1-prelive-tfstate"
-    key        = "acdc/dynatrace/eu-west-1/int/bootstrap.tfstate"
-    region     = "eu-west-1"
-    encrypt    = true
-    kms_key_id = "arn:aws:kms:eu-west-1:248567303878:key/8d860956-4033-4782-ab30-6cb84b31964e"
-  }
-}
\ No newline at end of file
diff --git a/packages/eu-west-1/int/terraform.tfvars b/packages/eu-west-1/int/terraform.tfvars
deleted file mode 100644
index be917ec..0000000
--- a/packages/eu-west-1/int/terraform.tfvars
+++ /dev/null
@@ -1,13 +0,0 @@
-stack = "acdc"
-stage = "int"
-name  = "dynatrace-int"
-
-aws_region = "eu-west-1"
-
-tags = {
-  "Managed_By" : "NTT_team"
-}
-
-kms = {
-  "s3" = "arn:aws:kms:eu-west-1:248567303878:key/8d860956-4033-4782-ab30-6cb84b31964e"
-}
\ No newline at end of file
diff --git a/packages/eu-west-1/prelive/backend.tf b/packages/eu-west-1/prelive/backend.tf
deleted file mode 100644
index 5a5a1ae..0000000
--- a/packages/eu-west-1/prelive/backend.tf
+++ /dev/null
@@ -1,9 +0,0 @@
-terraform {
-  backend "s3" {
-    bucket     = "vsds-eu-west-1-prelive-tfstate"
-    key        = "acdc/dynatrace/eu-west-1/prelive/bootstrap.tfstate"
-    region     = "eu-west-1"
-    encrypt    = true
-    kms_key_id = "arn:aws:kms:eu-west-1:248567303878:key/8d860956-4033-4782-ab30-6cb84b31964e"
-  }
-}
\ No newline at end of file
diff --git a/packages/us-east-1/prelive/module.tf b/packages/us-east-1/prelive/module.tf
deleted file mode 100644
index 1cd621c..0000000
--- a/packages/us-east-1/prelive/module.tf
+++ /dev/null
@@ -1,3 +0,0 @@
-resource "dynatrace_audit_log" "test" {
-  enabled = false
-}
\ No newline at end of file
diff --git a/packages/us-east-1/prelive/variables.tf b/packages/us-east-1/prelive/variables.tf
deleted file mode 100644
index f7a3863..0000000
--- a/packages/us-east-1/prelive/variables.tf
+++ /dev/null
@@ -1,30 +0,0 @@
-variable "aws_region" {
-  description = "The aws region to deploy in"
-}
-
-variable "name" {
-  description = "Name to be used on all the resources as identifier"
-  type        = string
-  default     = ""
-}
-
-variable "stack" {
-  description = "Environment stack"
-  default     = "vsds"
-}
-
-variable "stage" {
-  description = "Environment stage"
-}
-
-variable "tags" {
-  description = "A map of tags to add to all resources"
-  type        = map(string)
-  default     = {}
-}
-
-variable "kms" {
-  description = "A map of kms keys to be used for any resources."
-  type        = map(string)
-  default     = {}
-}
\ No newline at end of file