diff --git a/group_vars/all/python.yml b/inventory/group_vars/all/python.yml
similarity index 100%
rename from group_vars/all/python.yml
rename to inventory/group_vars/all/python.yml
diff --git a/group_vars/all/restic.yml b/inventory/group_vars/all/restic.yml
similarity index 100%
rename from group_vars/all/restic.yml
rename to inventory/group_vars/all/restic.yml
diff --git a/group_vars/all/smtprelay.yml b/inventory/group_vars/all/smtprelay.yml
similarity index 100%
rename from group_vars/all/smtprelay.yml
rename to inventory/group_vars/all/smtprelay.yml
diff --git a/group_vars/garage_prd_cluster.yml b/inventory/group_vars/garage_prd_cluster.yml
similarity index 100%
rename from group_vars/garage_prd_cluster.yml
rename to inventory/group_vars/garage_prd_cluster.yml
diff --git a/group_vars/mastodonservers.yml b/inventory/group_vars/mastodonservers.yml
similarity index 100%
rename from group_vars/mastodonservers.yml
rename to inventory/group_vars/mastodonservers.yml
diff --git a/group_vars/nsdservers.yml b/inventory/group_vars/nsdservers.yml
similarity index 100%
rename from group_vars/nsdservers.yml
rename to inventory/group_vars/nsdservers.yml
diff --git a/group_vars/nut.yml b/inventory/group_vars/nut.yml
similarity index 100%
rename from group_vars/nut.yml
rename to inventory/group_vars/nut.yml
diff --git a/group_vars/peertuberunners.yml b/inventory/group_vars/peertuberunners.yml
similarity index 100%
rename from group_vars/peertuberunners.yml
rename to inventory/group_vars/peertuberunners.yml
diff --git a/group_vars/phpservers.yml b/inventory/group_vars/phpservers.yml
similarity index 100%
rename from group_vars/phpservers.yml
rename to inventory/group_vars/phpservers.yml
diff --git a/host_vars/baybay-ponay.mateu.be.yml b/inventory/host_vars/baybay-ponay.mateu.be.yml
similarity index 100%
rename from host_vars/baybay-ponay.mateu.be.yml
rename to inventory/host_vars/baybay-ponay.mateu.be.yml
diff --git a/host_vars/bt.dmz.mateu.be.yml b/inventory/host_vars/bt.dmz.mateu.be.yml
similarity index 100%
rename from host_vars/bt.dmz.mateu.be.yml
rename to inventory/host_vars/bt.dmz.mateu.be.yml
diff --git a/host_vars/dns1.dmz.mateu.be.yml b/inventory/host_vars/dns1.dmz.mateu.be.yml
similarity index 100%
rename from host_vars/dns1.dmz.mateu.be.yml
rename to inventory/host_vars/dns1.dmz.mateu.be.yml
diff --git a/host_vars/frederica.dmz.mateu.be.yml b/inventory/host_vars/frederica.dmz.mateu.be.yml
similarity index 100%
rename from host_vars/frederica.dmz.mateu.be.yml
rename to inventory/host_vars/frederica.dmz.mateu.be.yml
diff --git a/host_vars/garage1.dmz.mateu.be.yml b/inventory/host_vars/garage1.dmz.mateu.be.yml
similarity index 100%
rename from host_vars/garage1.dmz.mateu.be.yml
rename to inventory/host_vars/garage1.dmz.mateu.be.yml
diff --git a/host_vars/jabber.dmz.mateu.be.yml b/inventory/host_vars/jabber.dmz.mateu.be.yml
similarity index 100%
rename from host_vars/jabber.dmz.mateu.be.yml
rename to inventory/host_vars/jabber.dmz.mateu.be.yml
diff --git a/host_vars/mail.dmz.mateu.be.yml b/inventory/host_vars/mail.dmz.mateu.be.yml
similarity index 100%
rename from host_vars/mail.dmz.mateu.be.yml
rename to inventory/host_vars/mail.dmz.mateu.be.yml
diff --git a/host_vars/masto1.dmz.mateu.be.yml b/inventory/host_vars/masto1.dmz.mateu.be.yml
similarity index 100%
rename from host_vars/masto1.dmz.mateu.be.yml
rename to inventory/host_vars/masto1.dmz.mateu.be.yml
diff --git a/host_vars/munin.dmz.mateu.be.yml b/inventory/host_vars/munin.dmz.mateu.be.yml
similarity index 100%
rename from host_vars/munin.dmz.mateu.be.yml
rename to inventory/host_vars/munin.dmz.mateu.be.yml
diff --git a/host_vars/muse-HP-EliteBook-820-G2.home.arpa.yml b/inventory/host_vars/muse-HP-EliteBook-820-G2.home.arpa.yml
similarity index 100%
rename from host_vars/muse-HP-EliteBook-820-G2.home.arpa.yml
rename to inventory/host_vars/muse-HP-EliteBook-820-G2.home.arpa.yml
diff --git a/host_vars/nsd-master1.ext.mateu.be.yml b/inventory/host_vars/nsd-master1.ext.mateu.be.yml
similarity index 100%
rename from host_vars/nsd-master1.ext.mateu.be.yml
rename to inventory/host_vars/nsd-master1.ext.mateu.be.yml
diff --git a/host_vars/pinkypie.home.arpa.yml b/inventory/host_vars/pinkypie.home.arpa.yml
similarity index 100%
rename from host_vars/pinkypie.home.arpa.yml
rename to inventory/host_vars/pinkypie.home.arpa.yml
diff --git a/host_vars/pt1.dmz.mateu.be.yml b/inventory/host_vars/pt1.dmz.mateu.be.yml
similarity index 100%
rename from host_vars/pt1.dmz.mateu.be.yml
rename to inventory/host_vars/pt1.dmz.mateu.be.yml
diff --git a/host_vars/voice1.dmz.mateu.be.yml b/inventory/host_vars/voice1.dmz.mateu.be.yml
similarity index 100%
rename from host_vars/voice1.dmz.mateu.be.yml
rename to inventory/host_vars/voice1.dmz.mateu.be.yml
diff --git a/host_vars/voice3.dmz.mateu.be.yml b/inventory/host_vars/voice3.dmz.mateu.be.yml
similarity index 100%
rename from host_vars/voice3.dmz.mateu.be.yml
rename to inventory/host_vars/voice3.dmz.mateu.be.yml
diff --git a/host_vars/web1.dmz.mateu.be.yml b/inventory/host_vars/web1.dmz.mateu.be.yml
similarity index 100%
rename from host_vars/web1.dmz.mateu.be.yml
rename to inventory/host_vars/web1.dmz.mateu.be.yml
diff --git a/host_vars/web2.dmz.mateu.be.yml b/inventory/host_vars/web2.dmz.mateu.be.yml
similarity index 100%
rename from host_vars/web2.dmz.mateu.be.yml
rename to inventory/host_vars/web2.dmz.mateu.be.yml
diff --git a/host_vars/web3.dmz.mateu.be.yml b/inventory/host_vars/web3.dmz.mateu.be.yml
similarity index 100%
rename from host_vars/web3.dmz.mateu.be.yml
rename to inventory/host_vars/web3.dmz.mateu.be.yml
diff --git a/production.yml b/inventory/production.yml
similarity index 100%
rename from production.yml
rename to inventory/production.yml