diff --git a/.github/workflows/terraform_apply.yml b/.github/workflows/terraform_apply.yml
index c22a6b0f5..19da9a693 100644
--- a/.github/workflows/terraform_apply.yml
+++ b/.github/workflows/terraform_apply.yml
@@ -43,7 +43,7 @@ jobs:
 
     - name: Change the modules source to local
       run: | 
-        find . -type f -exec sed -i -e 's/source *= \"github.com\/imperva\/dsfkit\/\/deploy\/modules/source = \"..\/..\/..\/modules\/aws/' -e 's/?ref=.*/"/' {} \;
+        find . -type f -exec sed -i -e 's/source *= \"github.com\/imperva\/dsfkit\//source = \"..\/..\/../' -e 's/?ref=.*/"/' {} \;
         ! grep -rnw '.' -e 'github\.com/imperva/dsfkit//modules'
 
     - name: Sets env vars for environment
diff --git a/.github/workflows/terraform_apply_hadr.yml b/.github/workflows/terraform_apply_hadr.yml
index a7330a48d..03ee1a445 100644
--- a/.github/workflows/terraform_apply_hadr.yml
+++ b/.github/workflows/terraform_apply_hadr.yml
@@ -43,7 +43,7 @@ jobs:
 
     - name: Change the modules source to local
       run: | 
-        find . -type f -exec sed -i -e 's/source *= \"github.com\/imperva\/dsfkit\/\/deploy\/modules/source = \"..\/..\/..\/modules\/aws/' -e 's/?ref=.*/"/' {} \;
+        find . -type f -exec sed -i -e 's/source *= \"github.com\/imperva\/dsfkit\//source = \"..\/..\/../' -e 's/?ref=.*/"/' {} \;
         ! grep -rnw '.' -e 'github\.com/imperva/dsfkit//modules'
 
     - name: Sets env vars for environment
diff --git a/.github/workflows/terraform_apply_simple_cli.yml b/.github/workflows/terraform_apply_simple_cli.yml
index 886f3146c..bf1e07a6d 100644
--- a/.github/workflows/terraform_apply_simple_cli.yml
+++ b/.github/workflows/terraform_apply_simple_cli.yml
@@ -61,7 +61,7 @@ jobs:
 
     - name: Change the modules source to local
       run: | 
-        find . -type f -exec sed -i -e 's/source *= \"github.com\/imperva\/dsfkit\/\/deploy\/modules/source = \"..\/..\/..\/modules\/aws/' -e 's/?ref=.*/"/' {} \;
+        find . -type f -exec sed -i -e 's/source *= \"github.com\/imperva\/dsfkit\//source = \"..\/..\/../' -e 's/?ref=.*/"/' {} \;
         ! grep -rnw '.' -e 'github\.com/imperva/dsfkit//modules'
 
     - name: Sets env vars for environment
diff --git a/.github/workflows/terraform_plan.yml b/.github/workflows/terraform_plan.yml
index 0ebbf6429..bce2f9953 100644
--- a/.github/workflows/terraform_plan.yml
+++ b/.github/workflows/terraform_plan.yml
@@ -41,7 +41,7 @@ jobs:
 
       - name: Change the modules source to local
         run: |
-          find . -type f -exec sed -i -e 's/source *= \"github.com\/imperva\/dsfkit\/\/deploy\/modules/source = \"..\/..\/..\/modules\/aws/' -e 's/?ref=.*/"/' {} \;
+          find . -type f -exec sed -i -e 's/source *= \"github.com\/imperva\/dsfkit\//source = \"..\/..\/../' -e 's/?ref=.*/"/' {} \;
           ! grep -rnw '.' -e 'github\.com/imperva/dsfkit//modules'
 
       # Install the latest version of Terraform CLI and configure the Terraform CLI configuration file with a Terraform Cloud user API token
