diff --git a/group_vars/all.yaml b/group_vars/all.yaml
new file mode 100644
index 0000000..b5e2982
--- /dev/null
+++ b/group_vars/all.yaml
@@ -0,0 +1,2 @@
+---
+checks:
diff --git a/group_vars/irc.yaml b/group_vars/irc.yaml
new file mode 100644
index 0000000..1fd12ce
--- /dev/null
+++ b/group_vars/irc.yaml
@@ -0,0 +1,3 @@
+---
+checks :
+    - { user : sheppy, name : irc, cmd : "/bin/true"}
diff --git a/host_vars/mail.yaml b/group_vars/mail.yaml
similarity index 100%
rename from host_vars/mail.yaml
rename to group_vars/mail.yaml
diff --git a/host_vars/ths.yaml b/group_vars/ths.yaml
similarity index 100%
rename from host_vars/ths.yaml
rename to group_vars/ths.yaml
diff --git a/host_vars/vpn.yaml b/group_vars/vpn.yaml
similarity index 100%
rename from host_vars/vpn.yaml
rename to group_vars/vpn.yaml
diff --git a/host_vars/irc.yaml b/host_vars/irc.yaml
deleted file mode 100644
index 5d4d887..0000000
--- a/host_vars/irc.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-checks :
-    - { user : sheppy, name : irc, cmd : ""}