diff --git a/files/localhost.zone b/bind/files/localhost.zone
similarity index 100%
rename from files/localhost.zone
rename to bind/files/localhost.zone
diff --git a/files/logrotate b/bind/files/logrotate
similarity index 100%
rename from files/logrotate
rename to bind/files/logrotate
diff --git a/files/named.ca b/bind/files/named.ca
similarity index 100%
rename from files/named.ca
rename to bind/files/named.ca
diff --git a/files/named.conf.Debian b/bind/files/named.conf.Debian
similarity index 100%
rename from files/named.conf.Debian
rename to bind/files/named.conf.Debian
diff --git a/files/named.conf.default-zones b/bind/files/named.conf.default-zones
similarity index 100%
rename from files/named.conf.default-zones
rename to bind/files/named.conf.default-zones
diff --git a/files/named.conf.local b/bind/files/named.conf.local
similarity index 100%
rename from files/named.conf.local
rename to bind/files/named.conf.local
diff --git a/files/named.conf.options b/bind/files/named.conf.options
similarity index 100%
rename from files/named.conf.options
rename to bind/files/named.conf.options
diff --git a/files/named.local b/bind/files/named.local
similarity index 100%
rename from files/named.local
rename to bind/files/named.local
diff --git a/init.sls b/bind/init.sls
similarity index 100%
rename from init.sls
rename to bind/init.sls
diff --git a/map.jinja b/bind/map.jinja
similarity index 100%
rename from map.jinja
rename to bind/map.jinja
diff --git a/server/init.sls b/bind/server/init.sls
similarity index 100%
rename from server/init.sls
rename to bind/server/init.sls
diff --git a/server/service.sls b/bind/server/service.sls
similarity index 100%
rename from server/service.sls
rename to bind/server/service.sls
diff --git a/server/zone.sls b/bind/server/zone.sls
similarity index 100%
rename from server/zone.sls
rename to bind/server/zone.sls
diff --git a/metadata/service/server/single.yml b/metadata/service/server/single.yml
new file mode 100644
index 0000000..a8dfb91
--- /dev/null
+++ b/metadata/service/server/single.yml
@@ -0,0 +1,6 @@
+applications:
+- bind
+parameters:
+  bind:
+    server:
+      enabled: true