diff --git a/cloud/aws/elasticache/README.md b/cloud/aws/elasticache/common/README.md
similarity index 89%
rename from cloud/aws/elasticache/README.md
rename to cloud/aws/elasticache/common/README.md
index 14963ea..ec333e4 100644
--- a/cloud/aws/elasticache/README.md
+++ b/cloud/aws/elasticache/common/README.md
@@ -5,8 +5,8 @@ How to use this module
 ----------------------
 
 ```
-module "datadog-monitors-aws-elasticcache" {
-  source = "git::ssh://git@bitbucket.org/morea/terraform.feature.datadog.git//cloud/aws/elasticcache?ref={revision}"
+module "datadog-monitors-aws-elasticache" {
+  source = "../common"
 
   message = "${module.datadog-message-alerting.alerting-message}"
   environment = "${var.environment}"
diff --git a/cloud/aws/elasticache/inputs.tf b/cloud/aws/elasticache/common/inputs.tf
similarity index 100%
rename from cloud/aws/elasticache/inputs.tf
rename to cloud/aws/elasticache/common/inputs.tf
diff --git a/cloud/aws/elasticache/monitors-elasticache.tf b/cloud/aws/elasticache/common/monitors-elasticache.tf
similarity index 96%
rename from cloud/aws/elasticache/monitors-elasticache.tf
rename to cloud/aws/elasticache/common/monitors-elasticache.tf
index 271d456..da13264 100644
--- a/cloud/aws/elasticache/monitors-elasticache.tf
+++ b/cloud/aws/elasticache/common/monitors-elasticache.tf
@@ -6,7 +6,7 @@ resource "datadog_monitor" "elasticache_eviction" {
 
   query = <<EOF
     ${var.eviction_aggregator}(${var.eviction_timeframe}): (
-      ${var.eviction_aggregator}:aws.elasticache.evictions{${var.filter_tags} by {region,cluster}
+      ${var.eviction_aggregator}:aws.elasticache.evictions{${var.filter_tags}} by {region,cluster}
     ) > 0
   EOF
 
diff --git a/cloud/aws/elasticache/redis/README.md b/cloud/aws/elasticache/redis/README.md
index 888b448..bf0c711 100644
--- a/cloud/aws/elasticache/redis/README.md
+++ b/cloud/aws/elasticache/redis/README.md
@@ -17,7 +17,7 @@ module "datadog-monitors-aws-elasticcache-redis" {
 
 Purpose
 -------
-Creates DataDog monitors with the following checks :
+Creates DataDog monitors with the following checks:
 
 * Cache Hit
 * CPU High
@@ -54,8 +54,9 @@ Inputs
 Related documentation
 ---------------------
 
-DataDog documentation: [https://docs.datadoghq.com/integrations/amazon_elasticache/](https://docs.datadoghq.com/integrations/amazon_elasticache/)
-And more here :
+DataDog documentation: [https://docs.datadoghq.com/integrations/amazon_elasticache/](https://docs.datadoghq.com/integrations/amazon_elasticache/)  
+And more here:
+
 * [https://www.datadoghq.com/dashboards/elasticache-dashboard-redis/](https://www.datadoghq.com/dashboards/elasticache-dashboard-redis/)
 * [https://www.datadoghq.com/blog/monitoring-elasticache-performance-metrics-with-redis-or-memcached/](https://www.datadoghq.com/blog/monitoring-elasticache-performance-metrics-with-redis-or-memcached/)
 
diff --git a/cloud/aws/elasticache/redis/monitors-redis.tf b/cloud/aws/elasticache/redis/monitors-redis.tf
index 4b8100d..68a9436 100644
--- a/cloud/aws/elasticache/redis/monitors-redis.tf
+++ b/cloud/aws/elasticache/redis/monitors-redis.tf
@@ -7,7 +7,7 @@ data "template_file" "filter" {
 }
 
 module "datadog-monitors-aws-elasticcache-common" {
-  source = "../."
+  source = "../common"
 
   message     = "${var.message}"
   environment = "${var.environment}"