diff --git a/roles/home/tasks/dirs.yml b/roles/home/tasks/dirs.yml
new file mode 100644
index 0000000..b78aa89
--- /dev/null
+++ b/roles/home/tasks/dirs.yml
@@ -0,0 +1,17 @@
+---
+- name: Create user bin directory
+  file:
+    path: "{{ ansible_env.HOME }}/bin"
+    state: directory
+- name: Create user opt directory
+  file:
+    path: "{{ ansible_env.HOME }}/opt"
+    state: directory
+- name: Create systemd user directory
+  file:
+    path: "{{ ansible_env.HOME }}/.config/systemd/user"
+    state: directory
+- name: Create user applications directory
+  file:
+    path: "{{ ansible_env.HOME }}/.local/share/applications"
+    state: directory
diff --git a/roles/home/tasks/emacs.yml b/roles/home/tasks/emacs.yml
index 2f22a18..67b2720 100644
--- a/roles/home/tasks/emacs.yml
+++ b/roles/home/tasks/emacs.yml
@@ -10,10 +10,6 @@
     recurse: yes
     depth: 3
   register: emacs_service_files
-- name: Create systemd user directory
-  file:
-    path: "{{ ansible_env.HOME }}/.config/systemd/user"
-    state: directory
 - name: Create Emacs user service
   copy:
     src: '{{ item.path }}'
@@ -27,10 +23,6 @@
     daemon_reload: yes
     enabled: yes
     state: started
-- name: Create user applications directory
-  file:
-    path: "{{ ansible_env.HOME }}/.local/share/applications"
-    state: directory
 - name: Create Emacs client launcher
   copy:
     src: "{{ ansible_env.HOME }}/.emacs.d/emacs-client.desktop"
diff --git a/roles/home/tasks/main.yml b/roles/home/tasks/main.yml
index a3030b0..a6dbc97 100644
--- a/roles/home/tasks/main.yml
+++ b/roles/home/tasks/main.yml
@@ -1,4 +1,6 @@
 ---
+- include: dirs.yml
+
 - include: repos.yml
 - include: vim.yml
 - include: shell.yml