From 9b448ad97b9bc019a1d0265de8ac8a5a8e8e48e8 Mon Sep 17 00:00:00 2001
From: guybarak <guybarak@checkpoint.com>
Date: Thu, 12 Dec 2024 15:37:14 +0200
Subject: [PATCH] remove /module

---
 .../inspectionProfiles/profiles_settings.xml  |   6 +
 .idea/misc.xml                                |   7 ++
 .idea/vcs.xml                                 |   6 +
 .idea/workspace.xml                           | 104 +++++++++++++-----
 modules/autoscale-gwlb/README.md              |   2 +-
 modules/autoscale-gwlb/main.tf                |   4 +-
 modules/autoscale-gwlb/variables.tf           |   4 +-
 modules/autoscale/README.md                   |   2 +-
 modules/autoscale/main.tf                     |   4 +-
 modules/autoscale/variables.tf                |   4 +-
 modules/cluster-master/README.md              |   6 +-
 modules/cluster-master/main.tf                |   2 +-
 modules/cluster-master/variables.tf           |   4 +-
 modules/cluster/README.md                     |   4 +-
 modules/cluster/main.tf                       |   8 +-
 modules/cluster/variables.tf                  |   4 +-
 modules/cross-az-cluster-master/README.md     |   6 +-
 modules/cross-az-cluster-master/main.tf       |   2 +-
 modules/cross-az-cluster-master/variables.tf  |   4 +-
 modules/cross-az-cluster/README.md            |   4 +-
 modules/cross-az-cluster/main.tf              |   8 +-
 modules/cross-az-cluster/variables.tf         |   4 +-
 modules/gateway-master/README.md              |   4 +-
 modules/gateway-master/variables.tf           |   4 +-
 modules/gateway/README.md                     |   2 +-
 modules/gateway/variables.tf                  |   4 +-
 modules/gwlb-master/README.md                 |   4 +-
 modules/gwlb-master/main.tf                   |   2 +-
 modules/gwlb-master/variables.tf              |   8 +-
 modules/gwlb/README.md                        |   2 +-
 modules/gwlb/main.tf                          |   2 +-
 modules/gwlb/variables.tf                     |   8 +-
 modules/management/README.md                  |   2 +-
 modules/management/main.tf                    |   2 +-
 modules/management/variables.tf               |   4 +-
 modules/mds/README.md                         |   2 +-
 modules/mds/main.tf                           |   2 +-
 modules/mds/variables.tf                      |   4 +-
 modules/qs-autoscale-master/README.md         |   2 +-
 modules/qs-autoscale-master/main.tf           |   2 +-
 modules/qs-autoscale-master/variables.tf      |  10 +-
 modules/qs-autoscale/README.md                |   2 +-
 modules/qs-autoscale/main.tf                  |   6 +-
 modules/qs-autoscale/variables.tf             |  10 +-
 modules/standalone-master/README.md           |   4 +-
 modules/standalone-master/main.tf             |   2 +-
 modules/standalone-master/variables.tf        |   4 +-
 modules/standalone/README.md                  |   2 +-
 modules/standalone/main.tf                    |  10 +-
 modules/standalone/variables.tf               |   4 +-
 modules/tap/README.md                         |   6 +-
 modules/tap/main.tf                           |   2 +-
 modules/tap/variables.tf                      |   4 +-
 modules/tgw-asg-master/README.md              |   2 +-
 modules/tgw-asg-master/main.tf                |   2 +-
 modules/tgw-asg-master/variables.tf           |   8 +-
 modules/tgw-asg/variables.tf                  |   8 +-
 modules/tgw-cross-az-cluster-master/README.md |   4 +-
 modules/tgw-cross-az-cluster-master/main.tf   |   2 +-
 .../tgw-cross-az-cluster-master/variables.tf  |   4 +-
 modules/tgw-cross-az-cluster/README.md        |   4 +-
 modules/tgw-cross-az-cluster/variables.tf     |   4 +-
 modules/tgw-gwlb-master/README.md             |   4 +-
 modules/tgw-gwlb-master/main.tf               |   2 +-
 modules/tgw-gwlb-master/variables.tf          |   8 +-
 modules/tgw-gwlb/README.md                    |   2 +-
 modules/tgw-gwlb/variables.tf                 |   8 +-
 67 files changed, 230 insertions(+), 157 deletions(-)
 create mode 100644 .idea/inspectionProfiles/profiles_settings.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000..105ce2d
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..725fdc5
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Black">
+    <option name="sdkName" value="Python 3.11 (cgns_automation)" />
+  </component>
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.11 (cgns_automation)" project-jdk-type="Python SDK" />
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 44dd389..b4e16dc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,16 +5,69 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="fccd76e9-3362-4a25-a718-545ef4ddbf0a" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/main.tf" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/modules/minimal_subnet/README.md" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/modules/minimal_subnet/main.tf" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/modules/minimal_subnet/outputs.tf" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/modules/minimal_subnet/variables.tf" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/modules/minimal_vpc/README.md" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/modules/minimal_vpc/main.tf" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/modules/minimal_vpc/outputs.tf" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/modules/minimal_vpc/variables.tf" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/autoscale-gwlb/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/modules/autoscale-gwlb/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/autoscale-gwlb/main.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/autoscale-gwlb/main.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/autoscale-gwlb/variables.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/autoscale-gwlb/variables.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/autoscale/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/modules/autoscale/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/autoscale/main.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/autoscale/main.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/autoscale/variables.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/autoscale/variables.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/cluster-master/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/modules/cluster-master/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/cluster-master/main.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/cluster-master/main.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/cluster-master/variables.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/cluster-master/variables.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/cluster/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/modules/cluster/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/cluster/main.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/cluster/main.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/cluster/variables.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/cluster/variables.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/cross-az-cluster-master/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/modules/cross-az-cluster-master/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/cross-az-cluster-master/main.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/cross-az-cluster-master/main.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/cross-az-cluster-master/variables.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/cross-az-cluster-master/variables.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/cross-az-cluster/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/modules/cross-az-cluster/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/cross-az-cluster/main.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/cross-az-cluster/main.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/cross-az-cluster/variables.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/cross-az-cluster/variables.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/gateway-master/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/modules/gateway-master/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/gateway-master/variables.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/gateway-master/variables.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/gateway/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/modules/gateway/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/gateway/variables.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/gateway/variables.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/gwlb-master/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/modules/gwlb-master/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/gwlb-master/main.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/gwlb-master/main.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/gwlb-master/variables.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/gwlb-master/variables.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/gwlb/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/modules/gwlb/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/gwlb/main.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/gwlb/main.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/gwlb/variables.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/gwlb/variables.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/management/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/modules/management/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/management/main.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/management/main.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/management/variables.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/management/variables.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/mds/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/modules/mds/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/mds/main.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/mds/main.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/mds/variables.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/mds/variables.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/qs-autoscale-master/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/modules/qs-autoscale-master/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/qs-autoscale-master/main.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/qs-autoscale-master/main.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/qs-autoscale-master/variables.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/qs-autoscale-master/variables.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/qs-autoscale/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/modules/qs-autoscale/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/qs-autoscale/main.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/qs-autoscale/main.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/qs-autoscale/variables.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/qs-autoscale/variables.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/standalone-master/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/modules/standalone-master/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/standalone-master/main.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/standalone-master/main.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/standalone-master/variables.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/standalone-master/variables.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/standalone/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/modules/standalone/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/standalone/main.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/standalone/main.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/standalone/variables.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/standalone/variables.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/tap/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/modules/tap/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/tap/main.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/tap/main.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/tap/variables.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/tap/variables.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/tgw-asg-master/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/modules/tgw-asg-master/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/tgw-asg-master/main.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/tgw-asg-master/main.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/tgw-asg-master/variables.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/tgw-asg-master/variables.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/tgw-asg/variables.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/tgw-asg/variables.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/tgw-cross-az-cluster-master/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/modules/tgw-cross-az-cluster-master/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/tgw-cross-az-cluster-master/main.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/tgw-cross-az-cluster-master/main.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/tgw-cross-az-cluster-master/variables.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/tgw-cross-az-cluster-master/variables.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/tgw-cross-az-cluster/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/modules/tgw-cross-az-cluster/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/tgw-cross-az-cluster/variables.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/tgw-cross-az-cluster/variables.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/tgw-gwlb-master/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/modules/tgw-gwlb-master/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/tgw-gwlb-master/main.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/tgw-gwlb-master/main.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/tgw-gwlb-master/variables.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/tgw-gwlb-master/variables.tf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/tgw-gwlb/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/modules/tgw-gwlb/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/tgw-gwlb/variables.tf" beforeDir="false" afterPath="$PROJECT_DIR$/modules/tgw-gwlb/variables.tf" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -24,27 +77,27 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
-  <component name="ProjectColorInfo"><![CDATA[{
-  "associatedIndex": 6
-}]]></component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 6
+}</component>
   <component name="ProjectId" id="2pnfaBmZbqetJ3XU74qlT3GjW4g" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "git-widget-placeholder": "main",