diff --git a/.github/workflows/terraform_run_test.yml b/.github/workflows/terraform_run_test.yml
index f6766aa45..0fad17049 100644
--- a/.github/workflows/terraform_run_test.yml
+++ b/.github/workflows/terraform_run_test.yml
@@ -53,7 +53,7 @@ jobs:
 
     - name: Change the modules source to local
       run: | 
-        find . -type f -exec sed -i -e 's/source *= \"github.com\/imperva\/dsfkit\/\/deploy\/modules/source = \"..\/..\/..\/modules\/aws/' -e 's/?ref=.*/"/' {} \;
+        find . -type f -exec sed -i -e 's/source *= \"github.com\/imperva\/dsfkit\//source = \"..\/..\/../' -e 's/?ref=.*/"/' {} \;
         ! grep -rnw '.' -e 'github\.com/imperva/dsfkit//modules'
 
     - name: Set Environment Variables
diff --git a/.github/workflows/terraform_simple_cli_dev_nightly.yml b/.github/workflows/terraform_simple_cli_dev_nightly.yml
index 94edeeaaa..8c665ed0a 100644
--- a/.github/workflows/terraform_simple_cli_dev_nightly.yml
+++ b/.github/workflows/terraform_simple_cli_dev_nightly.yml
@@ -38,7 +38,7 @@ jobs:
 
     - name: Change the modules source to local
       run: | 
-        find . -type f -exec sed -i -e 's/source *= \"github.com\/imperva\/dsfkit\/\/deploy\/modules/source = \"..\/..\/..\/modules\/aws/' -e 's/?ref=.*/"/' {} \;
+        find . -type f -exec sed -i -e 's/source *= \"github.com\/imperva\/dsfkit\//source = \"..\/..\/../' -e 's/?ref=.*/"/' {} \;
         ! grep -rnw '.' -e 'github\.com/imperva/dsfkit//modules'
 
     - name: Sets env vars for environment
