diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..44dd389
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </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" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectColorInfo"><![CDATA[{
+  "associatedIndex": 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>
+  <component name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="Z:\Source\terraform-aws-guy-test1\modules" />
+    </key>
+  </component>
+  <component name="SharedIndexes">
+    <attachedChunks>
+      <set>
+        <option value="bundled-js-predefined-d6986cc7102b-7c0b70fcd90d-JavaScript-PY-242.21829.153" />
+        <option value="bundled-python-sdk-464836ebc622-b74155a9e76b-com.jetbrains.pycharm.pro.sharedIndexes.bundled-PY-242.21829.153" />
+      </set>
+    </attachedChunks>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="fccd76e9-3362-4a25-a718-545ef4ddbf0a" name="Changes" comment="" />
+      <created>1733406821689</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1733406821689</updated>
+      <workItem from="1733406822751" duration="11595000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/modules/gateway-master/main.tf b/modules/gateway-master/main.tf
index fac731f..15d1175 100644
--- a/modules/gateway-master/main.tf
+++ b/modules/gateway-master/main.tf
@@ -1,6 +1,6 @@
 // --- 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/gateway/main.tf b/modules/gateway/main.tf
index 7b303f5..0447c73 100644
--- a/modules/gateway/main.tf
+++ b/modules/gateway/main.tf
@@ -1,12 +1,12 @@
 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
@@ -38,7 +38,7 @@ data "aws_iam_policy_document" "gateway_role_assume_policy_document" {
 }
 
 module "attach_cloudwatch_policy" {
-  source = "../modules/cloudwatch-policy"
+  source = "../cloudwatch-policy"
   count = local.enable_cloudwatch_policy
   role = aws_iam_role.gateway_iam_role[count.index].name
   tag_name = var.resources_tag_name != "" ? var.resources_tag_name : var.gateway_name
@@ -62,7 +62,7 @@ resource "aws_network_interface" "private_eni" {
 }
 
 module "common_eip" {
-  source = "../modules/common/elastic_ip"
+  source = "../common/elastic_ip"
   depends_on = [
     module.common_gateway_instance
   ]
@@ -73,14 +73,14 @@ 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
 }
 
 module "common_gateway_instance" {
-  source = "../modules/common/gateway_instance"
+  source = "../common/gateway_instance"
 
   external_eni_id = aws_network_interface.public_eni.id
   internal_eni_id = aws_network_interface.private_eni.id