-    "last_opened_file_path": "Z:/Source/terraform-aws-guy-test1",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
+    &quot;last_opened_file_path&quot;: &quot;Z:/Source/terraform-aws-guy-test1&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
       <recent name="Z:\Source\terraform-aws-guy-test1\modules" />
@@ -67,6 +120,7 @@
       <option name="presentableId" value="Default" />
       <updated>1733406821689</updated>
       <workItem from="1733406822751" duration="11595000" />
+      <workItem from="1734004175283" duration="602000" />
     </task>
     <servers />
   </component>
diff --git a/modules/autoscale-gwlb/README.md b/modules/autoscale-gwlb/README.md
index 4d4115d..9fa62bb 100644
--- a/modules/autoscale-gwlb/README.md
+++ b/modules/autoscale-gwlb/README.md
@@ -12,7 +12,7 @@ These types of Terraform resources are supported:
 See the [CloudGuard Auto Scaling for AWS](https://sc1.checkpoint.com/documents/IaaS/WebAdminGuides/EN/CloudGuard_Network_for_AWS_AutoScaling_DeploymentGuide/Topics-AWS-AutoScale-DG/Check-Point-CloudGuard-Network-for-AWS.htm) for additional information
 
 This solution uses the following modules:
-- /terraform/aws/modules/amis
+- /terraform/aws/amis
 
 ## Configurations
 
diff --git a/modules/autoscale-gwlb/main.tf b/modules/autoscale-gwlb/main.tf
index 117a004..c3d1d62 100644
--- a/modules/autoscale-gwlb/main.tf
+++ b/modules/autoscale-gwlb/main.tf
@@ -1,6 +1,6 @@
 
 module "amis" {
-  source = "../modules/amis"
+  source = "../amis"
   version_license = var.gateway_version
   amis_url = "https://cgi-cfts-staging.s3.amazonaws.com/utils/amis.yaml"
 
@@ -138,7 +138,7 @@ resource "aws_iam_role" "role" {
   path = "/"
 }
 module "attach_cloudwatch_policy" {
-  source = "../modules/cloudwatch-policy"
+  source = "../cloudwatch-policy"
   count = local.create_iam_role
   role = aws_iam_role.role[count.index].name
   tag_name = local.asg_name
diff --git a/modules/autoscale-gwlb/variables.tf b/modules/autoscale-gwlb/variables.tf
index 52f2a8b..db3d4b7 100644
--- a/modules/autoscale-gwlb/variables.tf
+++ b/modules/autoscale-gwlb/variables.tf
@@ -64,7 +64,7 @@ variable "gateway_instance_type" {
   default = "c6in.xlarge"
 }
 module "validate_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "../common/instance_type"
 
   chkp_type = "gateway"
   instance_type = var.gateway_instance_type
@@ -122,7 +122,7 @@ variable "gateway_version" {
   default = "R81.20-BYOL"
 }
 module "validate_gateway_version" {
-  source = "../modules/common/version_license"
+  source = "../common/version_license"
 
   chkp_type = "gwlb_gw"
   version_license = var.gateway_version
diff --git a/modules/autoscale/README.md b/modules/autoscale/README.md
index 834e461..234b7c1 100644
--- a/modules/autoscale/README.md
+++ b/modules/autoscale/README.md
@@ -14,7 +14,7 @@ These types of Terraform resources are supported:
 See the [CloudGuard Auto Scaling for AWS](https://sc1.checkpoint.com/documents/IaaS/WebAdminGuides/EN/CloudGuard_Network_for_AWS_AutoScaling_DeploymentGuide/Default.htm) for additional information
 
 This solution uses the following modules:
-- /terraform/aws/modules/amis
+- /terraform/aws/amis
 
 ## Configurations
 
diff --git a/modules/autoscale/main.tf b/modules/autoscale/main.tf
index 8a28071..9a1f8d1 100644
--- a/modules/autoscale/main.tf
+++ b/modules/autoscale/main.tf
@@ -1,5 +1,5 @@
 module "amis" {
-  source = "../modules/amis"
+  source = "../amis"
 
   version_license = var.gateway_version
 }
@@ -125,7 +125,7 @@ resource "aws_iam_role" "role" {
   path = "/"
 }
 module "attach_cloudwatch_policy" {
-  source = "../modules/cloudwatch-policy"
+  source = "../cloudwatch-policy"
   count = local.create_iam_role
   role = aws_iam_role.role[count.index].name
   tag_name = local.asg_name
diff --git a/modules/autoscale/variables.tf b/modules/autoscale/variables.tf
index 362694c..94b3d4c 100644
--- a/modules/autoscale/variables.tf
+++ b/modules/autoscale/variables.tf
@@ -52,7 +52,7 @@ variable "gateway_instance_type" {
   default = "c6in.xlarge"
 }
 module "validate_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "../common/instance_type"
 
   chkp_type = "gateway"
   instance_type = var.gateway_instance_type
@@ -110,7 +110,7 @@ variable "gateway_version" {
   default = "R81.20-BYOL"
 }
 module "validate_gateway_version" {
-  source = "../modules/common/version_license"
+  source = "../common/version_license"
 
   chkp_type = "gateway"
   version_license = var.gateway_version
diff --git a/modules/cluster-master/README.md b/modules/cluster-master/README.md
index 680c3df..93d0a84 100644
--- a/modules/cluster-master/README.md
+++ b/modules/cluster-master/README.md
@@ -15,9 +15,9 @@ See the [Deploying a Check Point Cluster in AWS (Amazon Web Services)](https://s
 
 This solution uses the following modules:
 - /terraform/aws/cluster
-- /terraform/aws/modules/amis
-- /terraform/aws/modules/vpc
-- /terraform/aws/modules/cluster-iam-role
+- /terraform/aws/amis
+- /terraform/aws/vpc
+- /terraform/aws/cluster-iam-role
 
 
 ## Configurations
diff --git a/modules/cluster-master/main.tf b/modules/cluster-master/main.tf
index 1488152..1edb87a 100644
--- a/modules/cluster-master/main.tf
+++ b/modules/cluster-master/main.tf
@@ -1,7 +1,7 @@
 
 // --- VPC ---
 module "launch_vpc" {
-  source = "../modules/vpc"
+  source = "../vpc"
 
   vpc_cidr = var.vpc_cidr
   public_subnets_map = var.public_subnets_map
diff --git a/modules/cluster-master/variables.tf b/modules/cluster-master/variables.tf
index 96223ca..1f943db 100644
--- a/modules/cluster-master/variables.tf
+++ b/modules/cluster-master/variables.tf
@@ -32,7 +32,7 @@ variable "gateway_instance_type" {
   default = "c6in.xlarge"
 }
 module "validate_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "../common/instance_type"
 
   chkp_type = "gateway"
   instance_type = var.gateway_instance_type
@@ -93,7 +93,7 @@ variable "gateway_version" {
   default = "R81.20-BYOL"
 }
 module "validate_gateway_version" {
-  source = "../modules/common/version_license"
+  source = "../common/version_license"
 
   chkp_type = "gateway"
   version_license = var.gateway_version
diff --git a/modules/cluster/README.md b/modules/cluster/README.md
index cbe60b6..9887f64 100644
--- a/modules/cluster/README.md
+++ b/modules/cluster/README.md
@@ -13,8 +13,8 @@ These types of Terraform resources are supported:
 See the [Deploying a Check Point Cluster in AWS (Amazon Web Services)](https://supportcenter.checkpoint.com/supportcenter/portal?eventSubmit_doGoviewsolutiondetails=&solutionid=sk104418) for additional information
 
 This solution uses the following modules:
-- /terraform/aws/modules/amis
-- /terraform/aws/modules/cluster-iam-role
+- /terraform/aws/amis
+- /terraform/aws/cluster-iam-role
 
 
 ## Configurations
diff --git a/modules/cluster/main.tf b/modules/cluster/main.tf
index a1346a1..8028242 100644
--- a/modules/cluster/main.tf
+++ b/modules/cluster/main.tf
@@ -1,14 +1,14 @@
 
 
 module "amis" {
-  source = "../modules/amis"
+  source = "../amis"
 
   version_license = var.gateway_version
   chkp_type = "gateway"
 }
 
 module "common_permissive_sg" {
-  source = "../modules/common/permissive_sg"
+  source = "../common/permissive_sg"
 
   vpc_id = var.vpc_id
   resources_tag_name = var.resources_tag_name
@@ -21,12 +21,12 @@ resource "aws_iam_instance_profile" "cluster_instance_profile" {
 }
 
 module "cluster_iam_role" {
-  source = "../modules/cluster-iam-role"
+  source = "../cluster-iam-role"
   count = local.create_iam_role
 }
 
 module "attach_cloudwatch_policy" {
-  source = "../modules/cloudwatch-policy"
+  source = "../cloudwatch-policy"
   count = local.enable_cloudwatch_policy
   role = aws_iam_instance_profile.cluster_instance_profile.role
   tag_name = var.resources_tag_name != "" ? var.resources_tag_name : var.gateway_name
diff --git a/modules/cluster/variables.tf b/modules/cluster/variables.tf
index 88fe5d0..72760df 100644
--- a/modules/cluster/variables.tf
+++ b/modules/cluster/variables.tf
@@ -30,7 +30,7 @@ variable "gateway_instance_type" {
   default = "c6in.xlarge"
 }
 module "validate_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "../common/instance_type"
 
   chkp_type = "gateway"
   instance_type = var.gateway_instance_type
@@ -91,7 +91,7 @@ variable "gateway_version" {
   default = "R81.20-BYOL"
 }
 module "validate_gateway_version" {
-  source = "../modules/common/version_license"
+  source = "../common/version_license"
 
   chkp_type = "gateway"
   version_license = var.gateway_version
diff --git a/modules/cross-az-cluster-master/README.md b/modules/cross-az-cluster-master/README.md
index f3d5ebb..c60114a 100644
--- a/modules/cross-az-cluster-master/README.md
+++ b/modules/cross-az-cluster-master/README.md
@@ -15,9 +15,9 @@ See the [Deploying a Check Point Cluster in AWS (Amazon Web Services)](https://s
 
 This solution uses the following modules:
 - /terraform/aws/cross-az-cluster
-- /terraform/aws/modules/amis
-- /terraform/aws/modules/vpc
-- /terraform/aws/modules/cluster-iam-role
+- /terraform/aws/amis
+- /terraform/aws/vpc
+- /terraform/aws/cluster-iam-role
 
 
 ## Configurations
diff --git a/modules/cross-az-cluster-master/main.tf b/modules/cross-az-cluster-master/main.tf
index fa1b316..bed4d4e 100644
--- a/modules/cross-az-cluster-master/main.tf
+++ b/modules/cross-az-cluster-master/main.tf
@@ -1,7 +1,7 @@
 
 // --- VPC ---
 module "launch_vpc" {
-  source = "../modules/vpc"
+  source = "../vpc"
 
   vpc_cidr = var.vpc_cidr
   public_subnets_map = var.public_subnets_map
diff --git a/modules/cross-az-cluster-master/variables.tf b/modules/cross-az-cluster-master/variables.tf
index c44e5dd..37140a7 100644
--- a/modules/cross-az-cluster-master/variables.tf
+++ b/modules/cross-az-cluster-master/variables.tf
@@ -32,7 +32,7 @@ variable "gateway_instance_type" {
   default = "c6in.xlarge"
 }
 module "validate_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "../common/instance_type"
 
   chkp_type = "gateway"
   instance_type = var.gateway_instance_type
@@ -93,7 +93,7 @@ variable "gateway_version" {
   default = "R81.20-BYOL"
 }
 module "validate_gateway_version" {
-  source = "../modules/common/version_license"
+  source = "../common/version_license"
 
   chkp_type = "gateway"
   version_license = var.gateway_version
diff --git a/modules/cross-az-cluster/README.md b/modules/cross-az-cluster/README.md
index 34d9b77..21160b0 100644
--- a/modules/cross-az-cluster/README.md
+++ b/modules/cross-az-cluster/README.md
@@ -13,8 +13,8 @@ These types of Terraform resources are supported:
 See the [Deploying a Check Point Cluster in AWS (Amazon Web Services)](https://sc1.checkpoint.com/documents/IaaS/WebAdminGuides/EN/CP_CloudGuard_for_AWS_Cross_AZ_Cluster/Default.htm) for additional information
 
 This solution uses the following modules:
-- /terraform/aws/modules/amis
-- /terraform/aws/modules/cluster-iam-role
+- /terraform/aws/amis
+- /terraform/aws/cluster-iam-role
 
 
 ## Configurations
diff --git a/modules/cross-az-cluster/main.tf b/modules/cross-az-cluster/main.tf
index e780f9c..c6c87af 100644
--- a/modules/cross-az-cluster/main.tf
+++ b/modules/cross-az-cluster/main.tf
@@ -1,14 +1,14 @@
 
 
 module "amis" {
-  source = "../modules/amis"
+  source = "../amis"
 
   version_license = var.gateway_version
   chkp_type = "gateway"
 }
 
 module "common_permissive_sg" {
-  source = "../modules/common/permissive_sg"
+  source = "../common/permissive_sg"
 
   vpc_id = var.vpc_id
   resources_tag_name = var.resources_tag_name
@@ -21,12 +21,12 @@ resource "aws_iam_instance_profile" "cluster_instance_profile" {
 }
 
 module "cluster_iam_role" {
-  source = "../modules/cluster-iam-role"
+  source = "../cluster-iam-role"
   count = local.create_iam_role
 }
 
 module "attach_cloudwatch_policy" {
-  source = "../modules/cloudwatch-policy"
+  source = "../cloudwatch-policy"
   count = local.enable_cloudwatch_policy
   role = aws_iam_instance_profile.cluster_instance_profile.role
   tag_name = var.resources_tag_name != "" ? var.resources_tag_name : var.gateway_name
diff --git a/modules/cross-az-cluster/variables.tf b/modules/cross-az-cluster/variables.tf
index 6d3b14a..f4b1422 100644
--- a/modules/cross-az-cluster/variables.tf
+++ b/modules/cross-az-cluster/variables.tf
@@ -30,7 +30,7 @@ variable "gateway_instance_type" {
   default = "c6in.xlarge"
 }
 module "validate_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "../common/instance_type"
 
   chkp_type = "gateway"
   instance_type = var.gateway_instance_type
@@ -91,7 +91,7 @@ variable "gateway_version" {
   default = "R81.20-BYOL"
 }
 module "validate_gateway_version" {
-  source = "../modules/common/version_license"
+  source = "../common/version_license"
 
   chkp_type = "gateway"
   version_license = var.gateway_version
diff --git a/modules/gateway-master/README.md b/modules/gateway-master/README.md
index 15fd689..5c3d901 100644
--- a/modules/gateway-master/README.md
+++ b/modules/gateway-master/README.md
@@ -15,8 +15,8 @@ See the [Automatically Provision a CloudGuard Security Gateway in AWS](https://s
 
 This solution uses the following modules:
 - /terraform/aws/gateway
-- /terraform/aws/modules/amis
-- /terraform/aws/modules/vpc
+- /terraform/aws/amis
+- /terraform/aws/vpc
 
 ## Configurations
 
diff --git a/modules/gateway-master/variables.tf b/modules/gateway-master/variables.tf
index 7a2d0fe..ec13f1f 100644
--- a/modules/gateway-master/variables.tf
+++ b/modules/gateway-master/variables.tf
@@ -32,7 +32,7 @@ variable "gateway_instance_type" {
   default = "c6in.xlarge"
 }
 module "validate_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "../common/instance_type"
 
   chkp_type = "gateway"
   instance_type = var.gateway_instance_type
@@ -88,7 +88,7 @@ variable "gateway_version" {
   default = "R81.20-BYOL"
 }
 module "validate_gateway_version" {
-  source = "../modules/common/version_license"
+  source = "../common/version_license"
 
   chkp_type = "gateway"
   version_license = var.gateway_version
diff --git a/modules/gateway/README.md b/modules/gateway/README.md
index ea58cb3..23e6294 100644
--- a/modules/gateway/README.md
+++ b/modules/gateway/README.md
@@ -12,7 +12,7 @@ These types of Terraform resources are supported:
 See the [Automatically Provision a CloudGuard Security Gateway in AWS](https://supportcenter.us.checkpoint.com/supportcenter/portal?eventSubmit_doGoviewsolutiondetails=&solutionid=sk131434) for additional information
 
 This solution uses the following modules:
-- /terraform/aws/modules/amis
+- /terraform/aws/amis
 
 ## Configurations
 
diff --git a/modules/gateway/variables.tf b/modules/gateway/variables.tf
index f4963c0..d496581 100644
--- a/modules/gateway/variables.tf
+++ b/modules/gateway/variables.tf
@@ -30,7 +30,7 @@ variable "gateway_instance_type" {
   default = "c6in.xlarge"
 }
 module "validate_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "../common/instance_type"
 
   chkp_type = "gateway"
   instance_type = var.gateway_instance_type
@@ -86,7 +86,7 @@ variable "gateway_version" {
   default = "R81.20-BYOL"
 }
 module "validate_gateway_version" {
-  source = "../modules/common/version_license"
+  source = "../common/version_license"
 
   chkp_type = "gateway"
   version_license = var.gateway_version
diff --git a/modules/gwlb-master/README.md b/modules/gwlb-master/README.md
index 9bb7568..e92c9f7 100644
--- a/modules/gwlb-master/README.md
+++ b/modules/gwlb-master/README.md
@@ -18,8 +18,8 @@ This solution uses the following modules:
 - /terraform/aws/autoscale-gwlb
 - /terraform/aws/management
 - /terraform/aws/cme-iam-role-gwlb
-- /terraform/aws/modules/amis
-- /terraform/aws/modules/vpc
+- /terraform/aws/amis
+- /terraform/aws/vpc
 ## Configurations
 
 The **main.tf** file includes the following provider configuration block used to configure the credentials for the authentication with AWS, as well as a default region for your resources:
diff --git a/modules/gwlb-master/main.tf b/modules/gwlb-master/main.tf
index 60fc2e3..ce5b113 100644
--- a/modules/gwlb-master/main.tf
+++ b/modules/gwlb-master/main.tf
@@ -1,5 +1,5 @@
 module "launch_vpc" {
-  source = "../modules/vpc"
+  source = "../vpc"
 
   vpc_cidr = var.vpc_cidr
   public_subnets_map = var.public_subnets_map
diff --git a/modules/gwlb-master/variables.tf b/modules/gwlb-master/variables.tf
index 41d2af0..e16c675 100644
--- a/modules/gwlb-master/variables.tf
+++ b/modules/gwlb-master/variables.tf
@@ -121,7 +121,7 @@ variable "gateway_instance_type" {
   default = "c6in.xlarge"
 }
 module "validate_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "../common/instance_type"
 
   chkp_type = "gateway"
   instance_type = var.gateway_instance_type
@@ -142,7 +142,7 @@ variable "gateway_version" {
   default = "R81.20-BYOL"
 }
 module "validate_gateway_version" {
-  source = "../modules/common/version_license"
+  source = "../common/version_license"
 
   chkp_type = "gwlb_gw"
   version_license = var.gateway_version
@@ -204,7 +204,7 @@ variable "management_instance_type" {
   default = "m5.xlarge"
 }
 module "validate_management_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "../common/instance_type"
 
   chkp_type = "management"
   instance_type = var.management_instance_type
@@ -215,7 +215,7 @@ variable "management_version" {
   default = "R81.20-BYOL"
 }
 module "validate_management_version" {
-  source = "../modules/common/version_license"
+  source = "../common/version_license"
 
   chkp_type = "management"
   version_license = var.management_version
diff --git a/modules/gwlb/README.md b/modules/gwlb/README.md
index 465eef8..3e88f04 100644
--- a/modules/gwlb/README.md
+++ b/modules/gwlb/README.md
@@ -17,7 +17,7 @@ This solution uses the following modules:
 - /terraform/aws/autoscale-gwlb
 - /terraform/aws/management
 - /terraform/aws/cme-iam-role-gwlb
-- /terraform/aws/modules/amis
+- /terraform/aws/amis
 ## Configurations
 
 The **main.tf** file includes the following provider configuration block used to configure the credentials for the authentication with AWS, as well as a default region for your resources:
diff --git a/modules/gwlb/main.tf b/modules/gwlb/main.tf
index ace0725..e23acee 100644
--- a/modules/gwlb/main.tf
+++ b/modules/gwlb/main.tf
@@ -1,7 +1,7 @@
 
 
 module "gateway_load_balancer" {
-  source = "../modules/common/load_balancer"
+  source = "../common/load_balancer"
 
   load_balancers_type = "gateway"
   instances_subnets = var.subnet_ids
diff --git a/modules/gwlb/variables.tf b/modules/gwlb/variables.tf
index d58e442..cf5641b 100644
--- a/modules/gwlb/variables.tf
+++ b/modules/gwlb/variables.tf
@@ -110,7 +110,7 @@ variable "gateway_instance_type" {
   default = "c6in.xlarge"
 }
 module "validate_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "../common/instance_type"
 
   chkp_type = "gateway"
   instance_type = var.gateway_instance_type
@@ -131,7 +131,7 @@ variable "gateway_version" {
   default = "R81.20-BYOL"
 }
 module "validate_gateway_version" {
-  source = "../modules/common/version_license"
+  source = "../common/version_license"
 
   chkp_type = "gwlb_gw"
   version_license = var.gateway_version
@@ -193,7 +193,7 @@ variable "management_instance_type" {
   default = "m5.xlarge"
 }
 module "validate_management_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "../common/instance_type"
 
   chkp_type = "management"
   instance_type = var.management_instance_type
@@ -204,7 +204,7 @@ variable "management_version" {
   default = "R81.20-BYOL"
 }
 module "validate_management_version" {
-  source = "../modules/common/version_license"
+  source = "../common/version_license"
 
   chkp_type = "management"
   version_license = var.management_version
diff --git a/modules/management/README.md b/modules/management/README.md
index 9c3a0a2..29c13be 100644
--- a/modules/management/README.md
+++ b/modules/management/README.md
@@ -12,7 +12,7 @@ These types of Terraform resources are supported:
 See the [Security Management Server with CloudGuard for AWS](https://supportcenter.checkpoint.com/supportcenter/portal?eventSubmit_doGoviewsolutiondetails=&solutionid=sk130372) for additional information
 
 This solution uses the following modules:
-- /terraform/aws/modules/amis
+- /terraform/aws/amis
 - /terraform/aws/cme-iam-role
 
 ## Configurations
diff --git a/modules/management/main.tf b/modules/management/main.tf
index 7663554..bc8c646 100644
--- a/modules/management/main.tf
+++ b/modules/management/main.tf
@@ -1,6 +1,6 @@
 
 module "amis" {
-  source = "../modules/amis"
+  source = "../amis"
 
   version_license = var.management_version
   chkp_type = "management"
diff --git a/modules/management/variables.tf b/modules/management/variables.tf
index 85a4abb..94c2cc8 100644
--- a/modules/management/variables.tf
+++ b/modules/management/variables.tf
@@ -21,7 +21,7 @@ variable "management_instance_type" {
   default = "m5.xlarge"
 }
 module "validate_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "../common/instance_type"
 
   chkp_type = "management"
   instance_type = var.management_instance_type
@@ -94,7 +94,7 @@ variable "management_version" {
   default = "R81.20-BYOL"
 }
 module "validate_management_version" {
-  source = "../modules/common/version_license"
+  source = "../common/version_license"
 
   chkp_type = "management"
   version_license = var.management_version
diff --git a/modules/mds/README.md b/modules/mds/README.md
index 9218677..62e28ac 100644
--- a/modules/mds/README.md
+++ b/modules/mds/README.md
@@ -11,7 +11,7 @@ These types of Terraform resources are supported:
 See the [Multi-Domain Management Deployment on AWS](https://supportcenter.us.checkpoint.com/supportcenter/portal?eventSubmit_doGoviewsolutiondetails=&solutionid=sk143213) for additional information
 
 This solution uses the following modules:
-- /terraform/aws/modules/amis
+- /terraform/aws/amis
 - /terraform/aws/cme-iam-role
 
 ## Configurations
diff --git a/modules/mds/main.tf b/modules/mds/main.tf
index b68c438..f944069 100644
--- a/modules/mds/main.tf
+++ b/modules/mds/main.tf
@@ -1,6 +1,6 @@
 
 module "amis" {
-  source = "../modules/amis"
+  source = "../amis"
 
   version_license = var.mds_version
   chkp_type = "mds"
diff --git a/modules/mds/variables.tf b/modules/mds/variables.tf
index faa2892..3f478b2 100644
--- a/modules/mds/variables.tf
+++ b/modules/mds/variables.tf
@@ -21,7 +21,7 @@ variable "mds_instance_type" {
   default = "m5.2xlarge"
 }
 module "validate_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "../common/instance_type"
 
   chkp_type = "mds"
   instance_type = var.mds_instance_type
@@ -89,7 +89,7 @@ variable "mds_version" {
   default = "R81.20-BYOL"
 }
 module "validate_mds_version" {
-  source = "../modules/common/version_license"
+  source = "../common/version_license"
 
   chkp_type = "mds"
   version_license = var.mds_version
diff --git a/modules/qs-autoscale-master/README.md b/modules/qs-autoscale-master/README.md
index d42f1fa..03c7134 100644
--- a/modules/qs-autoscale-master/README.md
+++ b/modules/qs-autoscale-master/README.md
@@ -21,7 +21,7 @@ This solution uses the following modules:
 - /terraform/aws/autoscale
 - /terraform/aws/management
 - /terraform/aws/cme-iam-role
-- /terraform/aws/modules/vpc
+- /terraform/aws/vpc
 
 ## Configurations
 
diff --git a/modules/qs-autoscale-master/main.tf b/modules/qs-autoscale-master/main.tf
index c610b95..535fc6b 100644
--- a/modules/qs-autoscale-master/main.tf
+++ b/modules/qs-autoscale-master/main.tf
@@ -1,5 +1,5 @@
 module "launch_vpc" {
-  source = "../modules/vpc"
+  source = "../vpc"
 
   vpc_cidr = var.vpc_cidr
   public_subnets_map = var.public_subnets_map
diff --git a/modules/qs-autoscale-master/variables.tf b/modules/qs-autoscale-master/variables.tf
index 38e9bf2..91352b7 100644
--- a/modules/qs-autoscale-master/variables.tf
+++ b/modules/qs-autoscale-master/variables.tf
@@ -97,7 +97,7 @@ variable "gateway_instance_type" {
   default = "c6in.xlarge"
 }
 module "validate_gateway_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "../common/instance_type"
 
   chkp_type = "gateway"
   instance_type = var.gateway_instance_type
@@ -118,7 +118,7 @@ variable "gateway_version" {
   default = "R81.20-BYOL"
 }
 module "validate_gateway_version" {
-  source = "../modules/common/version_license"
+  source = "../common/version_license"
 
   chkp_type = "gateway"
   version_license = var.gateway_version
@@ -155,7 +155,7 @@ variable "management_instance_type" {
   default = "m5.xlarge"
 }
 module "validate_management_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "../common/instance_type"
 
   chkp_type = "management"
   instance_type = var.management_instance_type
@@ -166,7 +166,7 @@ variable "management_version" {
   default = "R81.20-BYOL"
 }
 module "validate_management_version" {
-  source = "../modules/common/version_license"
+  source = "../common/version_license"
 
   chkp_type = "management"
   version_license = var.management_version
@@ -212,7 +212,7 @@ variable "servers_instance_type" {
   default = "t3.micro"
 }
 module "validate_servers_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "../common/instance_type"
 
   chkp_type = "server"
   instance_type = var.servers_instance_type
diff --git a/modules/qs-autoscale/README.md b/modules/qs-autoscale/README.md
index fe0398e..e8abde0 100644
--- a/modules/qs-autoscale/README.md
+++ b/modules/qs-autoscale/README.md
@@ -15,7 +15,7 @@ See the [Check Point CloudGuard Auto Scaling on AWS](https://aws.amazon.com/quic
 
 This solution uses the following modules:
 - /terraform/aws/autoscale
-- /terraform/aws/modules/custom-autoscale
+- /terraform/aws/custom-autoscale
 - /terraform/aws/management
 - /terraform/aws/cme-iam-role
 
diff --git a/modules/qs-autoscale/main.tf b/modules/qs-autoscale/main.tf
index 26201f9..5c4c3c4 100644
--- a/modules/qs-autoscale/main.tf
+++ b/modules/qs-autoscale/main.tf
@@ -18,7 +18,7 @@ resource "aws_security_group" "external_alb_security_group" {
 }
 
 module "external_load_balancer" {
-  source = "../modules/common/load_balancer"
+  source = "../common/load_balancer"
 
   load_balancers_type = var.load_balancers_type
   instances_subnets = var.gateways_subnets
@@ -121,7 +121,7 @@ resource "aws_security_group" "internal_security_group" {
 
 module "internal_load_balancer" {
   count = local.deploy_servers_condition ? 1 : 0
-  source = "../modules/common/load_balancer"
+  source = "../common/load_balancer"
 
   load_balancers_type = var.load_balancers_type
   instances_subnets = var.servers_subnets
@@ -141,7 +141,7 @@ module "internal_load_balancer" {
 
 module "custom_autoscale" {
   count = local.deploy_servers_condition ? 1 : 0
-  source = "../modules/custom-autoscale"
+  source = "../custom-autoscale"
 
   prefix = var.prefix
   asg_name = var.asg_name
diff --git a/modules/qs-autoscale/variables.tf b/modules/qs-autoscale/variables.tf
index 46c7ce0..f33bbbb 100644
--- a/modules/qs-autoscale/variables.tf
+++ b/modules/qs-autoscale/variables.tf
@@ -84,7 +84,7 @@ variable "gateway_instance_type" {
   default = "c6in.xlarge"
 }
 module "validate_gateway_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "../common/instance_type"
 
   chkp_type = "gateway"
   instance_type = var.gateway_instance_type
@@ -105,7 +105,7 @@ variable "gateway_version" {
   default = "R81.20-BYOL"
 }
 module "validate_gateway_version" {
-  source = "../modules/common/version_license"
+  source = "../common/version_license"
 
   chkp_type = "gateway"
   version_license = var.gateway_version
@@ -142,7 +142,7 @@ variable "management_instance_type" {
   default = "m5.xlarge"
 }
 module "validate_management_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "../common/instance_type"
 
   chkp_type = "management"
   instance_type = var.management_instance_type
@@ -153,7 +153,7 @@ variable "management_version" {
   default = "R81.20-BYOL"
 }
 module "validate_management_version" {
-  source = "../modules/common/version_license"
+  source = "../common/version_license"
 
   chkp_type = "management"
   version_license = var.management_version
@@ -203,7 +203,7 @@ variable "servers_instance_type" {
   default = "t3.micro"
 }
 module "validate_servers_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "../common/instance_type"
 
   chkp_type = "server"
   instance_type = var.servers_instance_type
diff --git a/modules/standalone-master/README.md b/modules/standalone-master/README.md
index 78d42f1..73cd931 100644
--- a/modules/standalone-master/README.md
+++ b/modules/standalone-master/README.md
@@ -12,8 +12,8 @@ These types of Terraform resources are supported:
 
 This solution uses the following modules:
 - /terraform/aws/standalone
-- /terraform/aws/modules/amis
-- /terraform/aws/modules/vpc
+- /terraform/aws/amis
+- /terraform/aws/vpc
 
 ## Configurations
 
diff --git a/modules/standalone-master/main.tf b/modules/standalone-master/main.tf
index da1ab0e..90c9d11 100644
--- a/modules/standalone-master/main.tf
+++ b/modules/standalone-master/main.tf
@@ -1,7 +1,7 @@
 
 // --- VPC ---
 module "launch_vpc" {
-  source = "../modules/vpc"
+  source = "../vpc"
 
   vpc_cidr = var.vpc_cidr
   public_subnets_map = var.public_subnets_map
diff --git a/modules/standalone-master/variables.tf b/modules/standalone-master/variables.tf
index 3c083fb..ada7f6b 100644
--- a/modules/standalone-master/variables.tf
+++ b/modules/standalone-master/variables.tf
@@ -32,7 +32,7 @@ variable "standalone_instance_type" {
   default = "c5.xlarge"
 }
 module "validate_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "../common/instance_type"
 
   chkp_type = "standalone"
   instance_type = var.standalone_instance_type
@@ -88,7 +88,7 @@ variable "standalone_version" {
   default = "R81.20-BYOL"
 }
 module "validate_standalone_version" {
-  source = "../modules/common/version_license"
+  source = "../common/version_license"
 
   chkp_type = "standalone"
   version_license = var.standalone_version
diff --git a/modules/standalone/README.md b/modules/standalone/README.md
index 619be49..fb4ea23 100644
--- a/modules/standalone/README.md
+++ b/modules/standalone/README.md
@@ -11,7 +11,7 @@ These types of Terraform resources are supported:
 
 
 This solution uses the following modules:
-- /terraform/aws/modules/amis
+- /terraform/aws/amis
 
 ## Configurations
 
diff --git a/modules/standalone/main.tf b/modules/standalone/main.tf
index 93d2e2b..68f9b26 100644
--- a/modules/standalone/main.tf
+++ b/modules/standalone/main.tf
@@ -1,12 +1,12 @@
 module "amis" {
-  source = "../modules/amis"
+  source = "../amis"
 
   version_license = var.standalone_version
   chkp_type = "standalone"
 }
 
 module "common_permissive_sg" {
-  source = "../modules/common/permissive_sg"
+  source = "../common/permissive_sg"
 
   vpc_id = var.vpc_id
   resources_tag_name = var.resources_tag_name
@@ -38,7 +38,7 @@ data "aws_iam_policy_document" "standalone_role_assume_policy_document" {
 }
 
 module "attach_cloudwatch_policy" {
-  source = "../modules/cloudwatch-policy"
+  source = "../cloudwatch-policy"
   count = local.enable_cloudwatch_policy
   role = aws_iam_role.standalone_iam_role[count.index].name
   tag_name = var.resources_tag_name != "" ? var.resources_tag_name : var.standalone_name
@@ -61,7 +61,7 @@ resource "aws_network_interface" "private_eni" {
 }
 
 module "common_eip" {
-  source = "../modules/common/elastic_ip"
+  source = "../common/elastic_ip"
 
   allocate_and_associate_eip = var.allocate_and_associate_eip
   external_eni_id = aws_network_interface.public_eni.id
@@ -69,7 +69,7 @@ module "common_eip" {
 }
 
 module "common_internal_default_route" {
-  source = "../modules/common/internal_default_route"
+  source = "../common/internal_default_route"
 
   private_route_table = var.private_route_table
   internal_eni_id = aws_network_interface.private_eni.id
diff --git a/modules/standalone/variables.tf b/modules/standalone/variables.tf
index e147d0e..57561b4 100644
--- a/modules/standalone/variables.tf
+++ b/modules/standalone/variables.tf
@@ -30,7 +30,7 @@ variable "standalone_instance_type" {
   default = "c5.xlarge"
 }
 module "validate_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "../common/instance_type"
 
   chkp_type = "standalone"
   instance_type = var.standalone_instance_type
@@ -86,7 +86,7 @@ variable "standalone_version" {
   default = "R81.20-BYOL"
 }
 module "validate_standalone_version" {
-  source = "../modules/common/version_license"
+  source = "../common/version_license"
 
   chkp_type = "standalone"
   version_license = var.standalone_version
diff --git a/modules/tap/README.md b/modules/tap/README.md
index a3b2d23..ab10243 100644
--- a/modules/tap/README.md
+++ b/modules/tap/README.md
@@ -13,7 +13,7 @@ These types of Terraform resources are supported:
 Learn more about [TAP Lambda](#TAP-Lambda) and [TAP Termination Lambda](#TAP-Termination-Lambda)
 
 This solution uses the following modules:
-- /terraform/aws/modules/amis
+- /terraform/aws/amis
 
 
 ## Prerequisites
@@ -100,7 +100,7 @@ provider "aws" {
 }
 
 module "tap" {
-  source = "../../modules/tap"
+  source = "../../tap"
 
   // --- VPC Network Configuration ---
   vpc_id = var.vpc_id
@@ -146,7 +146,7 @@ Now point your browser at [now.checkpoint.com](https://now.checkpoint.com). You
 Go to the Management > Sentries tab and click 'New'
 * The New Sentry pane will open – select 'Virtual’, enter an optional description, verify the time zone, and click ADD
 * A new sentry entry will appear. It will be uniquely identified by automatically generated 'Name’ and 'MAC Address’
-* Download the CloudGuard Network TAP Terraform module from [CloudGuard Network Github - TAP module](https://github.com/CheckPointSW/CloudGuardIaaS/tree/master/terraform/aws/modules/tap).
+* Download the CloudGuard Network TAP Terraform module from [CloudGuard Network Github - TAP module](https://github.com/CheckPointSW/CloudGuardIaaS/tree/master/terraform/aws/tap).
 Edit terraform.tfvars file according to the instructions in the [Usage](#Usage) section above, using the sentry’s 'MAC Address’ for the registration_key variable.
 * Launch the module using Terraform. As described above, this module creates a Check Point TAP Gateway instance in the VPC specified by the user, along with traffic mirror filter and target, and two lambda functions: 'TAP Lambda' and 'TAP Termination Lambda'. Once the Check Point CloudGuard Network TAP Gateway instance is deployed, the TAP Lambda is invoked and scans the entire VPC for mirrorable NITRO instances that meet the configured selection criteria.
 * After up to 20 minutes, the sentry state will change to “Connected” in the NOW portal.
diff --git a/modules/tap/main.tf b/modules/tap/main.tf
index 7d23431..e0cf6b2 100644
--- a/modules/tap/main.tf
+++ b/modules/tap/main.tf
@@ -1,6 +1,6 @@
 
 module "amis" {
-  source = "../modules/amis"
+  source = "../amis"
 
   version_license = var.version_license
   chkp_type = "gateway"
diff --git a/modules/tap/variables.tf b/modules/tap/variables.tf
index 7bff53d..fd3ceee 100644
--- a/modules/tap/variables.tf
+++ b/modules/tap/variables.tf
@@ -48,7 +48,7 @@ variable "instance_type" {
   default = "c5.xlarge"
 }
 module "validate_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "../common/instance_type"
 
   chkp_type = "gateway"
   instance_type = var.instance_type
@@ -65,7 +65,7 @@ variable "version_license" {
   default = "R80.40-PAYG-NGTX"
 }
 module "validate_version" {
-  source = "../modules/common/version_license"
+  source = "../common/version_license"
 
   chkp_type = "gateway"
   version_license = var.version_license
diff --git a/modules/tgw-asg-master/README.md b/modules/tgw-asg-master/README.md
index 85b2aa3..60f3dac 100644
--- a/modules/tgw-asg-master/README.md
+++ b/modules/tgw-asg-master/README.md
@@ -21,7 +21,7 @@ This solution uses the following modules:
 - /terraform/aws/autoscale
 - /terraform/aws/management
 - /terraform/aws/cme-iam-role
-- /terraform/aws/modules/vpc
+- /terraform/aws/vpc
 
 ## Configurations
 
diff --git a/modules/tgw-asg-master/main.tf b/modules/tgw-asg-master/main.tf
index 4783560..2d3ea6f 100644
--- a/modules/tgw-asg-master/main.tf
+++ b/modules/tgw-asg-master/main.tf
@@ -1,7 +1,7 @@
 
 // --- VPC ---
 module "launch_vpc" {
-  source = "../modules/vpc"
+  source = "../vpc"
 
   vpc_cidr = var.vpc_cidr
   public_subnets_map = var.public_subnets_map
diff --git a/modules/tgw-asg-master/variables.tf b/modules/tgw-asg-master/variables.tf
index 3841313..407a97f 100644
--- a/modules/tgw-asg-master/variables.tf
+++ b/modules/tgw-asg-master/variables.tf
@@ -60,7 +60,7 @@ variable "gateway_instance_type" {
   default = "c6in.xlarge"
 }
 module "validate_gateway_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "../common/instance_type"
 
   chkp_type = "gateway"
   instance_type = var.gateway_instance_type
@@ -81,7 +81,7 @@ variable "gateway_version" {
   default = "R81.20-BYOL"
 }
 module "validate_gateway_version" {
-  source = "../modules/common/version_license"
+  source = "../common/version_license"
 
   chkp_type = "gateway"
   version_license = var.gateway_version
@@ -123,7 +123,7 @@ variable "management_instance_type" {
   default = "m5.xlarge"
 }
 module "validate_management_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "../common/instance_type"
 
   chkp_type = "management"
   instance_type = var.management_instance_type
@@ -134,7 +134,7 @@ variable "management_version" {
   default = "R81.20-BYOL"
 }
 module "validate_management_version" {
-  source = "../modules/common/version_license"
+  source = "../common/version_license"
 
   chkp_type = "management"
   version_license = var.management_version
diff --git a/modules/tgw-asg/variables.tf b/modules/tgw-asg/variables.tf
index ed56a14..6daf6bd 100644
--- a/modules/tgw-asg/variables.tf
+++ b/modules/tgw-asg/variables.tf
@@ -54,7 +54,7 @@ variable "gateway_instance_type" {
   default = "c6in.xlarge"
 }
 module "validate_gateway_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "../common/instance_type"
 
   chkp_type = "gateway"
   instance_type = var.gateway_instance_type
@@ -75,7 +75,7 @@ variable "gateway_version" {
   default = "R81.20-BYOL"
 }
 module "validate_gateway_version" {
-  source = "../modules/common/version_license"
+  source = "../common/version_license"
 
   chkp_type = "gateway"
   version_license = var.gateway_version
@@ -117,7 +117,7 @@ variable "management_instance_type" {
   default = "m5.xlarge"
 }
 module "validate_management_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "../common/instance_type"
 
   chkp_type = "management"
   instance_type = var.management_instance_type
@@ -128,7 +128,7 @@ variable "management_version" {
   default = "R81.20-BYOL"
 }
 module "validate_management_version" {
-  source = "../modules/common/version_license"
+  source = "../common/version_license"
 
   chkp_type = "management"
   version_license = var.management_version
diff --git a/modules/tgw-cross-az-cluster-master/README.md b/modules/tgw-cross-az-cluster-master/README.md
index 210d40b..6db1278 100644
--- a/modules/tgw-cross-az-cluster-master/README.md
+++ b/modules/tgw-cross-az-cluster-master/README.md
@@ -11,8 +11,8 @@ These types of Terraform resources are supported:
 See the [Deploying a Check Point Cluster in AWS (Amazon Web Services)](https://sc1.checkpoint.com/documents/IaaS/WebAdminGuides/EN/CP_CloudGuard_for_AWS_Cross_AZ_Cluster/Default.htm) for additional information
 
 This solution uses the following modules:
-- /terraform/aws/modules/amis
-- /terraform/aws/modules/cluster-iam-role
+- /terraform/aws/amis
+- /terraform/aws/cluster-iam-role
 
 
 ## Configurations
diff --git a/modules/tgw-cross-az-cluster-master/main.tf b/modules/tgw-cross-az-cluster-master/main.tf
index 1e84a3d..27ee567 100644
--- a/modules/tgw-cross-az-cluster-master/main.tf
+++ b/modules/tgw-cross-az-cluster-master/main.tf
@@ -1,6 +1,6 @@
 
 module "launch_vpc" {
-  source = "../modules/vpc"
+  source = "../vpc"
 
   vpc_cidr = var.vpc_cidr
   public_subnets_map = var.public_subnets_map
diff --git a/modules/tgw-cross-az-cluster-master/variables.tf b/modules/tgw-cross-az-cluster-master/variables.tf
index 770ac97..3f9ca75 100644
--- a/modules/tgw-cross-az-cluster-master/variables.tf
+++ b/modules/tgw-cross-az-cluster-master/variables.tf
@@ -45,7 +45,7 @@ variable "gateway_instance_type" {
   default = "c6in.xlarge"
 }
 module "validate_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "../common/instance_type"
 
   chkp_type = "gateway"
   instance_type = var.gateway_instance_type
@@ -111,7 +111,7 @@ variable "gateway_version" {
   default = "R81.20-BYOL"
 }
 module "validate_gateway_version" {
-  source = "../modules/common/version_license"
+  source = "../common/version_license"
 
   chkp_type = "gateway"
   version_license = var.gateway_version
diff --git a/modules/tgw-cross-az-cluster/README.md b/modules/tgw-cross-az-cluster/README.md
index 971ea70..c756157 100644
--- a/modules/tgw-cross-az-cluster/README.md
+++ b/modules/tgw-cross-az-cluster/README.md
@@ -11,8 +11,8 @@ These types of Terraform resources are supported:
 See the [Deploying a Check Point Cluster in AWS (Amazon Web Services)](https://sc1.checkpoint.com/documents/IaaS/WebAdminGuides/EN/CP_CloudGuard_for_AWS_Cross_AZ_Cluster/Default.htm) for additional information
 
 This solution uses the following modules:
-- /terraform/aws/modules/amis
-- /terraform/aws/modules/cluster-iam-role
+- /terraform/aws/amis
+- /terraform/aws/cluster-iam-role
 
 
 ## Configurations
diff --git a/modules/tgw-cross-az-cluster/variables.tf b/modules/tgw-cross-az-cluster/variables.tf
index 60a0f47..2fdc95c 100644
--- a/modules/tgw-cross-az-cluster/variables.tf
+++ b/modules/tgw-cross-az-cluster/variables.tf
@@ -46,7 +46,7 @@ variable "gateway_instance_type" {
   default = "c6in.xlarge"
 }
 module "validate_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "..common/instance_type"
 
   chkp_type = "gateway"
   instance_type = var.gateway_instance_type
@@ -112,7 +112,7 @@ variable "gateway_version" {
   default = "R81.20-BYOL"
 }
 module "validate_gateway_version" {
-  source = "../modules/common/version_license"
+  source = "../common/version_license"
 
   chkp_type = "gateway"
   version_license = var.gateway_version
diff --git a/modules/tgw-gwlb-master/README.md b/modules/tgw-gwlb-master/README.md
index 0ccc416..3a90200 100644
--- a/modules/tgw-gwlb-master/README.md
+++ b/modules/tgw-gwlb-master/README.md
@@ -15,10 +15,10 @@ See the [Check Point CloudGuard Gateway Load Balancer on AWS](https://sc1.checkp
 
 This solution uses the following modules:
 - /terraform/aws/autoscale-gwlb
-- /terraform/aws/modules/vpc
+- /terraform/aws/vpc
 - /terraform/aws/management
 - /terraform/aws/cme-iam-role-gwlb
-- /terraform/aws/modules/amis
+- /terraform/aws/amis
 - /terraform/aws/gwlb
 
 ## Configurations
diff --git a/modules/tgw-gwlb-master/main.tf b/modules/tgw-gwlb-master/main.tf
index 958c059..40c4ab6 100644
--- a/modules/tgw-gwlb-master/main.tf
+++ b/modules/tgw-gwlb-master/main.tf
@@ -1,5 +1,5 @@
 module "launch_vpc" {
-  source = "../modules/vpc"
+  source = "../vpc"
 
   vpc_cidr = var.vpc_cidr
   public_subnets_map = var.public_subnets_map
diff --git a/modules/tgw-gwlb-master/variables.tf b/modules/tgw-gwlb-master/variables.tf
index 18957cc..d8ff4ed 100644
--- a/modules/tgw-gwlb-master/variables.tf
+++ b/modules/tgw-gwlb-master/variables.tf
@@ -179,7 +179,7 @@ variable "gateway_instance_type" {
   default = "c6in.xlarge"
 }
 module "validate_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "../common/instance_type"
 
   chkp_type = "gateway"
   instance_type = var.gateway_instance_type
@@ -200,7 +200,7 @@ variable "gateway_version" {
   default = "R81.20-BYOL"
 }
 module "validate_gateway_version" {
-  source = "../modules/common/version_license"
+  source = "../common/version_license"
 
   chkp_type = "gwlb_gw"
   version_license = var.gateway_version
@@ -262,7 +262,7 @@ variable "management_instance_type" {
   default = "m5.xlarge"
 }
 module "validate_management_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "../common/instance_type"
 
   chkp_type = "management"
   instance_type = var.management_instance_type
@@ -273,7 +273,7 @@ variable "management_version" {
   default = "R81.20-BYOL"
 }
 module "validate_management_version" {
-  source = "../modules/common/version_license"
+  source = "../common/version_license"
 
   chkp_type = "management"
   version_license = var.management_version
diff --git a/modules/tgw-gwlb/README.md b/modules/tgw-gwlb/README.md
index 89325fd..f65ea76 100644
--- a/modules/tgw-gwlb/README.md
+++ b/modules/tgw-gwlb/README.md
@@ -18,7 +18,7 @@ This solution uses the following modules:
 - /terraform/aws/autoscale-gwlb
 - /terraform/aws/management
 - /terraform/aws/cme-iam-role-gwlb
-- /terraform/aws/modules/amis
+- /terraform/aws/amis
 - /terraform/aws/gwlb
 ## Configurations
 
diff --git a/modules/tgw-gwlb/variables.tf b/modules/tgw-gwlb/variables.tf
index 79e5a2d..a03393f 100644
--- a/modules/tgw-gwlb/variables.tf
+++ b/modules/tgw-gwlb/variables.tf
@@ -187,7 +187,7 @@ variable "gateway_instance_type" {
   default = "c6in.xlarge"
 }
 module "validate_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "../common/instance_type"
 
   chkp_type = "gateway"
   instance_type = var.gateway_instance_type
@@ -208,7 +208,7 @@ variable "gateway_version" {
   default = "R81.20-BYOL"
 }
 module "validate_gateway_version" {
-  source = "../modules/common/version_license"
+  source = "../common/version_license"
 
   chkp_type = "gwlb_gw"
   version_license = var.gateway_version
@@ -269,7 +269,7 @@ variable "management_instance_type" {
   default = "m5.xlarge"
 }
 module "validate_management_instance_type" {
-  source = "../modules/common/instance_type"
+  source = "../common/instance_type"
 
   chkp_type = "management"
   instance_type = var.management_instance_type
@@ -280,7 +280,7 @@ variable "management_version" {
   default = "R81.20-BYOL"
 }
 module "validate_management_version" {
-  source = "../modules/common/version_license"
+  source = "../common/version_license"
 
   chkp_type = "management"
   version_license = var.management_version