diff --git a/handlers/main.yml b/handlers/main.yml
index a2565ef..cfe5803 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,10 +1,35 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Depend go
-  ansible.builtin.include_tasks:
-    file: addpkg.yml
+- name: Ensure appimage path exists
+  become: "{{ ext_become }}"
+  listen: "Depend appimage"
+  ansible.builtin.file:
+    state: directory
+    mode: '0755'
+    path: "{{ path.appimage }}"
+
+- name: Ensure archive path exists
+  become: "{{ ext_become }}"
+  listen: "Depend archive"
+  ansible.builtin.file:
+    state: directory
+    mode: '0755'
+    path: "{{ path.archive }}"
+
+- name: Ensure go is present
   vars:
     pkg: go
+  listen: "Depend go"
+  ansible.builtin.include_tasks:
+    file: addpkg.yml
+
+- name: Ensure go path exists
+  become: "{{ ext_become }}"
+  listen: "Depend go"
+  ansible.builtin.file:
+    state: directory
+    mode: '0755'
+    path: "{{ path.go }}"
 
 - name: Depend flatpak
   vars:
@@ -18,24 +43,51 @@
   ansible.builtin.include_tasks:
     file: addpkg.yml
 
-- name: Depend pipx
+- name: Ensure pipx is installed
   vars:
     pkg: pipx
+  listen: "Depend pipx"
   ansible.builtin.include_tasks:
     file: addpkg.yml
 
-- name: Depend cargo
+- name: Ensure pipx path exists
+  become: "{{ ext_become }}"
+  listen: "Depend pipx"
+  ansible.builtin.file:
+    state: directory
+    mode: '0755'
+    path: "{{ path.pipx }}"
+
+- name: Ensure rust and cargo are installed
   vars:
     pkg: rust
+  listen: "Depend cargo"
   ansible.builtin.include_tasks:
     file: addpkg.yml
 
+- name: Ensure cargo path exists
+  become: "{{ ext_become }}"
+  listen: "Depend cargo"
+  ansible.builtin.file:
+    state: directory
+    mode: '0755'
+    path: "{{ path.cargo }}"
+
 - name: Depend rust
   vars:
     pkg: rust
+  listen: "Depend rust"
   ansible.builtin.include_tasks:
     file: addpkg.yml
 
+- name: Ensure cargo path exists
+  become: "{{ ext_become }}"
+  listen: "Depend rust"
+  ansible.builtin.file:
+    state: directory
+    mode: '0755'
+    path: "{{ path.cargo }}"
+
 - name: Depend zig
   vars:
     pkg: zig
diff --git a/tasks/linux.yml b/tasks/linux.yml
index 3e98074..43124a0 100644
--- a/tasks/linux.yml
+++ b/tasks/linux.yml
@@ -33,20 +33,11 @@
             remote: "{{ flatpak.remote | default('flathub') }}"
             state: present
 
-- name: Install appimages
+- name: Install pkg_appimage
   when:
     - pkg_appimage|length > 0
-  block:
-    - name: Ensure appimage path exists
-      become: "{{ ext_become }}"
-      ansible.builtin.file:
-        state: directory
-        mode: '0755'
-        path: "{{ path.appimage }}"
-
-    - name: Install pkg_appimage
-      loop: "{{ pkg_appimage }}"
-      loop_control:
-        loop_var: pkg
-      ansible.builtin.include_tasks:
-        file: appimage.yml
+  loop: "{{ pkg_appimage }}"
+  loop_control:
+    loop_var: pkg
+  ansible.builtin.include_tasks:
+    file: appimage.yml
diff --git a/tasks/main.yml b/tasks/main.yml
index 2b02432..1dd739d 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -37,6 +37,20 @@
   ansible.builtin.debug:
     var: packages
 
+- name: Ensure directory exists {{ path.prefix }}
+  become: "{{ ext_become }}"
+  ansible.builtin.file:
+    state: directory
+    mode: '0755'
+    path: "{{ path.prefix }}"
+
+- name: Ensure directory exists {{ path.bin }}
+  become: "{{ ext_become }}"
+  ansible.builtin.file:
+    state: directory
+    mode: '0755'
+    path: "{{ path.bin }}"
+
 - name: Read default package configuration
   ansible.builtin.include_vars:
     dir: pkgs
@@ -99,41 +113,23 @@
   ansible.builtin.include_tasks:
     file: "archive/{{ pkg }}.yml"
 
-- name: Cargo Packages installalation
+- name: Install cargo packages
   when:
     - pkg_cargo|length > 0
-  block:
-    - name: Ensure cargo path exists
-      become: "{{ ext_become }}"
-      ansible.builtin.file:
-        state: directory
-        mode: '0755'
-        path: "{{ path.cargo }}"
+  loop: "{{ pkg_cargo | unique }}"
+  loop_control:
+    loop_var: pkg
+  ansible.builtin.include_tasks:
+    file: cargo.yml
 
-    - name: Install cargo packages
-      loop: "{{ pkg_cargo | unique }}"
-      loop_control:
-        loop_var: pkg
-      ansible.builtin.include_tasks:
-        file: cargo.yml
-
-- name: Go Packages installalation
+- name: Install go packages
   when:
     - pkg_go|length > 0
-  block:
-    - name: Ensure go path exists
-      become: "{{ ext_become }}"
-      ansible.builtin.file:
-        state: directory
-        mode: '0755'
-        path: "{{ path.go }}"
-
-    - name: Install go packages
-      loop: "{{ pkg_go | unique }}"
-      loop_control:
-        loop_var: pkg
-      ansible.builtin.include_tasks:
-        file: go.yml
+  loop: "{{ pkg_go | unique }}"
+  loop_control:
+    loop_var: pkg
+  ansible.builtin.include_tasks:
+    file: go.yml
 
 - name: Install local npm packages
   when:
@@ -144,23 +140,14 @@
   ansible.builtin.include_tasks:
     file: npm.yml
 
-- name: PipX Packages installalation
+- name: Install python pipx packages for user
   when:
     - pkg_pipx|length > 0
-  block:
-    - name: Ensure pipx path exists
-      become: "{{ ext_become }}"
-      ansible.builtin.file:
-        state: directory
-        mode: '0755'
-        path: "{{ path.pipx }}"
-
-    - name: Install python pipx packages for user
-      loop: "{{ pkg_pipx | unique }}"
-      loop_control:
-        loop_var: pkg
-      ansible.builtin.include_tasks:
-        file: pipx.yml
+  loop: "{{ pkg_pipx | unique }}"
+  loop_control:
+    loop_var: pkg
+  ansible.builtin.include_tasks:
+    file: pipx.yml
 
 - name: Build and install source packages
   when: