diff --git a/screenrc b/Ansible/roles/dotfiles/files/screen/screenrc
similarity index 100%
rename from screenrc
rename to Ansible/roles/dotfiles/files/screen/screenrc
diff --git a/tmux.conf b/Ansible/roles/dotfiles/files/tmux/tmux.conf
similarity index 100%
rename from tmux.conf
rename to Ansible/roles/dotfiles/files/tmux/tmux.conf
diff --git a/Ansible/roles/dotfiles/tasks/main.yml b/Ansible/roles/dotfiles/tasks/main.yml
index d2b5810..f8ff950 100644
--- a/Ansible/roles/dotfiles/tasks/main.yml
+++ b/Ansible/roles/dotfiles/tasks/main.yml
@@ -1,9 +1,15 @@
 ---
 - name: ZSH
   ansible.builtin.include_tasks: zsh.yml
+  tags: dotfiles_zsh
 
 - name: Vim
   ansible.builtin.include_tasks: vim.yml
+  tags: dotfiles_vim
 
 - name: Git
   ansible.builtin.include_tasks: git.yml
+  tags: dotfiles_git
+
+- name: Shell utilities
+  ansible.builtin.include_tasks: shell_utilities.yml
diff --git a/Ansible/roles/dotfiles/tasks/shell_utilities.yml b/Ansible/roles/dotfiles/tasks/shell_utilities.yml
new file mode 100644
index 0000000..197a1ee
--- /dev/null
+++ b/Ansible/roles/dotfiles/tasks/shell_utilities.yml
@@ -0,0 +1,16 @@
+---
+- name: (tmux) Link tmux.conf
+  ansible.builtin.file:
+    path: ~/.tmux.conf
+    src: "{{ role_path }}/files/tmux/tmux.conf"
+    state: link
+    force: true
+  tags: dotfiles_tmux
+
+- name: (screen) Link screenrc
+  ansible.builtin.file:
+    path: ~/.screenrc
+    src: "{{ role_path }}/files/screen/screenrc"
+    state: link
+    force: true
+  tags: dotfiles_screen