diff --git a/roles/archive/tasks/atool.yml b/roles/archive/tasks/atool.yml
deleted file mode 100644
index 9733344..0000000
--- a/roles/archive/tasks/atool.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- name: Install atool
-  pacman: name=atool state=present
-  tags:
-    - atool
diff --git a/roles/archive/tasks/hashdeep.yml b/roles/archive/tasks/hashdeep.yml
deleted file mode 100644
index d63893d..0000000
--- a/roles/archive/tasks/hashdeep.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- name: Install hashdeep
-  aur: name=hashdeep user={{ user.name }}
-  tags:
-    - aur
-    - hashdeep
diff --git a/roles/archive/tasks/main.yml b/roles/archive/tasks/main.yml
index 78653c0..8c52366 100644
--- a/roles/archive/tasks/main.yml
+++ b/roles/archive/tasks/main.yml
@@ -1,6 +1,30 @@
 ---
-- include: zip.yml
-- include: rar.yml
-- include: atool.yml
-- include: hashdeep.yml
-- include: par2.yml
+- name: Install zip archive utilities
+  pacman: name={{ item }} state=present
+  with_items:
+    - zip
+    - unzip
+    - p7zip
+  tags:
+    - zip
+
+- name: Install unrar
+  pacman: name=unrar state=present
+  tags:
+    - unrar
+
+- name: Install atool
+  pacman: name=atool state=present
+  tags:
+    - atool
+
+- name: Install hashdeep
+  aur: name=hashdeep user={{ user.name }}
+  tags:
+    - aur
+    - hashdeep
+
+- name: Install par2cmdline
+  pacman: name=par2cmdline state=present
+  tags:
+    - par2
diff --git a/roles/archive/tasks/par2.yml b/roles/archive/tasks/par2.yml
deleted file mode 100644
index 5cd5268..0000000
--- a/roles/archive/tasks/par2.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- name: Install par2cmdline
-  pacman: name=par2cmdline state=present
-  tags:
-    - par2
diff --git a/roles/archive/tasks/rar.yml b/roles/archive/tasks/rar.yml
deleted file mode 100644
index 5e4d6e1..0000000
--- a/roles/archive/tasks/rar.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- name: Install unrar
-  pacman: name=unrar state=present
-  tags:
-    - unrar
diff --git a/roles/archive/tasks/zip.yml b/roles/archive/tasks/zip.yml
deleted file mode 100644
index 6c32c17..0000000
--- a/roles/archive/tasks/zip.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- name: Install zip archive utilities
-  pacman: name={{ item }} state=present
-  with_items:
-    - zip
-    - unzip
-    - p7zip
-  tags:
-    - zip