diff --git a/defaults/main.yml b/defaults/main.yml
index 9c2eedf..f6e4cea 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,5 +1,13 @@
 ---
-# defaults file for aptly
-
-# The |default... stuff is because `ansible_ssh_user` doesn't work in Ansible 2.0
 aptly_gpg_key_dir: "{{ lookup('env', 'HOME') }}"
+aptly_key_email: foo@bar.com
+aptly_company_name: yourcompany
+aptly_repositories:
+- name: "{{ aptly_company_name }}-dev"
+  comment: developent packages
+  default_distribution: trusty
+  default_component: main
+- name: "{{ aptly_company_name }}-test"
+  comment: test packages
+  default_distribution: trusty
+  default_component: main
diff --git a/vars/main.yml b/vars/main.yml
deleted file mode 100644
index 70abf37..0000000
--- a/vars/main.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-# vars file for aptly
-aptly_key_email: foo@bar.com
-aptly_company_name: yourcompany
-
-aptly_repositories:
-- name: "{{ aptly_company_name }}-dev"
-  comment: developent packages
-  default_distribution: trusty
-  default_component: main
-- name: "{{ aptly_company_name }}-test"
-  comment: test packages
-  default_distribution: trusty
-  default_component: main