diff --git a/main.tf b/main.tf
index ac0a22d..436ab11 100644
--- a/main.tf
+++ b/main.tf
@@ -9,7 +9,7 @@ terraform {
 
 module "groups" {
   for_each = var.groups
-  source   = "./groups"
+  source   = "./modules/groups"
   providers = {
     gsuite = gsuite
   }
@@ -19,7 +19,7 @@ module "groups" {
 module "groups_in_group" {
   for_each   = var.groups
   depends_on = [module.groups]
-  source     = "./groups_in_group"
+  source     = "./modules/groups_in_group"
   providers = {
     gsuite = gsuite
   }
@@ -30,7 +30,7 @@ module "groups_in_group" {
 module "users" {
   for_each   = var.users
   depends_on = [module.groups]
-  source     = "./users"
+  source     = "./modules/users"
   providers = {
     gsuite = gsuite
   }
@@ -40,7 +40,7 @@ module "users" {
 module "users_to_groups" {
   for_each   = var.users
   depends_on = [module.users]
-  source     = "./users_to_groups"
+  source     = "./modules/users_to_groups"
   providers = {
     gsuite = gsuite
   }
diff --git a/groups/groups.tf b/modules/groups/groups.tf
similarity index 100%
rename from groups/groups.tf
rename to modules/groups/groups.tf
diff --git a/groups/outputs.tf b/modules/groups/outputs.tf
similarity index 100%
rename from groups/outputs.tf
rename to modules/groups/outputs.tf
diff --git a/groups/variables.tf b/modules/groups/variables.tf
similarity index 100%
rename from groups/variables.tf
rename to modules/groups/variables.tf
diff --git a/groups_in_group/groups_in_group.tf b/modules/groups_in_group/groups_in_group.tf
similarity index 100%
rename from groups_in_group/groups_in_group.tf
rename to modules/groups_in_group/groups_in_group.tf
diff --git a/groups_in_group/outputs.tf b/modules/groups_in_group/outputs.tf
similarity index 100%
rename from groups_in_group/outputs.tf
rename to modules/groups_in_group/outputs.tf
diff --git a/groups_in_group/variables.tf b/modules/groups_in_group/variables.tf
similarity index 100%
rename from groups_in_group/variables.tf
rename to modules/groups_in_group/variables.tf
diff --git a/users/outputs.tf b/modules/users/outputs.tf
similarity index 100%
rename from users/outputs.tf
rename to modules/users/outputs.tf
diff --git a/users/users.tf b/modules/users/users.tf
similarity index 100%
rename from users/users.tf
rename to modules/users/users.tf
diff --git a/users/variables.tf b/modules/users/variables.tf
similarity index 100%
rename from users/variables.tf
rename to modules/users/variables.tf
diff --git a/users_to_groups/outputs.tf b/modules/users_to_groups/outputs.tf
similarity index 100%
rename from users_to_groups/outputs.tf
rename to modules/users_to_groups/outputs.tf
diff --git a/users_to_groups/users_to_groups.tf b/modules/users_to_groups/users_to_groups.tf
similarity index 100%
rename from users_to_groups/users_to_groups.tf
rename to modules/users_to_groups/users_to_groups.tf
diff --git a/users_to_groups/variables.tf b/modules/users_to_groups/variables.tf
similarity index 100%
rename from users_to_groups/variables.tf
rename to modules/users_to_groups/variables.tf