diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..485dee6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.idea
diff --git a/modules/aws/alb_cloudwatch.hcl b/modules/aws/alb/1.0/alb_cloudwatch.hcl
similarity index 100%
rename from modules/aws/alb_cloudwatch.hcl
rename to modules/aws/alb/1.0/alb_cloudwatch.hcl
diff --git a/modules/aws/apigateway_cloudwatch.hcl b/modules/aws/apigw/1.0/apigateway_cloudwatch.hcl
similarity index 100%
rename from modules/aws/apigateway_cloudwatch.hcl
rename to modules/aws/apigw/1.0/apigateway_cloudwatch.hcl
diff --git a/modules/aws/aurora_cloudwatch.hcl b/modules/aws/aurora/1.0/aurora_cloudwatch.hcl
similarity index 100%
rename from modules/aws/aurora_cloudwatch.hcl
rename to modules/aws/aurora/1.0/aurora_cloudwatch.hcl
diff --git a/modules/aws/cloudfront_cloudwatch.hcl b/modules/aws/cloudfront/1.0/cloudfront_cloudwatch.hcl
similarity index 100%
rename from modules/aws/cloudfront_cloudwatch.hcl
rename to modules/aws/cloudfront/1.0/cloudfront_cloudwatch.hcl
diff --git a/modules/aws/dax_cloudwatch.hcl b/modules/aws/dax/1.0/dax_cloudwatch.hcl
similarity index 100%
rename from modules/aws/dax_cloudwatch.hcl
rename to modules/aws/dax/1.0/dax_cloudwatch.hcl
diff --git a/modules/aws/dynamodb_cloudwatch.hcl b/modules/aws/dynamodb/1.0/dynamodb_cloudwatch.hcl
similarity index 100%
rename from modules/aws/dynamodb_cloudwatch.hcl
rename to modules/aws/dynamodb/1.0/dynamodb_cloudwatch.hcl
diff --git a/modules/aws/ec2_cloudwatch.hcl b/modules/aws/ec2/1.0/ec2_cloudwatch.hcl
similarity index 100%
rename from modules/aws/ec2_cloudwatch.hcl
rename to modules/aws/ec2/1.0/ec2_cloudwatch.hcl
diff --git a/modules/aws/eks_ci_k8s_deployment_cloudwatch.hcl b/modules/aws/eks/1.0/eks_ci_k8s_deployment_cloudwatch.hcl
similarity index 100%
rename from modules/aws/eks_ci_k8s_deployment_cloudwatch.hcl
rename to modules/aws/eks/1.0/eks_ci_k8s_deployment_cloudwatch.hcl
diff --git a/modules/aws/eks_ci_k8s_service_cloudwatch.hcl b/modules/aws/eks/1.0/eks_ci_k8s_service_cloudwatch.hcl
similarity index 100%
rename from modules/aws/eks_ci_k8s_service_cloudwatch.hcl
rename to modules/aws/eks/1.0/eks_ci_k8s_service_cloudwatch.hcl
diff --git a/modules/aws/eks_containerinsights_cloudwatch.hcl b/modules/aws/eks/1.0/eks_containerinsights_cloudwatch.hcl
similarity index 100%
rename from modules/aws/eks_containerinsights_cloudwatch.hcl
rename to modules/aws/eks/1.0/eks_containerinsights_cloudwatch.hcl
diff --git a/modules/aws/elasticache_cloudwatch.hcl b/modules/aws/elasticache/1.0/elasticache_cloudwatch.hcl
similarity index 100%
rename from modules/aws/elasticache_cloudwatch.hcl
rename to modules/aws/elasticache/1.0/elasticache_cloudwatch.hcl
diff --git a/modules/aws/elasticsearch_cloudwatch.hcl b/modules/aws/elasticsearch/1.0/elasticsearch_cloudwatch.hcl
similarity index 100%
rename from modules/aws/elasticsearch_cloudwatch.hcl
rename to modules/aws/elasticsearch/1.0/elasticsearch_cloudwatch.hcl
diff --git a/modules/aws/elb_cloudwatch.hcl b/modules/aws/elb/1.0/elb_cloudwatch.hcl
similarity index 100%
rename from modules/aws/elb_cloudwatch.hcl
rename to modules/aws/elb/1.0/elb_cloudwatch.hcl
diff --git a/modules/aws/lambda_cloudwatch.hcl b/modules/aws/lambda/1.0/lambda_cloudwatch.hcl
similarity index 100%
rename from modules/aws/lambda_cloudwatch.hcl
rename to modules/aws/lambda/1.0/lambda_cloudwatch.hcl
diff --git a/modules/aws/msk_cloudwatch.hcl b/modules/aws/msk/1.0/msk_cloudwatch.hcl
similarity index 100%
rename from modules/aws/msk_cloudwatch.hcl
rename to modules/aws/msk/1.0/msk_cloudwatch.hcl
diff --git a/modules/aws/msk_with_tags_cloudwatch.hcl b/modules/aws/msk/1.0/msk_with_tags_cloudwatch.hcl
similarity index 100%
rename from modules/aws/msk_with_tags_cloudwatch.hcl
rename to modules/aws/msk/1.0/msk_with_tags_cloudwatch.hcl
diff --git a/modules/cloudflare/cdn.hcl b/modules/aws/nlb/1.0/cdn.hcl
similarity index 100%
rename from modules/cloudflare/cdn.hcl
rename to modules/aws/nlb/1.0/cdn.hcl
diff --git a/modules/aws/nlb_cloudwatch.hcl b/modules/aws/nlb/1.0/nlb_cloudwatch.hcl
similarity index 100%
rename from modules/aws/nlb_cloudwatch.hcl
rename to modules/aws/nlb/1.0/nlb_cloudwatch.hcl
diff --git a/modules/aws/rds_cloudwatch.hcl b/modules/aws/rds/1.0/rds_cloudwatch.hcl
similarity index 100%
rename from modules/aws/rds_cloudwatch.hcl
rename to modules/aws/rds/1.0/rds_cloudwatch.hcl
diff --git a/modules/aws/sqs_cloudwatch.hcl b/modules/aws/sqs/1.0/sqs_cloudwatch.hcl
similarity index 100%
rename from modules/aws/sqs_cloudwatch.hcl
rename to modules/aws/sqs/1.0/sqs_cloudwatch.hcl
diff --git a/modules/gcp/cloudsql.hcl b/modules/gcp/cloudsql/1.0/cloudsql.hcl
similarity index 100%
rename from modules/gcp/cloudsql.hcl
rename to modules/gcp/cloudsql/1.0/cloudsql.hcl
diff --git a/modules/managed/aerospike_datadog.hcl b/modules/managed/datadog/1.0/aerospike_datadog.hcl
similarity index 100%
rename from modules/managed/aerospike_datadog.hcl
rename to modules/managed/datadog/1.0/aerospike_datadog.hcl
diff --git a/modules/managed/kong_datadog.hcl b/modules/managed/datadog/1.0/kong_datadog.hcl
similarity index 100%
rename from modules/managed/kong_datadog.hcl
rename to modules/managed/datadog/1.0/kong_datadog.hcl
diff --git a/modules/prometheus/istio_aws_tcp_services.hcl b/modules/prometheus/istio/1.0/istio_aws_tcp_services.hcl
similarity index 100%
rename from modules/prometheus/istio_aws_tcp_services.hcl
rename to modules/prometheus/istio/1.0/istio_aws_tcp_services.hcl
diff --git a/modules/prometheus/istio_multi_cluster.hcl b/modules/prometheus/istio/1.0/istio_multi_cluster.hcl
similarity index 100%
rename from modules/prometheus/istio_multi_cluster.hcl
rename to modules/prometheus/istio/1.0/istio_multi_cluster.hcl
diff --git a/modules/prometheus/istio_tcp_services.hcl b/modules/prometheus/istio/1.0/istio_tcp_services.hcl
similarity index 99%
rename from modules/prometheus/istio_tcp_services.hcl
rename to modules/prometheus/istio/1.0/istio_tcp_services.hcl
index 04079a0..499208e 100644
--- a/modules/prometheus/istio_tcp_services.hcl
+++ b/modules/prometheus/istio/1.0/istio_tcp_services.hcl
@@ -98,7 +98,6 @@ ingester prometheus_istio_tcp_workload module {
   }
 }
 
-
 ingester prometheus_istio_tcp_cluster module {
   frequency  = 120
   lookback   = 600
diff --git a/modules/prometheus/istio_tcp_services_without_label_set.hcl b/modules/prometheus/istio/1.0/istio_tcp_services_without_label_set.hcl
similarity index 100%
rename from modules/prometheus/istio_tcp_services_without_label_set.hcl
rename to modules/prometheus/istio/1.0/istio_tcp_services_without_label_set.hcl
diff --git a/modules/prometheus/istio_with_single_cluster.hcl b/modules/prometheus/istio/1.0/istio_with_single_cluster.hcl
similarity index 100%
rename from modules/prometheus/istio_with_single_cluster.hcl
rename to modules/prometheus/istio/1.0/istio_with_single_cluster.hcl
diff --git a/modules/prometheus/k8s_via_kube_state.hcl b/modules/prometheus/k8s/1.0/k8s_via_kube_state.hcl
similarity index 100%
rename from modules/prometheus/k8s_via_kube_state.hcl
rename to modules/prometheus/k8s/1.0/k8s_via_kube_state.hcl
diff --git a/modules/prometheus/k8s_via_kube_state_without_label_set.hcl b/modules/prometheus/k8s/1.0/k8s_via_kube_state_without_label_set.hcl
similarity index 100%
rename from modules/prometheus/k8s_via_kube_state_without_label_set.hcl
rename to modules/prometheus/k8s/1.0/k8s_via_kube_state_without_label_set.hcl
diff --git a/modules/prometheus/linkerd.hcl b/modules/prometheus/linkerd/1.0/linkerd.hcl
similarity index 100%
rename from modules/prometheus/linkerd.hcl
rename to modules/prometheus/linkerd/1.0/linkerd.hcl
diff --git a/modules/prometheus/linkerd_path_based.hcl b/modules/prometheus/linkerd/1.0/linkerd_path_based.hcl
similarity index 100%
rename from modules/prometheus/linkerd_path_based.hcl
rename to modules/prometheus/linkerd/1.0/linkerd_path_based.hcl
diff --git a/modules/prometheus/remote_write.hcl b/modules/prometheus/remote_write/1.0/remote_write.hcl
similarity index 100%
rename from modules/prometheus/remote_write.hcl
rename to modules/prometheus/remote_write/1.0/remote_write.hcl
diff --git a/modules/prometheus/remote_write_pre_v2_30.hcl b/modules/prometheus/remote_write/1.0/remote_write_pre_v2_30.hcl
similarity index 100%
rename from modules/prometheus/remote_write_pre_v2_30.hcl
rename to modules/prometheus/remote_write/1.0/remote_write_pre_v2_30.hcl
diff --git a/modules/prometheus/remote_write_without_label_set.hcl b/modules/prometheus/remote_write/1.0/remote_write_without_label_set.hcl
similarity index 100%
rename from modules/prometheus/remote_write_without_label_set.hcl
rename to modules/prometheus/remote_write/1.0/remote_write_without_label_set.hcl