diff --git a/Modules/ACM/main.tf b/Modules/AWS/ACM/main.tf
similarity index 100%
rename from Modules/ACM/main.tf
rename to Modules/AWS/ACM/main.tf
diff --git a/Modules/ACM/outputs.tf b/Modules/AWS/ACM/outputs.tf
similarity index 100%
rename from Modules/ACM/outputs.tf
rename to Modules/AWS/ACM/outputs.tf
diff --git a/Modules/ACM/variables.tf b/Modules/AWS/ACM/variables.tf
similarity index 100%
rename from Modules/ACM/variables.tf
rename to Modules/AWS/ACM/variables.tf
diff --git a/Modules/ALB/main.tf b/Modules/AWS/ALB/main.tf
similarity index 100%
rename from Modules/ALB/main.tf
rename to Modules/AWS/ALB/main.tf
diff --git a/Modules/ALB/outputs.tf b/Modules/AWS/ALB/outputs.tf
similarity index 100%
rename from Modules/ALB/outputs.tf
rename to Modules/AWS/ALB/outputs.tf
diff --git a/Modules/ALB/variables.tf b/Modules/AWS/ALB/variables.tf
similarity index 100%
rename from Modules/ALB/variables.tf
rename to Modules/AWS/ALB/variables.tf
diff --git a/Modules/CloudFront/main.tf b/Modules/AWS/CloudFront/main.tf
similarity index 100%
rename from Modules/CloudFront/main.tf
rename to Modules/AWS/CloudFront/main.tf
diff --git a/Modules/CloudFront/outputs.tf b/Modules/AWS/CloudFront/outputs.tf
similarity index 100%
rename from Modules/CloudFront/outputs.tf
rename to Modules/AWS/CloudFront/outputs.tf
diff --git a/Modules/CloudFront/variables.tf b/Modules/AWS/CloudFront/variables.tf
similarity index 100%
rename from Modules/CloudFront/variables.tf
rename to Modules/AWS/CloudFront/variables.tf
diff --git a/Modules/CloudWatch/main.tf b/Modules/AWS/CloudWatch/main.tf
similarity index 100%
rename from Modules/CloudWatch/main.tf
rename to Modules/AWS/CloudWatch/main.tf
diff --git a/Modules/CloudWatch/outputs.tf b/Modules/AWS/CloudWatch/outputs.tf
similarity index 100%
rename from Modules/CloudWatch/outputs.tf
rename to Modules/AWS/CloudWatch/outputs.tf
diff --git a/Modules/DocumentDB/main.tf b/Modules/AWS/DocumentDB/main.tf
similarity index 100%
rename from Modules/DocumentDB/main.tf
rename to Modules/AWS/DocumentDB/main.tf
diff --git a/Modules/DocumentDB/variables.tf b/Modules/AWS/DocumentDB/variables.tf
similarity index 100%
rename from Modules/DocumentDB/variables.tf
rename to Modules/AWS/DocumentDB/variables.tf
diff --git a/Modules/EC2/main.tf b/Modules/AWS/EC2/main.tf
similarity index 100%
rename from Modules/EC2/main.tf
rename to Modules/AWS/EC2/main.tf
diff --git a/Modules/EC2/variables.tf b/Modules/AWS/EC2/variables.tf
similarity index 100%
rename from Modules/EC2/variables.tf
rename to Modules/AWS/EC2/variables.tf
diff --git a/Modules/ECR/main.tf b/Modules/AWS/ECR/main.tf
similarity index 100%
rename from Modules/ECR/main.tf
rename to Modules/AWS/ECR/main.tf
diff --git a/Modules/ECR/outputs.tf b/Modules/AWS/ECR/outputs.tf
similarity index 100%
rename from Modules/ECR/outputs.tf
rename to Modules/AWS/ECR/outputs.tf
diff --git a/Modules/ECS/main.tf b/Modules/AWS/ECS/main.tf
similarity index 100%
rename from Modules/ECS/main.tf
rename to Modules/AWS/ECS/main.tf
diff --git a/Modules/ECS/variables.tf b/Modules/AWS/ECS/variables.tf
similarity index 100%
rename from Modules/ECS/variables.tf
rename to Modules/AWS/ECS/variables.tf
diff --git a/Modules/ElastiCache/main.tf b/Modules/AWS/ElastiCache/main.tf
similarity index 100%
rename from Modules/ElastiCache/main.tf
rename to Modules/AWS/ElastiCache/main.tf
diff --git a/Modules/ElastiCache/variables.tf b/Modules/AWS/ElastiCache/variables.tf
similarity index 100%
rename from Modules/ElastiCache/variables.tf
rename to Modules/AWS/ElastiCache/variables.tf
diff --git a/Modules/EventBridge/main.tf b/Modules/AWS/EventBridge/main.tf
similarity index 100%
rename from Modules/EventBridge/main.tf
rename to Modules/AWS/EventBridge/main.tf
diff --git a/Modules/EventBridge/variables.tf b/Modules/AWS/EventBridge/variables.tf
similarity index 100%
rename from Modules/EventBridge/variables.tf
rename to Modules/AWS/EventBridge/variables.tf
diff --git a/Modules/IAM/main.tf b/Modules/AWS/IAM/main.tf
similarity index 100%
rename from Modules/IAM/main.tf
rename to Modules/AWS/IAM/main.tf
diff --git a/Modules/IAM/outputs.tf b/Modules/AWS/IAM/outputs.tf
similarity index 100%
rename from Modules/IAM/outputs.tf
rename to Modules/AWS/IAM/outputs.tf
diff --git a/Modules/KMS/main.tf b/Modules/AWS/KMS/main.tf
similarity index 100%
rename from Modules/KMS/main.tf
rename to Modules/AWS/KMS/main.tf
diff --git a/Modules/KMS/outputs.tf b/Modules/AWS/KMS/outputs.tf
similarity index 100%
rename from Modules/KMS/outputs.tf
rename to Modules/AWS/KMS/outputs.tf
diff --git a/Modules/Networking/main.tf b/Modules/AWS/Networking/main.tf
similarity index 100%
rename from Modules/Networking/main.tf
rename to Modules/AWS/Networking/main.tf
diff --git a/Modules/Networking/outputs.tf b/Modules/AWS/Networking/outputs.tf
similarity index 100%
rename from Modules/Networking/outputs.tf
rename to Modules/AWS/Networking/outputs.tf
diff --git a/Modules/Networking/variables.tf b/Modules/AWS/Networking/variables.tf
similarity index 100%
rename from Modules/Networking/variables.tf
rename to Modules/AWS/Networking/variables.tf
diff --git a/Modules/RDS/main.tf b/Modules/AWS/RDS/main.tf
similarity index 100%
rename from Modules/RDS/main.tf
rename to Modules/AWS/RDS/main.tf
diff --git a/Modules/RDS/variables.tf b/Modules/AWS/RDS/variables.tf
similarity index 100%
rename from Modules/RDS/variables.tf
rename to Modules/AWS/RDS/variables.tf
diff --git a/Modules/Route53/main.tf b/Modules/AWS/Route53/main.tf
similarity index 100%
rename from Modules/Route53/main.tf
rename to Modules/AWS/Route53/main.tf
diff --git a/Modules/Route53/variables.tf b/Modules/AWS/Route53/variables.tf
similarity index 100%
rename from Modules/Route53/variables.tf
rename to Modules/AWS/Route53/variables.tf
diff --git a/Modules/S3/main.tf b/Modules/AWS/S3/main.tf
similarity index 100%
rename from Modules/S3/main.tf
rename to Modules/AWS/S3/main.tf
diff --git a/Modules/S3/outputs.tf b/Modules/AWS/S3/outputs.tf
similarity index 100%
rename from Modules/S3/outputs.tf
rename to Modules/AWS/S3/outputs.tf
diff --git a/Modules/S3/variables.tf b/Modules/AWS/S3/variables.tf
similarity index 100%
rename from Modules/S3/variables.tf
rename to Modules/AWS/S3/variables.tf
diff --git a/Modules/SecurityGroup/main.tf b/Modules/AWS/SecurityGroup/main.tf
similarity index 100%
rename from Modules/SecurityGroup/main.tf
rename to Modules/AWS/SecurityGroup/main.tf
diff --git a/Modules/SecurityGroup/outputs.tf b/Modules/AWS/SecurityGroup/outputs.tf
similarity index 100%
rename from Modules/SecurityGroup/outputs.tf
rename to Modules/AWS/SecurityGroup/outputs.tf
diff --git a/Modules/SecurityGroup/variables.tf b/Modules/AWS/SecurityGroup/variables.tf
similarity index 100%
rename from Modules/SecurityGroup/variables.tf
rename to Modules/AWS/SecurityGroup/variables.tf
diff --git a/main.tf b/main.tf
index 643d613..6b9d3a2 100644
--- a/main.tf
+++ b/main.tf
@@ -1,11 +1,11 @@
 module "acm" {
-  source          = "./Modules/ACM"
+  source          = "./Modules/AWS/ACM"
   domain_name     = var.domain_name
   route53_zone_id = var.route53_zone_id
 }
 
 module "alb" {
-  source                = "./Modules/ALB"
+  source                = "./Modules/AWS/ALB"
   alb_certificate_arn   = module.acm.alb_certificate_arn
   alb_health_check_path = var.alb_health_check_path
   public_subnets        = module.networking.public_subnets
@@ -14,7 +14,7 @@ module "alb" {
 }
 
 module "cloudfront" {
-  source                               = "./Modules/CloudFront"
+  source                               = "./Modules/AWS/CloudFront"
   aws_region                           = var.aws_region
   cloudfront_certificate_arn           = module.acm.cloudfront_certificate_arn
   domain_name                          = var.domain_name
@@ -22,11 +22,11 @@ module "cloudfront" {
 }
 
 module "cloudwatch" {
-  source = "./Modules/CloudWatch"
+  source = "./Modules/AWS/CloudWatch"
 }
 
 module "documentdb" {
-  source           = "./Modules/DocumentDB"
+  source           = "./Modules/AWS/DocumentDB"
   mongodb_password = var.mongodb_password
   mongodb_username = var.mongodb_username
   public_subnets   = module.networking.public_subnets
@@ -34,11 +34,11 @@ module "documentdb" {
 }
 
 module "ecr" {
-  source = "./Modules/ECR"
+  source = "./Modules/AWS/ECR"
 }
 
 module "ecs" {
-  source                      = "./Modules/ECS"
+  source                      = "./Modules/AWS/ECS"
   alb_target_group_arn        = module.alb.alb_target_group_arn
   asset_bucket_arn            = module.s3.asset_bucket_arn
   aws_region                  = var.aws_region
@@ -53,34 +53,34 @@ module "ecs" {
 }
 
 module "ec2" {
-  source                   = "./Modules/EC2"
+  source                   = "./Modules/AWS/EC2"
   public_subnets           = module.networking.public_subnets
   sg_db_access_instance_id = module.security_group.sg_db_access_instance_id
 }
 
 module "elasticache" {
-  source         = "./Modules/ElastiCache"
+  source         = "./Modules/AWS/ElastiCache"
   public_subnets = module.networking.public_subnets
   sg_valkey_id   = module.security_group.sg_valkey_id
 }
 
 module "eventbridge" {
-  source                                = "./Modules/EventBridge"
+  source                                = "./Modules/AWS/EventBridge"
   api_secret_key                        = var.api_secret_key
   domain_name                           = var.domain_name
   eventbridge_api_destinations_role_arn = module.iam.eventbridge_api_destinations_role_arn
 }
 
 module "iam" {
-  source = "./Modules/IAM"
+  source = "./Modules/AWS/IAM"
 }
 
 module "kms" {
-  source = "./Modules/KMS"
+  source = "./Modules/AWS/KMS"
 }
 
 module "networking" {
-  source                   = "./Modules/Networking"
+  source                   = "./Modules/AWS/Networking"
   aws_region               = var.aws_region
   availability_zones       = var.availability_zones
   public_subnet_cidr_block = var.public_subnet_cidr_block
@@ -88,7 +88,7 @@ module "networking" {
 }
 
 module "rds" {
-  source          = "./Modules/RDS"
+  source          = "./Modules/AWS/RDS"
   kms_rds_key_arn = module.kms.kms_rds_key_arn
   mysql_password  = var.mysql_password
   mysql_username  = var.mysql_username
@@ -97,7 +97,7 @@ module "rds" {
 }
 
 module "route53" {
-  source                                 = "./Modules/Route53"
+  source                                 = "./Modules/AWS/Route53"
   alb_dns_name                           = module.alb.alb_dns_name
   alb_zone_id                            = module.alb.alb_zone_id
   cloudfront_distribution_domain_name    = module.cloudfront.cloudfront_distribution_domain_name
@@ -108,12 +108,12 @@ module "route53" {
 }
 
 module "s3" {
-  source                      = "./Modules/S3"
+  source                      = "./Modules/AWS/S3"
   cloudfront_distribution_arn = module.cloudfront.cloudfront_distribution_arn
 }
 
 module "security_group" {
-  source                   = "./Modules/SecurityGroup"
+  source                   = "./Modules/AWS/SecurityGroup"
   public_subnet_cidr_block = var.public_subnet_cidr_block
   vpc_id                   = module.networking.vpc_id
 }