diff --git a/branding/files/gitconfig b/branding/files/fsmpi/gitconfig
similarity index 100%
rename from branding/files/gitconfig
rename to branding/files/fsmpi/gitconfig
diff --git a/branding/tasks/main.yml b/branding/tasks/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..cf9183a8aee130403b398e49c5d38d69ee92482c
--- /dev/null
+++ b/branding/tasks/main.yml
@@ -0,0 +1,25 @@
+---
+# file: roles/common/tasks/shell.yml
+
+- name: ensure deployment of greeter
+  copy: src=fsmpi/motd dest=/etc/motd owner=root group=root mode=0644
+  tags:
+    - config
+    - shell
+    - fsmpi
+
+- name: ensure deployment of issue.net
+  copy: src=fsmpi/issue.net dest=/etc/issue.net owner=root group=root mode=0644
+  tags:
+    - config
+    - shell
+    - fsmpi
+
+- name: ensure deployment of a fancy gitconfig for root
+  copy: src=fsmpi/gitconfig dest=/root/.gitconfig owner=root group=root mode=0640
+  tags:
+    - config
+    - shell
+    - root
+    - fsmpi
+
diff --git a/branding/tasks/shell.yml b/branding/tasks/shell.yml
deleted file mode 100644
index c5f99c1d224d013ec1e9a95174582ee18f76dc5c..0000000000000000000000000000000000000000
--- a/branding/tasks/shell.yml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-# file: roles/common/tasks/shell.yml
-
-- name: ensure installation of basic shell commands
-  apt: state=latest name={{ item }} install_recommends=no
-  with_items:
-    - git
-    - vim
-    - vim-scripts
-    - zsh
-    - mtr-tiny
-    - whois
-  tags:
-    - packages
-    - shell
-
-- name: ensure the necessary terminfo is available
-  apt: name=ncurses-term state=latest
-  tags:
-    - packages
-    - shell
-
-- name: ensure zsh-grml is available
-  get_url: url=http://git.grml.org/f/grml-etc-core/etc/zsh/zshrc dest={{ item }} owner=root group=root mode=0644
-  with_items:
-    - /etc/zsh/zshrc
-    - /root/.zshrc
-  tags:
-    - config
-    - shell
-
-- name: ensure zsh-grml is the default
-  get_url: url=http://git.grml.org/f/grml-etc-core/etc/skel/.zshrc dest={{ item }} owner=root group=root mode=0640
-  with_items:
-    - /etc/skel/.zshrc
-  tags:
-    - config
-    - shell
-
-- name: ensure deployment of greeter
-  copy: src=fsmpi/motd dest=/etc/motd owner=root group=root mode=0644
-  tags:
-    - config
-    - shell
-    - fsmpi
-
-- name: ensure deployment of issue.net
-  copy: src=fsmpi/issue.net dest=/etc/issue.net owner=root group=root mode=0644
-  tags:
-    - config
-    - shell
-    - fsmpi
-
-- name: ensure deployment of a fancy bashrc for root
-  copy: src=root/bashrc dest=/root/.bashrc owner=root group=root mode=0640
-  tags:
-    - config
-    - shell
-    - root
-
-- name: ensure deployment of a fancy vimrc for root
-  copy: src=root/vimrc dest=/root/.vimrc owner=root group=root mode=0640
-  tags:
-    - config
-    - shell
-    - root
-
-- name: ensure deployment of a fancy gitconfig for root
-  copy: src=root/gitconfig dest=/root/.gitconfig owner=root group=root mode=0640
-  tags:
-    - config
-    - shell
-    - root
-
-- name: ensure a properly configured root account
-  user: name=root shell=/bin/zsh
-  tags:
-    - config
-    - shell
-    - root
-
-- name: ensure that pcspeaker remains silent
-  kernel_blacklist: name=pcspkr state=present
-  notify:
-    - rerun depmod
-    - update initramfs
-  tags:
-    - config
-    - shell
-    - modules