diff --git a/ansible.cfg b/ansible.cfg
index 4dd7633..1161eda 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -1,3 +1,4 @@
 [defaults]
 nocows             = 1
 callbacks_enabled  = profile_tasks
+roles_path         = roles
diff --git a/bittorrent.yml b/playbooks/bittorrent.yml
similarity index 100%
rename from bittorrent.yml
rename to playbooks/bittorrent.yml
diff --git a/elasticsearch.yml b/playbooks/elasticsearch.yml
similarity index 100%
rename from elasticsearch.yml
rename to playbooks/elasticsearch.yml
diff --git a/firewall.yml b/playbooks/firewall.yml
similarity index 100%
rename from firewall.yml
rename to playbooks/firewall.yml
diff --git a/ftp.yml b/playbooks/ftp.yml
similarity index 100%
rename from ftp.yml
rename to playbooks/ftp.yml
diff --git a/garage.yml b/playbooks/garage.yml
similarity index 100%
rename from garage.yml
rename to playbooks/garage.yml
diff --git a/icecast2.yml b/playbooks/icecast2.yml
similarity index 100%
rename from icecast2.yml
rename to playbooks/icecast2.yml
diff --git a/loadbalancinghttp.yml b/playbooks/loadbalancinghttp.yml
similarity index 100%
rename from loadbalancinghttp.yml
rename to playbooks/loadbalancinghttp.yml
diff --git a/mail.yml b/playbooks/mail.yml
similarity index 100%
rename from mail.yml
rename to playbooks/mail.yml
diff --git a/mariadb.yml b/playbooks/mariadb.yml
similarity index 100%
rename from mariadb.yml
rename to playbooks/mariadb.yml
diff --git a/mastodon.yml b/playbooks/mastodon.yml
similarity index 100%
rename from mastodon.yml
rename to playbooks/mastodon.yml
diff --git a/mumble.yml b/playbooks/mumble.yml
similarity index 100%
rename from mumble.yml
rename to playbooks/mumble.yml
diff --git a/munin.yml b/playbooks/munin.yml
similarity index 100%
rename from munin.yml
rename to playbooks/munin.yml
diff --git a/nsd.yml b/playbooks/nsd.yml
similarity index 100%
rename from nsd.yml
rename to playbooks/nsd.yml
diff --git a/nut.yml b/playbooks/nut.yml
similarity index 100%
rename from nut.yml
rename to playbooks/nut.yml
diff --git a/peertube.yml b/playbooks/peertube.yml
similarity index 100%
rename from peertube.yml
rename to playbooks/peertube.yml
diff --git a/pgsql.yml b/playbooks/pgsql.yml
similarity index 100%
rename from pgsql.yml
rename to playbooks/pgsql.yml
diff --git a/php.yml b/playbooks/php.yml
similarity index 100%
rename from php.yml
rename to playbooks/php.yml
diff --git a/restic.yml b/playbooks/restic.yml
similarity index 100%
rename from restic.yml
rename to playbooks/restic.yml
diff --git a/site.yml b/playbooks/site.yml
similarity index 100%
rename from site.yml
rename to playbooks/site.yml
diff --git a/smtprelay.yml b/playbooks/smtprelay.yml
similarity index 100%
rename from smtprelay.yml
rename to playbooks/smtprelay.yml
diff --git a/syslog.yml b/playbooks/syslog.yml
similarity index 100%
rename from syslog.yml
rename to playbooks/syslog.yml
diff --git a/system.yml b/playbooks/system.yml
similarity index 100%
rename from system.yml
rename to playbooks/system.yml
diff --git a/usb.yml b/playbooks/usb.yml
similarity index 100%
rename from usb.yml
rename to playbooks/usb.yml
diff --git a/webservers.yml b/playbooks/webservers.yml
similarity index 100%
rename from webservers.yml
rename to playbooks/webservers.yml
diff --git a/xmpp.yml b/playbooks/xmpp.yml
similarity index 100%
rename from xmpp.yml
rename to playbooks/xmpp.yml