diff --git a/.gitignore b/.gitignore
index 52146d6cccfa5c49cad8b5ea76f739dfa1e24beb..fce0fd4c959a03147aca015f41ec4e8cd07bd231 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-modules/
+/modules/
+# Include custom module
+!/modules/logstash_conf
diff --git a/Puppetfile b/Puppetfile
index fc4e0f6c8c43c04e5167fe5be15c42e9d0dc8603..b7149caf574c67d28c9740f7a5f66e8dc9b309b2 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -16,6 +16,8 @@ forge 'https://forge.puppet.com'
 #  git:    'https://github.com/puppetlabs/puppetlabs-apache',
 #  branch: 'docs_experiment'
 
+mod 'logstash_conf', :local => true
+
 mod 'puppetlabs-stdlib', '8.1.0'
 mod 'puppetlabs-apt', '8.3.0'
 mod 'puppet-yum', '5.3.0'
@@ -28,4 +30,4 @@ mod 'richardc-datacat', '0.6.2'
 mod 'puppetlabs-java', '7.3.0'
 mod 'puppet-nginx', '3.3.0'
 mod 'puppetlabs-concat', '7.1.1'
-mod 'puppetlabs-apache', '7.0.0'
+mod 'puppetlabs-apache', '7.0.0'
\ No newline at end of file
diff --git a/site-modules/logstash_conf/files/30-elasticsearch-output.conf  b/modules/logstash_conf/files/30-elasticsearch-output.conf 
similarity index 100%
rename from site-modules/logstash_conf/files/30-elasticsearch-output.conf 
rename to modules/logstash_conf/files/30-elasticsearch-output.conf 
diff --git a/site-modules/logstash_conf/.gitkeep b/site-modules/logstash_conf/.gitkeep
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/site-modules/logstash_conf/files/.gitkeep b/site-modules/logstash_conf/files/.gitkeep
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000