diff --git a/ansible-base/roles/configs/tasks/main.yml b/ansible-base/roles/configs/tasks/main.yml
deleted file mode 100644
index 892a53e..0000000
--- a/ansible-base/roles/configs/tasks/main.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-
- - name: Put htop config
-   template:
-     src: files/htoprc
-     dest: /etc/htoprc
- - name: Put mc config
-   template:
-     src: files/mcrc
-     dest: /etc/mc/mc.ini
- - name: Put vim config
-   template:
-     src: files/vimrc
-     dest: /etc/vimrc
diff --git a/ansible-base/roles/packages/tasks/main.yml b/ansible-base/roles/packages/tasks/main.yml
deleted file mode 100644
index cb32c13..0000000
--- a/ansible-base/roles/packages/tasks/main.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
- - name: Install mc
-   apt:
-     name: mc
-     state: present
- - name: Install htop
-   apt:
-     name: htop
-     state: present
- - name: Install vim
-   apt:
-     name: vim
-     state: present
diff --git a/ansible-base/playbook.yml b/ansible/ansible-base/playbook.yml
similarity index 100%
rename from ansible-base/playbook.yml
rename to ansible/ansible-base/playbook.yml
diff --git a/ansible-base/roles/configs/files/htoprc b/ansible/ansible-base/roles/configs/files/htoprc
similarity index 100%
rename from ansible-base/roles/configs/files/htoprc
rename to ansible/ansible-base/roles/configs/files/htoprc
diff --git a/ansible-base/roles/configs/files/mcrc b/ansible/ansible-base/roles/configs/files/mcrc
similarity index 100%
rename from ansible-base/roles/configs/files/mcrc
rename to ansible/ansible-base/roles/configs/files/mcrc
diff --git a/ansible/ansible-base/roles/configs/files/screenrc b/ansible/ansible-base/roles/configs/files/screenrc
new file mode 100644
index 0000000..062bef7
--- /dev/null
+++ b/ansible/ansible-base/roles/configs/files/screenrc
@@ -0,0 +1,11 @@
+startup_message off
+
+# Disable visual bell
+vbell off
+
+# Set scrollback buffer to 10000
+defscrollback 10000
+
+hardstatus alwayslastline
+hardstatus string '%{= kG}[ %{G}%H %{g} - %S ][%= %{= kw}%?%-Lw%?%{r}(%{W}%n*%f%t%?(%u)%?%{r})%{w}%?%+Lw%?%?%= %{g}][%{B} %d.%m %{W}%c %{g}]'
+
diff --git a/ansible-base/roles/configs/files/vimrc b/ansible/ansible-base/roles/configs/files/vimrc
similarity index 100%
rename from ansible-base/roles/configs/files/vimrc
rename to ansible/ansible-base/roles/configs/files/vimrc
diff --git a/ansible/ansible-base/roles/configs/tasks/main.yml b/ansible/ansible-base/roles/configs/tasks/main.yml
new file mode 100644
index 0000000..754f0dd
--- /dev/null
+++ b/ansible/ansible-base/roles/configs/tasks/main.yml
@@ -0,0 +1,32 @@
+---
+
+ - name: Put htop config
+   template:
+     src: files/htoprc
+     dest: /etc/htoprc
+ - name: Put mc config
+   template:
+     src: files/mcrc
+     dest: /etc/mc/mc.ini
+ - name: Put vim config
+   template:
+     src: files/vimrc
+     dest: /etc/vimrc
+ - name: Put screen config
+   template:
+     src: files/screenrc
+     dest: /etc/screenrc
+
+ - name: Check for OMB
+   stat:
+     path: "{{ ansible_user_dir }}/.oh-my-bash"
+   register: omb_flag
+
+ - debug:
+    msg: "OMB is not installed"
+   when: not omb_flag.stat.exists 
+
+# FIXME: logout from shell
+ - name: Install OMB
+   shell: bash -c "$(curl -fsSL https://raw.githubusercontent.com/ohmybash/oh-my-bash/master/tools/install.sh)"
+   when: not omb_flag.stat.exists
diff --git a/ansible/ansible-base/roles/packages/tasks/main.yml b/ansible/ansible-base/roles/packages/tasks/main.yml
new file mode 100644
index 0000000..c8b00ac
--- /dev/null
+++ b/ansible/ansible-base/roles/packages/tasks/main.yml
@@ -0,0 +1,11 @@
+---
+ - name: Install packages
+   apt:
+     name: "{{ item }}"
+     state: present
+   with_items:
+     - mc
+     - htop
+     - vim
+     - screen
+   when: ansible_facts['os_family'] == "Debian"
diff --git a/ansible-iptables-passthru/main.yml b/ansible/ansible-iptables-passthru/main.yml
similarity index 100%
rename from ansible-iptables-passthru/main.yml
rename to ansible/ansible-iptables-passthru/main.yml
diff --git a/drbd-ansible/global_common.conf b/ansible/drbd-ansible/global_common.conf
similarity index 100%
rename from drbd-ansible/global_common.conf
rename to ansible/drbd-ansible/global_common.conf
diff --git a/drbd-ansible/playme.yml b/ansible/drbd-ansible/playme.yml
similarity index 100%
rename from drbd-ansible/playme.yml
rename to ansible/drbd-ansible/playme.yml
diff --git a/gluster-ansible/bashrc b/ansible/gluster-ansible/bashrc
similarity index 100%
rename from gluster-ansible/bashrc
rename to ansible/gluster-ansible/bashrc
diff --git a/gluster-ansible/destroy.yml b/ansible/gluster-ansible/destroy.yml
similarity index 100%
rename from gluster-ansible/destroy.yml
rename to ansible/gluster-ansible/destroy.yml
diff --git a/gluster-ansible/hosts b/ansible/gluster-ansible/hosts
similarity index 100%
rename from gluster-ansible/hosts
rename to ansible/gluster-ansible/hosts
diff --git a/gluster-ansible/playme.yml b/ansible/gluster-ansible/playme.yml
similarity index 100%
rename from gluster-ansible/playme.yml
rename to ansible/gluster-ansible/playme.yml
diff --git a/gluster-ansible/sudoers b/ansible/gluster-ansible/sudoers
similarity index 100%
rename from gluster-ansible/sudoers
rename to ansible/gluster-ansible/sudoers