diff --git a/examples/installation/multi_account_deployment/main.tf b/examples/installation/multi_account_deployment/main.tf
index 918b3616d..1f595cb33 100644
--- a/examples/installation/multi_account_deployment/main.tf
+++ b/examples/installation/multi_account_deployment/main.tf
@@ -16,7 +16,7 @@ provider "aws" {
 }
 
 module "globals" {
-  source = "github.com/imperva/dsfkit//deploy/modules/core/globals?ref=1.3.0"
+  source = "github.com/imperva/dsfkit//modules/aws/core/globals"
 }
 
 locals {
@@ -39,13 +39,13 @@ locals {
 ##############################
 
 module "key_pair_hub" {
-  source                   = "github.com/imperva/dsfkit//deploy/modules/core/key_pair?ref=1.3.0"
+  source                   = "github.com/imperva/dsfkit//modules/aws/core/key_pair"
   key_name_prefix          = "imperva-dsf-hub"
   private_key_pem_filename = "ssh_keys/dsf_ssh_key-hub-${terraform.workspace}"
 }
 
  module "key_pair_gw" {
-   source                   = "github.com/imperva/dsfkit//deploy/modules/core/key_pair?ref=1.3.0"
+   source                   = "github.com/imperva/dsfkit//modules/aws/core/key_pair"
    key_name_prefix          = "imperva-dsf-gw"
    private_key_pem_filename = "ssh_keys/dsf_ssh_key-gw-${terraform.workspace}"
    providers = {
@@ -58,7 +58,7 @@ module "key_pair_hub" {
 ##############################
 
 module "hub" {
-  source                        = "github.com/imperva/dsfkit//deploy/modules/hub?ref=1.3.0"
+  source                        = "github.com/imperva/dsfkit//modules/aws/hub"
   friendly_name                 = join("-", [local.deployment_name_salted, "hub", "primary"])
   subnet_id                     = var.subnet_hub
   binaries_location             = local.tarball_location
@@ -81,7 +81,7 @@ module "hub" {
 
  module "agentless_gw_group" {
    count                             = var.gw_count
-   source                            = "github.com/imperva/dsfkit//deploy/modules/agentless-gw?ref=1.3.0"
+   source                            = "github.com/imperva/dsfkit//modules/aws/agentless-gw"
    friendly_name                     = join("-", [local.deployment_name_salted, "gw", count.index])
    instance_type                     = var.gw_instance_type
    ami_name_tag                      = var.gw_ami_name
@@ -112,7 +112,7 @@ module "hub" {
 
  module "federation" {
    for_each            = { for idx, val in module.agentless_gw_group : idx => val }
-   source              = "github.com/imperva/dsfkit//deploy/modules/federation?ref=1.3.0"
+   source              = "github.com/imperva/dsfkit//modules/aws/federation"
    gws_info  = {
      gw_ip_address   = each.value.private_address
      gw_private_ssh_key_path = module.key_pair_gw.key_pair_private_pem.filename
diff --git a/examples/poc/basic_deployment/main.tf b/examples/poc/basic_deployment/main.tf
index bf683dc0b..265f459fc 100644
--- a/examples/poc/basic_deployment/main.tf
+++ b/examples/poc/basic_deployment/main.tf
@@ -5,11 +5,11 @@ provider "aws" {
 }
 
 module "globals" {
-  source = "github.com/imperva/dsfkit//deploy/modules/core/globals?ref=1.3.0"
+  source = "github.com/imperva/dsfkit//modules/aws/core/globals"
 }
 
 module "key_pair" {
-  source                   = "github.com/imperva/dsfkit//deploy/modules/core/key_pair?ref=1.3.0"
+  source                   = "github.com/imperva/dsfkit//modules/aws/core/key_pair"
   key_name_prefix          = "imperva-dsf-"
   private_key_pem_filename = "ssh_keys/dsf_ssh_key-${terraform.workspace}"
 }
@@ -55,7 +55,7 @@ module "vpc" {
 ##############################
 
 module "hub" {
-  source                        = "github.com/imperva/dsfkit//deploy/modules/hub?ref=1.3.0"
+  source                        = "github.com/imperva/dsfkit//modules/aws/hub"
   friendly_name                          = join("-", [local.deployment_name_salted, "hub", "primary"])
   subnet_id                     = module.vpc.public_subnets[0]
   binaries_location             = local.tarball_location
@@ -78,7 +78,7 @@ module "hub" {
 
 module "agentless_gw_group" {
   count                             = var.gw_count
-  source                            = "github.com/imperva/dsfkit//deploy/modules/agentless-gw?ref=1.3.0"
+  source                            = "github.com/imperva/dsfkit//modules/aws/agentless-gw"
   friendly_name                     = join("-", [local.deployment_name_salted, "gw", count.index])
   subnet_id                         = module.vpc.private_subnets[0]
   ebs                               = var.gw_group_ebs_details
@@ -106,7 +106,7 @@ module "agentless_gw_group" {
 
 module "federation" {
   for_each            = { for idx, val in module.agentless_gw_group : idx => val }
-  source              = "github.com/imperva/dsfkit//deploy/modules/federation?ref=1.3.0"
+  source              = "github.com/imperva/dsfkit//modules/aws/federation"
   gws_info  = {
     gw_ip_address     = each.value.private_address
     gw_private_ssh_key_path = module.key_pair.key_pair_private_pem.filename
@@ -125,14 +125,14 @@ module "federation" {
 
 module "rds_mysql" {
   count                        = 1
-  source                       = "github.com/imperva/dsfkit//deploy/modules/rds-mysql-db?ref=1.3.0"
+  source                       = "github.com/imperva/dsfkit//modules/aws/rds-mysql-db"
   rds_subnet_ids               = module.vpc.public_subnets
   security_group_ingress_cidrs = local.workstation_cidr
 }
 
 module "db_onboarding" {
   for_each         = { for idx, val in module.rds_mysql : idx => val }
-  source           = "github.com/imperva/dsfkit//deploy/modules/db-onboarder?ref=1.3.0"
+  source           = "github.com/imperva/dsfkit//modules/aws/db-onboarder"
   sonar_version    = module.globals.tarball_location.version
   hub_info = {
     hub_ip_address    = module.hub.public_address
@@ -157,7 +157,7 @@ module "db_onboarding" {
 }
 
 module "statistics" {
-  source = "github.com/imperva/dsfkit//deploy/modules/statistics?ref=1.3.0"
+  source = "github.com/imperva/dsfkit//modules/aws/statistics"
 }
 
 output "db_details" {
diff --git a/examples/poc/hadr_deployment/main.tf b/examples/poc/hadr_deployment/main.tf
index cd35da967..d8ce1ab6e 100644
--- a/examples/poc/hadr_deployment/main.tf
+++ b/examples/poc/hadr_deployment/main.tf
@@ -5,11 +5,11 @@ provider "aws" {
 }
 
 module "globals" {
-  source = "github.com/imperva/dsfkit//deploy/modules/core/globals?ref=1.3.0"
+  source = "github.com/imperva/dsfkit//modules/aws/core/globals"
 }
 
 module "key_pair" {
-  source                   = "github.com/imperva/dsfkit//deploy/modules/core/key_pair?ref=1.3.0"
+  source                   = "github.com/imperva/dsfkit//modules/aws/core/key_pair"
   key_name_prefix          = "imperva-dsf-"
   private_key_pem_filename = "ssh_keys/dsf_ssh_key-${terraform.workspace}"
 }
@@ -54,7 +54,7 @@ module "vpc" {
 # Generating deployment
 ##############################
 module "hub" {
-  source                        = "github.com/imperva/dsfkit//deploy/modules/hub?ref=1.3.0"
+  source                        = "github.com/imperva/dsfkit//modules/aws/hub"
   friendly_name                 = join("-", [local.deployment_name_salted, "hub", "primary"])
   subnet_id                     = module.vpc.public_subnets[0]
   binaries_location             = local.tarball_location
@@ -76,7 +76,7 @@ module "hub" {
 }
 
 module "hub_secondary" {
-  source                        = "github.com/imperva/dsfkit//deploy/modules/hub?ref=1.3.0"
+  source                        = "github.com/imperva/dsfkit//modules/aws/hub"
   friendly_name                 = join("-", [local.deployment_name_salted, "hub", "secondary"])
   subnet_id                     = module.vpc.public_subnets[1]
   binaries_location             = local.tarball_location
@@ -102,7 +102,7 @@ module "hub_secondary" {
 
 module "agentless_gw_group" {
   count                             = var.gw_count
-  source                            = "github.com/imperva/dsfkit//deploy/modules/agentless-gw?ref=1.3.0"
+  source                            = "github.com/imperva/dsfkit//modules/aws/agentless-gw"
   friendly_name                     = join("-", [local.deployment_name_salted, "gw", count.index])
   subnet_id                         = module.vpc.private_subnets[0]
   ebs                               = var.gw_group_ebs_details
@@ -139,7 +139,7 @@ locals {
 
 module "federation" {
   count               = length(local.hub_gw_combinations)
-  source              = "github.com/imperva/dsfkit//deploy/modules/federation?ref=1.3.0"
+  source              = "github.com/imperva/dsfkit//modules/aws/federation"
   gws_info  = {
     gw_ip_address   = local.hub_gw_combinations[count.index][1].private_address
     gw_private_ssh_key_path = module.key_pair.key_pair_private_pem.filename
@@ -158,7 +158,7 @@ module "federation" {
 }
 
 module "hadr" {
-  source                       = "github.com/imperva/dsfkit//deploy/modules/hadr?ref=1.3.0"
+  source                       = "github.com/imperva/dsfkit//modules/aws/hadr"
   dsf_hub_primary_public_ip    = module.hub.public_address
   dsf_hub_primary_private_ip   = module.hub.private_address
   dsf_hub_secondary_public_ip  = module.hub_secondary.public_address
@@ -174,14 +174,14 @@ module "hadr" {
 
 module "rds_mysql" {
   count                        = 1
-  source                       = "github.com/imperva/dsfkit//deploy/modules/rds-mysql-db?ref=1.3.0"
+  source                       = "github.com/imperva/dsfkit//modules/aws/rds-mysql-db"
   rds_subnet_ids               = module.vpc.public_subnets
   security_group_ingress_cidrs = local.workstation_cidr
 }
 
 module "db_onboarding" {
   for_each         = { for idx, val in module.rds_mysql : idx => val }
-  source           = "github.com/imperva/dsfkit//deploy/modules/db-onboarder?ref=1.3.0"
+  source           = "github.com/imperva/dsfkit//modules/aws/db-onboarder"
   sonar_version    = module.globals.tarball_location.version
   hub_info = {
     hub_ip_address    = module.hub.public_address
@@ -207,7 +207,7 @@ module "db_onboarding" {
 }
 
 module "statistics" {
-  source = "github.com/imperva/dsfkit//deploy/modules/statistics?ref=1.3.0"
+  source = "github.com/imperva/dsfkit//modules/aws/statistics"
 }
 
 output "db_details" {
diff --git a/modules/aws/agentless-gw/README.md b/modules/aws/agentless-gw/README.md
index 077814f0c..e61fbd367 100644
--- a/modules/aws/agentless-gw/README.md
+++ b/modules/aws/agentless-gw/README.md
@@ -57,11 +57,11 @@ provider "aws" {
 }
 
 module "globals" {
-  source = "github.com/imperva/dsfkit//deploy/modules/core/globals?ref=1.3.0"
+  source = "github.com/imperva/dsfkit//modules/aws/core/globals"
 }
 
 module "dsf_gw" {
-  source                        = "github.com/imperva/dsfkit//deploy/modules/agentless-gw?ref=1.3.0"
+  source                        = "github.com/imperva/dsfkit//modules/aws/agentless-gw"
   subnet_id                     = "${aws_subnet.example.id}"
 
   ssh_key_pair = {
@@ -91,7 +91,7 @@ If you want to use a specific version of the module, you can specify the version
 
 ```
 module "dsf_gw" {
-  source = "github.com/imperva/dsfkit//deploy/modules/agentless-gw?ref=1.3.0"
+  source = "github.com/imperva/dsfkit//modules/aws/agentless-gw?ref=1.3.0"
 }
 ```
 
diff --git a/modules/aws/hub/README.md b/modules/aws/hub/README.md
index 8ef969dd5..4eed11cf6 100644
--- a/modules/aws/hub/README.md
+++ b/modules/aws/hub/README.md
@@ -60,11 +60,11 @@ provider "aws" {
 }
 
 module "globals" {
-  source = "github.com/imperva/dsfkit//deploy/modules/core/globals?ref=1.3.0"
+  source = "github.com/imperva/dsfkit//modules/aws/core/globals"
 }
 
 module "dsf_hub" {
-  source                        = "github.com/imperva/dsfkit//deploy/modules/hub?ref=1.3.0"
+  source                        = "github.com/imperva/dsfkit//modules/aws/hub"
   subnet_id                     = "${aws_subnet.example.id}"
 
   ssh_key_pair = {
@@ -93,7 +93,7 @@ If you want to use a specific version of the module, you can specify the version
 
 ```
 module "dsf_hub" {
-  source = "github.com/imperva/dsfkit//deploy/modules/hub?ref=1.3.0"
+  source = "github.com/imperva/dsfkit//modules/aws/hub?ref=1.3.0"
 }
 ```