diff --git a/inventory/ec2.ini b/.inventory.aws/ec2.ini
similarity index 100%
rename from inventory/ec2.ini
rename to .inventory.aws/ec2.ini
diff --git a/inventory/ec2.py b/.inventory.aws/ec2.py
similarity index 100%
rename from inventory/ec2.py
rename to .inventory.aws/ec2.py
diff --git a/9iron.yml b/9iron.yml
index 0ffe6b3..18c4f27 100644
--- a/9iron.yml
+++ b/9iron.yml
@@ -6,7 +6,7 @@
     - common
     - user
     - influxdb
-- hosts: tag_www_true
+- hosts: 9iron.club
   roles:
     - role: backups
       vars:
@@ -32,7 +32,7 @@
         gitweb_url: "www.9iron.club"
         gitweb_webroot: "/var/www/www"
       tags: [ web, webroot ]
-- hosts: tag_terraria_vanilla
+- hosts: terraria.9iron.club
   roles:
     - role: terraria
       vars:
@@ -64,19 +64,7 @@
         terraria_port: 7779
         terraria_difficulty: 3
       tags: [ gameserver, terraria ]
-- hosts: tag_minecraft_ultreload
-  roles:
-    - role: backups
-    - role: minecraft
-      vars:
-        mcname: "ftbult-reloaded-smp"
-        mczip: "https://media.forgecdn.net/files/2746/974/FTBUltimateReloadedServer_1.8.0.zip"
-        mcforge: "1.12.2-14.23.5.2846"
-        mcmotd: "Going back to the roots edition"
-        mcport: 25565
-        mcgamemode: 0
-      tags: [ gameserver, minecraft ]
-- hosts: tag_ansiblehost_true
+- hosts: ansiblehosts
   roles:
     - role: ansiblehost
       tags: [ ansiblehost ]
diff --git a/group_vars/all.yml b/inventory/group_vars/all.yml
similarity index 100%
rename from group_vars/all.yml
rename to inventory/group_vars/all.yml
diff --git a/inventory/group_vars/webservers.yml b/inventory/group_vars/webservers.yml
new file mode 100644
index 0000000..ae8a1f4
--- /dev/null
+++ b/inventory/group_vars/webservers.yml
@@ -0,0 +1,3 @@
+#!/usr/bin/ansible-playbook
+# vim:ft=ansible:
+backups_outdir: "/cold/backups"
diff --git a/inventory/hosts.yml b/inventory/hosts.yml
new file mode 100644
index 0000000..5bfde7a
--- /dev/null
+++ b/inventory/hosts.yml
@@ -0,0 +1,13 @@
+#!/usr/bin/ansible-playbook
+# vim:ft=ansible:
+all:
+  children:
+    ansiblehosts:
+      hosts:
+        9iron.club:
+    webservers:
+      hosts:
+        9iron.club:
+    gameservers:
+      hosts:
+        terraria.9iron.club: