diff --git a/.github/workflows/terraform-apply.yml b/.github/workflows/terraform-apply.yml
index edefeb1..60986b0 100644
--- a/.github/workflows/terraform-apply.yml
+++ b/.github/workflows/terraform-apply.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - main
     paths:
-      - 'mlops/infra/terraform/**'
+      - 'terraform/**'
       - 'mlops/pipelines/**'
       - '.github/workflows/terraform-plan.yml'
       - '.github/workflows/terraform-apply.yml'
@@ -21,7 +21,7 @@ jobs:
 
     env:
       AWS_REGION: us-west-2
-      TF_WORKING_DIR: mlops/infra/terraform/envs/dev
+      TF_WORKING_DIR: terraform/envs/dev
       PIPELINE_NAME: digital-twin-resilience-dev-pipeline
       PIPELINE_MODE: stub
       LLM_PROVIDER: openai
diff --git a/.github/workflows/terraform-plan.yml b/.github/workflows/terraform-plan.yml
index 6f98c53..49d3c2a 100644
--- a/.github/workflows/terraform-plan.yml
+++ b/.github/workflows/terraform-plan.yml
@@ -3,7 +3,7 @@ name: Terraform Plan
 on:
   pull_request:
     paths:
-      - 'mlops/infra/terraform/**'
+      - 'terraform/**'
       - 'mlops/pipelines/**'
       - '.github/workflows/terraform-plan.yml'
       - '.github/workflows/terraform-apply.yml'
@@ -19,7 +19,7 @@ jobs:
 
     env:
       AWS_REGION: us-west-2
-      TF_WORKING_DIR: mlops/infra/terraform/envs/dev
+      TF_WORKING_DIR: terraform/envs/dev
       PIPELINE_MODE: stub
       PIPELINE_NAME: digital-twin-resilience-dev-pipeline
       LLM_PROVIDER: openai
diff --git a/mlops/infra/.DS_Store b/mlops/infra/.DS_Store
deleted file mode 100644
index b388fca..0000000
Binary files a/mlops/infra/.DS_Store and /dev/null differ
diff --git a/mlops/infra/terraform/.DS_Store b/terraform/.DS_Store
similarity index 100%
rename from mlops/infra/terraform/.DS_Store
rename to terraform/.DS_Store
diff --git a/mlops/infra/terraform/envs/.DS_Store b/terraform/envs/.DS_Store
similarity index 100%
rename from mlops/infra/terraform/envs/.DS_Store
rename to terraform/envs/.DS_Store
diff --git a/mlops/infra/terraform/envs/dev/.terraform.lock.hcl b/terraform/envs/dev/.terraform.lock.hcl
similarity index 100%
rename from mlops/infra/terraform/envs/dev/.terraform.lock.hcl
rename to terraform/envs/dev/.terraform.lock.hcl
diff --git a/mlops/infra/terraform/envs/dev/README.md b/terraform/envs/dev/README.md
similarity index 100%
rename from mlops/infra/terraform/envs/dev/README.md
rename to terraform/envs/dev/README.md
diff --git a/mlops/infra/terraform/envs/dev/main.tf b/terraform/envs/dev/main.tf
similarity index 84%
rename from mlops/infra/terraform/envs/dev/main.tf
rename to terraform/envs/dev/main.tf
index 279dbf2..d820005 100644
--- a/mlops/infra/terraform/envs/dev/main.tf
+++ b/terraform/envs/dev/main.tf
@@ -30,6 +30,6 @@ module "sagemaker_pipeline" {
   project_name             = local.project_name
   env                      = local.env
   pipeline_role_arn        = var.sagemaker_execution_role_arn
-  pipeline_definition_path = "${path.module}/../../../../pipelines/digital_twin_resilience/pipeline_definition.json"
+  pipeline_definition_path = "${path.module}/../../../mlops/pipelines/digital_twin_resilience/pipeline_definition.json"
   tags                     = local.common_tags
 }
diff --git a/mlops/infra/terraform/envs/dev/outputs.tf b/terraform/envs/dev/outputs.tf
similarity index 100%
rename from mlops/infra/terraform/envs/dev/outputs.tf
rename to terraform/envs/dev/outputs.tf
diff --git a/mlops/infra/terraform/envs/dev/terraform.tfvars.example b/terraform/envs/dev/terraform.tfvars.example
similarity index 100%
rename from mlops/infra/terraform/envs/dev/terraform.tfvars.example
rename to terraform/envs/dev/terraform.tfvars.example
diff --git a/mlops/infra/terraform/envs/dev/variables.tf b/terraform/envs/dev/variables.tf
similarity index 100%
rename from mlops/infra/terraform/envs/dev/variables.tf
rename to terraform/envs/dev/variables.tf
diff --git a/mlops/infra/terraform/modules/.DS_Store b/terraform/modules/.DS_Store
similarity index 100%
rename from mlops/infra/terraform/modules/.DS_Store
rename to terraform/modules/.DS_Store
diff --git a/mlops/infra/terraform/modules/iam/main.tf b/terraform/modules/iam/main.tf
similarity index 100%
rename from mlops/infra/terraform/modules/iam/main.tf
rename to terraform/modules/iam/main.tf
diff --git a/mlops/infra/terraform/modules/iam/outputs.tf b/terraform/modules/iam/outputs.tf
similarity index 100%
rename from mlops/infra/terraform/modules/iam/outputs.tf
rename to terraform/modules/iam/outputs.tf
diff --git a/mlops/infra/terraform/modules/iam/variables.tf b/terraform/modules/iam/variables.tf
similarity index 100%
rename from mlops/infra/terraform/modules/iam/variables.tf
rename to terraform/modules/iam/variables.tf
diff --git a/mlops/infra/terraform/modules/s3/main.tf b/terraform/modules/s3/main.tf
similarity index 100%
rename from mlops/infra/terraform/modules/s3/main.tf
rename to terraform/modules/s3/main.tf
diff --git a/mlops/infra/terraform/modules/s3/outptus.tf b/terraform/modules/s3/outptus.tf
similarity index 100%
rename from mlops/infra/terraform/modules/s3/outptus.tf
rename to terraform/modules/s3/outptus.tf
diff --git a/mlops/infra/terraform/modules/s3/variables.tf b/terraform/modules/s3/variables.tf
similarity index 100%
rename from mlops/infra/terraform/modules/s3/variables.tf
rename to terraform/modules/s3/variables.tf
diff --git a/mlops/infra/terraform/modules/sagemaker_pipeline/main.tf b/terraform/modules/sagemaker_pipeline/main.tf
similarity index 100%
rename from mlops/infra/terraform/modules/sagemaker_pipeline/main.tf
rename to terraform/modules/sagemaker_pipeline/main.tf
diff --git a/mlops/infra/terraform/modules/sagemaker_pipeline/outputs.tf b/terraform/modules/sagemaker_pipeline/outputs.tf
similarity index 100%
rename from mlops/infra/terraform/modules/sagemaker_pipeline/outputs.tf
rename to terraform/modules/sagemaker_pipeline/outputs.tf
diff --git a/mlops/infra/terraform/modules/sagemaker_pipeline/variables.tf b/terraform/modules/sagemaker_pipeline/variables.tf
similarity index 100%
rename from mlops/infra/terraform/modules/sagemaker_pipeline/variables.tf
rename to terraform/modules/sagemaker_pipeline/variables.tf