diff --git a/files/libvirt-bin b/libvirt/files/libvirt-bin
similarity index 100%
rename from files/libvirt-bin
rename to libvirt/files/libvirt-bin
diff --git a/files/libvirtd.conf.Debian b/libvirt/files/libvirtd.conf.Debian
similarity index 100%
rename from files/libvirtd.conf.Debian
rename to libvirt/files/libvirtd.conf.Debian
diff --git a/hostnode.sls b/libvirt/hostnode.sls
similarity index 100%
rename from hostnode.sls
rename to libvirt/hostnode.sls
diff --git a/init.sls b/libvirt/init.sls
similarity index 100%
rename from init.sls
rename to libvirt/init.sls
diff --git a/map.jinja b/libvirt/map.jinja
similarity index 100%
rename from map.jinja
rename to libvirt/map.jinja
diff --git a/server.sls b/libvirt/server.sls
similarity index 100%
rename from server.sls
rename to libvirt/server.sls
diff --git a/metadata/service/server/init.yml b/metadata/service/server/init.yml
new file mode 100644
index 0000000..88b6c7e
--- /dev/null
+++ b/metadata/service/server/init.yml
@@ -0,0 +1,6 @@
+applications:
+- libvirt
+parameters:
+  libvirt:
+    server:
+      enabled: true
\ No newline at end of file