diff --git a/terraform/aws/gwlb-master/README.md b/terraform/aws/gwlb-master/README.md
index 7e7a231d..ab1d1014 100755
--- a/terraform/aws/gwlb-master/README.md
+++ b/terraform/aws/gwlb-master/README.md
@@ -55,7 +55,7 @@ secret_key = "my-secret-key"
   //    secret_key = var.aws_secret_access_key
   }
   ```
-  b. The next lines in main.tf file, in the provider aws resource, need to be commented for sub-modules /terraform/aws/autoscale, /terraform/aws/modules/management and /terraform/aws/modules/cme-iam-role-gwlb:
+  b. The next lines in main.tf file, in the provider aws resource, need to be commented for sub-modules /terraform/aws/autoscale, /terraform/aws/management and /terraform/aws/cme-iam-role-gwlb:
   ```
   provider "aws" {
   //    region = var.region
diff --git a/terraform/aws/gwlb/README.md b/terraform/aws/gwlb/README.md
index 41a47ad4..4610a3b7 100755
--- a/terraform/aws/gwlb/README.md
+++ b/terraform/aws/gwlb/README.md
@@ -53,7 +53,7 @@ secret_key = "my-secret-key"
   //    secret_key = var.aws_secret_access_key
   }
   ```
-  b. The next lines in main.tf file, in the provider aws resource, need to be commented for sub-modules /terraform/aws/autoscale, /terraform/aws/modules/management and /terraform/aws/modules/cme-iam-role-gwlb:
+  b. The next lines in main.tf file, in the provider aws resource, need to be commented for sub-modules /terraform/aws/autoscale, /terraform/aws/management and /terraform/aws/cme-iam-role-gwlb:
   ```
   provider "aws" {
   //    region = var.region
diff --git a/terraform/aws/qs-autoscale-master/README.md b/terraform/aws/qs-autoscale-master/README.md
index db6c44a6..ff6fcd89 100755
--- a/terraform/aws/qs-autoscale-master/README.md
+++ b/terraform/aws/qs-autoscale-master/README.md
@@ -17,10 +17,10 @@ These types of Terraform resources are supported:
 See the [Check Point CloudGuard Auto Scaling on AWS](https://aws.amazon.com/quickstart/architecture/check-point-cloudguard/) for additional information
 
 This solution uses the following modules:
-- /terraform/aws/modules/qs-autoscale
-- /terraform/aws/modules/autoscale
-- /terraform/aws/modules/management
-- /terraform/aws/modules/cme-iam-role
+- /terraform/aws/qs-autoscale
+- /terraform/aws/autoscale
+- /terraform/aws/management
+- /terraform/aws/cme-iam-role
 - /terraform/aws/modules/vpc
 
 ## Configurations
@@ -41,7 +41,7 @@ access_key = "my-access-key"
 secret_key = "my-secret-key"
 ```
 - In case the Static credentials are used, perform modifications described below:<br/>
-  a. The next lines in main.tf file, in the provider aws resource, need to be commented for sub-modules /terraform/aws/modules/qs-autoscale, /terraform/aws/autoscale, /terraform/aws/modules/management and /terraform/aws/modules/cme-iam-role:
+  a. The next lines in main.tf file, in the provider aws resource, need to be commented for sub-modules /terraform/aws/qs-autoscale, /terraform/aws/autoscale, /terraform/aws/management and /terraform/aws/cme-iam-role:
   ```
   provider "aws" {
   //  region = var.region
@@ -58,7 +58,7 @@ secret_key = "my-secret-key"
   //    secret_key = var.secret_key
   }
   ```
-  b. The next lines in main.tf file, in the provider aws resource, need to be commented for sub-modules /terraform/aws/modules/qs-autoscale, /terraform/aws/autoscale and /terraform/aws/modules/management:
+  b. The next lines in main.tf file, in the provider aws resource, need to be commented for sub-modules /terraform/aws/qs-autoscale, /terraform/aws/autoscale and /terraform/aws/management:
   ```
   provider "aws" {
   //    region = var.region
diff --git a/terraform/aws/qs-autoscale/README.md b/terraform/aws/qs-autoscale/README.md
index f28045e3..8ad0f90f 100755
--- a/terraform/aws/qs-autoscale/README.md
+++ b/terraform/aws/qs-autoscale/README.md
@@ -14,10 +14,10 @@ These types of Terraform resources are supported:
 See the [Check Point CloudGuard Auto Scaling on AWS](https://aws.amazon.com/quickstart/architecture/check-point-cloudguard/) for additional information
 
 This solution uses the following modules:
-- /terraform/aws/modules/autoscale
-- /terraform/aws/modules/custom_autoscale
-- /terraform/aws/modules/management
-- /terraform/aws/modules/cme-iam-role
+- /terraform/aws/autoscale
+- /terraform/aws/modules/custom-autoscale
+- /terraform/aws/management
+- /terraform/aws/cme-iam-role
 
 ## Configurations
 
@@ -37,7 +37,7 @@ access_key = "my-access-key"
 secret_key = "my-secret-key"
 ```
 - In case the Static credentials are used, perform modifications described below:<br/>
-  a. The next lines in main.tf file, in the provider aws resource, need to be commented for sub-modules /terraform/aws/autoscale, /terraform/aws/modules/management and /terraform/aws/modules/cme-iam-role:
+  a. The next lines in main.tf file, in the provider aws resource, need to be commented for sub-modules /terraform/aws/autoscale, /terraform/aws/management and /terraform/aws/cme-iam-role:
   ```
   provider "aws" {
   //  region = var.region
@@ -54,7 +54,7 @@ secret_key = "my-secret-key"
   //    secret_key = var.aws_secret_access_key
   }
   ```
-  b. The next lines in main.tf file, in the provider aws resource, need to be commented for sub-modules /terraform/aws/autoscale, /terraform/aws/modules/management and /terraform/aws/modules/cme-iam-role:
+  b. The next lines in main.tf file, in the provider aws resource, need to be commented for sub-modules /terraform/aws/autoscale, /terraform/aws/management and /terraform/aws/cme-iam-role:
   ```
   provider "aws" {
   //    region = var.region
diff --git a/terraform/aws/tgw-asg-master/README.md b/terraform/aws/tgw-asg-master/README.md
index 7bc95fd7..e0373ae4 100755
--- a/terraform/aws/tgw-asg-master/README.md
+++ b/terraform/aws/tgw-asg-master/README.md
@@ -18,9 +18,9 @@ See the [CloudGuard Network for AWS Transit Gateway R80.10 and Higher Deployment
 
 This solution uses the following modules:
 - /terraform/aws/tgw-asg
-- /terraform/aws/modules/autoscale
-- /terraform/aws/modules/management
-- /terraform/aws/modules/cme-iam-role
+- /terraform/aws/autoscale
+- /terraform/aws/management
+- /terraform/aws/cme-iam-role
 - /terraform/aws/modules/vpc
 
 ## Configurations
@@ -41,7 +41,7 @@ access_key = "my-access-key"
 secret_key = "my-secret-key"
 ```
 - In case the Static credentials are used, perform modifications described below:<br/>
-  a. The next lines in main.tf file, in the provider aws resource, need to be commented for sub-modules /terraform/aws/tgw-asg, /terraform/aws/autoscale, /terraform/aws/modules/management and /terraform/aws/modules/cme-iam-role:
+  a. The next lines in main.tf file, in the provider aws resource, need to be commented for sub-modules /terraform/aws/tgw-asg, /terraform/aws/autoscale, /terraform/aws/management and /terraform/aws/cme-iam-role:
   ```
   provider "aws" {
   //  region = var.region
@@ -58,7 +58,7 @@ secret_key = "my-secret-key"
   //    secret_key = var.aws_secret_access_key
   }
   ```
-  b. The next lines in main.tf file, in the provider aws resource, need to be commented for sub-modules /terraform/aws/tgw-asg, /terraform/aws/autoscale, /terraform/aws/modules/management and /terraform/aws/modules/cme-iam-role:
+  b. The next lines in main.tf file, in the provider aws resource, need to be commented for sub-modules /terraform/aws/tgw-asg, /terraform/aws/autoscale, /terraform/aws/management and /terraform/aws/cme-iam-role:
   ```
   provider "aws" {
   //    region = var.region
diff --git a/terraform/aws/tgw-asg/README.md b/terraform/aws/tgw-asg/README.md
index d99a5781..290e9b08 100755
--- a/terraform/aws/tgw-asg/README.md
+++ b/terraform/aws/tgw-asg/README.md
@@ -15,9 +15,9 @@ These types of Terraform resources are supported:
 See the [CloudGuard Network for AWS Transit Gateway R80.10 and Higher Deployment Guide](https://sc1.checkpoint.com/documents/IaaS/WebAdminGuides/EN/CP_CloudGuard_AWS_Transit_Gateway/Content/Topics-AWS-TGW-R80-10-AG/Introduction.htm) for additional information
 
 This solution uses the following modules:
-- /terraform/aws/modules/autoscale
-- /terraform/aws/modules/management
-- /terraform/aws/modules/cme-iam-role
+- /terraform/aws/autoscale
+- /terraform/aws/management
+- /terraform/aws/cme-iam-role
 
 ## Configurations
 
@@ -37,7 +37,7 @@ access_key = "my-access-key"
 secret_key = "my-secret-key"
 ```
 - In case the Static credentials are used, perform modifications described below:<br/>
-  a. The next lines in main.tf file, in the provider aws resource, need to be commented for sub-modules /terraform/aws/autoscale, /terraform/aws/modules/management and /terraform/aws/modules/cme-iam-role:
+  a. The next lines in main.tf file, in the provider aws resource, need to be commented for sub-modules /terraform/aws/autoscale, /terraform/aws/management and /terraform/aws/cme-iam-role:
   ```
   provider "aws" {
   //  region = var.region
@@ -54,7 +54,7 @@ secret_key = "my-secret-key"
   //    secret_key = var.aws_secret_access_key
   }
   ```
-  b. The next lines in main.tf file, in the provider aws resource, need to be commented for sub-modules /terraform/aws/autoscale, /terraform/aws/modules/management and /terraform/aws/modules/cme-iam-role:
+  b. The next lines in main.tf file, in the provider aws resource, need to be commented for sub-modules /terraform/aws/autoscale, /terraform/aws/management and /terraform/aws/cme-iam-role:
   ```
   provider "aws" {
   //    region = var.region
diff --git a/terraform/aws/tgw-gwlb-master/README.md b/terraform/aws/tgw-gwlb-master/README.md
index 47c907c4..cfd48e8d 100755
--- a/terraform/aws/tgw-gwlb-master/README.md
+++ b/terraform/aws/tgw-gwlb-master/README.md
@@ -55,7 +55,7 @@ secret_key = "my-secret-key"
   //    secret_key = var.aws_secret_access_key
   }
   ```
-  b. The next lines in main.tf file, in the provider aws resource, need to be commented for sub-modules /terraform/aws/autoscale, /terraform/aws/modules/management and /terraform/aws/modules/cme-iam-role-gwlb:
+  b. The next lines in main.tf file, in the provider aws resource, need to be commented for sub-modules /terraform/aws/autoscale, /terraform/aws/management and /terraform/aws/cme-iam-role-gwlb:
   ```
   provider "aws" {
   //    region = var.region
diff --git a/terraform/aws/tgw-gwlb/README.md b/terraform/aws/tgw-gwlb/README.md
index 67f95566..49cdf67d 100755
--- a/terraform/aws/tgw-gwlb/README.md
+++ b/terraform/aws/tgw-gwlb/README.md
@@ -55,7 +55,7 @@ secret_key = "my-secret-key"
   //    secret_key = var.aws_secret_access_key
   }
   ```
-  b. The next lines in main.tf file, in the provider aws resource, need to be commented for sub-modules /terraform/aws/autoscale, /terraform/aws/modules/management and /terraform/aws/modules/cme-iam-role-gwlb:
+  b. The next lines in main.tf file, in the provider aws resource, need to be commented for sub-modules /terraform/aws/autoscale, /terraform/aws/management and /terraform/aws/cme-iam-role-gwlb:
   ```
   provider "aws" {
   //    region = var.region