diff --git a/common/base_settings.tf b/common/base_settings.tf
index 8ed5cee..a27da54 100644
--- a/common/base_settings.tf
+++ b/common/base_settings.tf
@@ -1,7 +1,3 @@
-data "aws_caller_identity" "current" {}
-data "aws_region" "current" {}
-data "aws_partition" "current" {}
-
 locals {
   account_id = data.aws_caller_identity.current.account_id
   region     = data.aws_region.current.id
diff --git a/common/data.tf b/common/data.tf
index 8dd3bf3..ffa2c16 100644
--- a/common/data.tf
+++ b/common/data.tf
@@ -1,3 +1,11 @@
+data "aws_caller_identity" "current" {}
+
+data "aws_arn" "current" {
+  arn = data.aws_caller_identity.current.arn
+}
+
+data "aws_region" "current" {}
+
 data "aws_vpc" "vpc" {
   filter {
     name   = "tag:Name"
diff --git a/prefixes.tf b/common/prefixes.tf
similarity index 100%
rename from prefixes.tf
rename to common/prefixes.tf
diff --git a/variables.common.availability_zones.tf b/common/variables.common.availability_zones.tf
similarity index 100%
rename from variables.common.availability_zones.tf
rename to common/variables.common.availability_zones.tf
diff --git a/variables.common.tf b/common/variables.common.tf
similarity index 100%
rename from variables.common.tf
rename to common/variables.common.tf
diff --git a/common/version.tf b/common/version.tf
deleted file mode 100644
index dd0ebb9..0000000
--- a/common/version.tf
+++ /dev/null
@@ -1,9 +0,0 @@
-terraform {
-  required_version = ">= 1.0"
-  required_providers {
-    aws = {
-      source  = "hashicorp/aws"
-      version = ">= 5.0"
-    }
-  }
-}
diff --git a/common/version.tf b/common/version.tf
new file mode 120000
index 0000000..061373c
--- /dev/null
+++ b/common/version.tf
@@ -0,0 +1 @@
+../version.tf
\ No newline at end of file
diff --git a/data.tf b/data.tf
deleted file mode 100644
index 16506e6..0000000
--- a/data.tf
+++ /dev/null
@@ -1,7 +0,0 @@
-data "aws_caller_identity" "current" {}
-
-data "aws_arn" "current" {
-  arn = data.aws_caller_identity.current.arn
-}
-
-data "aws_region" "current" {}
diff --git a/ec2/version.tf b/ec2/version.tf
new file mode 120000
index 0000000..b83c5b7
--- /dev/null
+++ b/ec2/version.tf
@@ -0,0 +1 @@
+../common/version.tf
\ No newline at end of file
diff --git a/module_name.tf b/module_name.tf
new file mode 100644
index 0000000..13edcee
--- /dev/null
+++ b/module_name.tf
@@ -0,0 +1,3 @@
+locals {
+  module_name = "aws-servicecatalog"
+}
diff --git a/versions.tf b/versions.tf
deleted file mode 100644
index 7503060..0000000
--- a/versions.tf
+++ /dev/null
@@ -1,9 +0,0 @@
-terraform {
-  required_providers {
-    aws = {
-      source  = "hashicorp/aws"
-      version = ">= 5.0"
-    }
-  }
-#  required_version = ">= 0.13"
-}