diff --git a/collectd/client.sls b/collectd/client.sls
index 90df072..dcd0eb1 100644
--- a/collectd/client.sls
+++ b/collectd/client.sls
@@ -39,15 +39,23 @@
   - require:
     - pkg: collectd_client_packages
 
+collectd_client_plugins_grains_dir:
+  file.directory:
+  - name: /etc/salt/grains.d
+  - mode: 700
+  - makedirs: true
+  - user: root
+
 collectd_client_plugins_grain:
   file.managed:
-  - name: /etc/salt/grains.d/collectd_plugins
-  - source: salt://collectd/files/plugins.grain
+  - name: /etc/salt/grains.d/collectd
+  - source: salt://collectd/files/collectd.grain
   - template: jinja
   - user: root
   - mode: 600
   - require:
     - pkg: collectd_client_packages
+    - file: collectd_client_plugins_grains_dir
 
 {%- set collectd_plugin_yaml = salt['cmd.run']('[ -e /etc/salt/grains.d/collectd_plugins ] && cat /etc/salt/grains.d/collectd_plugins || echo "collectd_plugin: {}"') %}
 {%- load_yaml as collectd_plugin %}
diff --git a/collectd/files/plugins.grain b/collectd/files/collectd.grain
similarity index 79%
rename from collectd/files/plugins.grain
rename to collectd/files/collectd.grain
index 76279c4..db13e75 100644
--- a/collectd/files/plugins.grain
+++ b/collectd/files/collectd.grain
@@ -1,7 +1,7 @@
 collectd_plugin:
 {%- for service_name, service in pillar.items() %}
 {%- if service.get('_support', {}).get('collectd', {}).get('enabled', False) %}
-{%- set grains_fragment_file = service_name+'/files/collectd_plugins.yml' %}
+{%- set grains_fragment_file = service_name+'/meta/collectd.yml' %}
 {%- macro indent_grains_dict() %}{% include grains_fragment_file %}{% endmacro %}
 {{- indent_grains_dict()|indent(2, true) }}
 {%- endif %}
diff --git a/collectd/files/collectd_plugins.yml b/collectd/meta/collectd.yml
similarity index 100%
rename from collectd/files/collectd_plugins.yml
rename to collectd/meta/collectd.yml
diff --git a/collectd/files/sensu_checks.yml b/collectd/meta/sensu.yml
similarity index 100%
rename from collectd/files/sensu_checks.yml
rename to collectd/meta/sensu.yml
diff --git a/collectd/meta/sphinx.yml b/collectd/meta/sphinx.yml
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/collectd/meta/sphinx.yml
diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index b51bbb4..41f6c88 100644
--- a/metadata/service/support.yml
+++ b/metadata/service/support.yml
@@ -7,3 +7,5 @@
         enabled: false
       sensu:
         enabled: true
+      sphinx:
+        enabled: true