diff --git a/tasks/desktop.yml b/tasks/desktop.yml
new file mode 100644
index 0000000..744aa4a
--- /dev/null
+++ b/tasks/desktop.yml
@@ -0,0 +1,13 @@
+---
+- name: "Installing desktop environments"
+  apt: >
+    name="{{item}}"
+    state=present
+  with_items:
+    - lightdm
+    - lxde
+    - lxsession
+    - x2goclient
+    - kde-plasma-desktop
+    - xserver-xorg-core
+
diff --git a/tasks/development.yml b/tasks/development.yml
new file mode 100644
index 0000000..be38743
--- /dev/null
+++ b/tasks/development.yml
@@ -0,0 +1,28 @@
+---
+- name: "Installing development utils"
+  apt: >
+    name="{{item}}"
+    state=present
+  with_items:
+    - vim
+    - vim-gtk
+    - git
+    - git-flow
+    - subversion
+    - mercurial
+    - hg-fast-export
+    - meld
+    - devscripts
+    - screen
+    - tmux
+    - opam
+    - cmake
+
+- name: "Installing development libraries"
+  apt: >
+    name="{{item}}"
+    state=present
+  with_items:
+    - manpages-dev
+    - plasma-desktop-dev
+    - xserver-xorg-dev
diff --git a/tasks/main.yml b/tasks/main.yml
index 4026f14..658f30f 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,119 +1,9 @@
 ---
-# tasks file for glenux.basesystem
-- name: "Installing desktop environments"
-  apt: >
-    name="{{item}}"
-    state=present
-  with_items:
-    - lightdm
-    - lxde
-    - lxsession
-    - x2goclient
-    - kde-plasma-desktop
-    - xserver-xorg-core
-
-- name: "Installing development utils"
-  apt: >
-    name="{{item}}"
-    state=present
-  with_items:
-    - vim
-    - vim-gtk
-    - git
-    - git-flow
-    - subversion
-    - mercurial
-    - hg-fast-export
-    - meld
-    - devscripts
-    - screen
-    - tmux
-    - opam
-    - cmake
-
-- name: "Installing development utils"
-  apt: >
-    name="{{item}}"
-    state=present
-  with_items:
-    - manpages-dev
-    - plasma-desktop-dev
-    - xserver-xorg-dev
-
-- name: "Installing common office tools"
-  apt: >
-    name="{{item}}"
-    state=present
-  with_items:
-    - leafpad
-    - libreoffice
-    - lyx
-    - ttf-mscorefonts-installer
-
-- name: "Installing drawing utils"
-  apt: >
-    name="{{item}}"
-    state=present
-  with_items:
-    - gimp
-    - geeqie
-    - gwenview
-    - inkscape
-
-- name: "Installing common video tools"
-  apt: >
-    name="{{item}}"
-    state=present
-  with_items:
-    - mpv
-    - mplayer
-    - vlc
-    - transcode
-
-- name: "Installing common communication tools"
-  apt: >
-    name="{{item}}"
-    state=present
-  with_items:
-    - iceweasel
-    - icedove
-    - chromium
-    - psi-plus
-    - mutt
-
-- name: "Installing common security tools"
-  apt: >
-    name="{{item}}"
-    state=present
-  with_items:
-    - encfs
-    - cryptkeeper
-    - cryptmount
-    - cryptsetup
-    - cryptsetup-bin
-    - libpam-encfs
-    - keepassx
-    - kpcli
-    - pwgen
-    - openvpn
-    - network-manager-openvpn
-    - easy-rsa
-
-- name: "Installing expert network tools"
-  apt: >
-    name="{{item}}"
-    state=present
-  with_items:
-    - nmap
-    - wireshark
-    - manpages-dev
-    - vlan
-
-- name: "Installing system utils"
-  apt: >
-    name="{{item}}"
-    state=present
-  with_items:
-    - htop
-    - unrar
-
+- include: system.yml
+- include: desktop.yml
+- include: shopping.yml
+- include: development.yml
+- include: multimedia.yml
+- include: network.yml
+- include: office.yml
+- include: security.yml
diff --git a/tasks/multimedia.yml b/tasks/multimedia.yml
new file mode 100644
index 0000000..ef848b6
--- /dev/null
+++ b/tasks/multimedia.yml
@@ -0,0 +1,13 @@
+---
+- name: "Installing multimedia tools"
+  apt: >
+    name="{{item}}"
+    state=present
+  with_items:
+    - mpv
+    - mplayer
+    - vlc
+    - transcode
+    - ffmpeg
+
+
diff --git a/tasks/network.yml b/tasks/network.yml
new file mode 100644
index 0000000..0b9831e
--- /dev/null
+++ b/tasks/network.yml
@@ -0,0 +1,11 @@
+---
+- name: "Installing network tools"
+  apt: >
+    name="{{item}}"
+    state=present
+  with_items:
+    - nmap
+    - wireshark
+    - manpages-dev
+    - vlan
+
diff --git a/tasks/office.yml b/tasks/office.yml
new file mode 100644
index 0000000..9e4b0d8
--- /dev/null
+++ b/tasks/office.yml
@@ -0,0 +1,32 @@
+---
+- name: "Installing office/text utils"
+  apt: >
+    name="{{item}}"
+    state=present
+  with_items:
+    - leafpad
+    - libreoffice
+    - lyx
+    - ttf-mscorefonts-installer
+
+- name: "Installing office/image utils"
+  apt: >
+    name="{{item}}"
+    state=present
+  with_items:
+    - gimp
+    - geeqie
+    - gwenview
+    - inkscape
+
+- name: "Installing office/communication tools"
+  apt: >
+    name="{{item}}"
+    state=present
+  with_items:
+    - iceweasel
+    - icedove
+    - chromium
+    - psi-plus
+    - mutt
+
diff --git a/tasks/security.yml b/tasks/security.yml
new file mode 100644
index 0000000..6fdab76
--- /dev/null
+++ b/tasks/security.yml
@@ -0,0 +1,19 @@
+---
+- name: "Installing security tools"
+  apt: >
+    name="{{item}}"
+    state=present
+  with_items:
+    - encfs  # system & security
+    - cryptkeeper # desktop & security
+    - cryptmount # desktop & security
+    - cryptsetup # system & security
+    - cryptsetup-bin # system & security
+    - libpam-encfs # system & security
+    - keepassx # desktop & security
+    - kpcli # ?? & security
+    - pwgen # ?? & security
+    - openvpn # system or desktop and security
+    - network-manager-openvpn # desktop & security
+    - easy-rsa # system & security
+
diff --git a/tasks/shopping.yml b/tasks/shopping.yml
new file mode 100644
index 0000000..80f19b5
--- /dev/null
+++ b/tasks/shopping.yml
@@ -0,0 +1,8 @@
+---
+- name: "Installing shopping tools"
+  apt: >
+    name="{{item}}"
+    state=present
+  with_items:
+    - esniper
+
diff --git a/tasks/system.yml b/tasks/system.yml
new file mode 100644
index 0000000..9a96a5b
--- /dev/null
+++ b/tasks/system.yml
@@ -0,0 +1,11 @@
+---
+- name: "Installing system tools"
+  apt: >
+    name="{{item}}"
+    state=present
+  with_items:
+    - htop
+    - unrar
+    - lshw
+
+