diff --git a/alacritty.yml b/misc/alacritty.yml
similarity index 100%
rename from alacritty.yml
rename to misc/alacritty.yml
diff --git a/lazydocker.yml b/misc/lazydocker.yml
similarity index 100%
rename from lazydocker.yml
rename to misc/lazydocker.yml
diff --git a/lazygit.yml b/misc/lazygit.yml
similarity index 100%
rename from lazygit.yml
rename to misc/lazygit.yml
diff --git a/rectangle.json b/misc/rectangle.json
similarity index 100%
rename from rectangle.json
rename to misc/rectangle.json
diff --git a/tmux.conf b/misc/tmux.conf
similarity index 100%
rename from tmux.conf
rename to misc/tmux.conf
diff --git a/playbooks/main.yml b/playbooks/main.yml
index 20a145b..05f96c4 100644
--- a/playbooks/main.yml
+++ b/playbooks/main.yml
@@ -9,7 +9,7 @@
     - role: './roles/zsh'
     - role: './roles/tmux'
     - role: './roles/git'
-    - role: './roles/nvim'
+    - role: './roles/vim'
     - role: './roles/vscode'
     - role: './roles/obsidian'
-    - role: './roles/alacritty'
+    - role: './roles/misc'
diff --git a/playbooks/roles/alacritty/tasks/main.yml b/playbooks/roles/alacritty/tasks/main.yml
deleted file mode 100644
index 11a780f..0000000
--- a/playbooks/roles/alacritty/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-- name: link-alacritty-config
-  ansible.builtin.file:
-    src: "{{ dotfiles_dir }}/alacritty.yml"
-    dest: "{{ home_dir }}/.alacritty.yml"
-    state: link
diff --git a/playbooks/roles/lazygit/tasks/main.yml b/playbooks/roles/lazygit/tasks/main.yml
deleted file mode 100644
index b909234..0000000
--- a/playbooks/roles/lazygit/tasks/main.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-- name: link-lazygit-config
-  ansible.builtin.file:
-    src: "{{ dotfiles_dir }}/lazygit.yml"
-    dest: "{{ home_dir }}/Library/Application Support/lazygit/config.yml"
-    state: link
-    force: true
-
diff --git a/playbooks/roles/misc/tasks/main.yml b/playbooks/roles/misc/tasks/main.yml
new file mode 100644
index 0000000..73a2e09
--- /dev/null
+++ b/playbooks/roles/misc/tasks/main.yml
@@ -0,0 +1,21 @@
+- name: link-lazygit-config
+  ansible.builtin.file:
+    src: "{{ dotfiles_dir }}/misc/lazygit.yml"
+    dest: "{{ home_dir }}/Library/Application Support/lazygit/config.yml"
+    state: link
+    force: true
+
+- name: link-lazydocker-config
+  ansible.builtin.file:
+    src: "{{ dotfiles_dir }}/misc/lazydocker.yml"
+    dest: "{{ home_dir }}/Library/Application Support/lazydocker/config.yml"
+    state: link
+    force: true
+
+- name: link-alacritty-config
+  ansible.builtin.file:
+    src: "{{ dotfiles_dir }}/misc/alacritty.yml"
+    dest: "{{ home_dir }}/.alacritty.yml"
+    state: link
+
+# TODO: rectangle?!
diff --git a/playbooks/roles/tmux/tasks/main.yml b/playbooks/roles/tmux/tasks/main.yml
index 6e75b63..ccb3b01 100644
--- a/playbooks/roles/tmux/tasks/main.yml
+++ b/playbooks/roles/tmux/tasks/main.yml
@@ -1,6 +1,6 @@
 - name: link-tmux-conf
   ansible.builtin.file:
-    src: "{{ dotfiles_dir }}/tmux.conf"
+    src: "{{ dotfiles_dir }}/misc/tmux.conf"
     dest: "{{ home_dir }}/.tmux.conf"
     state: link
     force: true
diff --git a/playbooks/roles/nvim/tasks/main.yml b/playbooks/roles/vim/tasks/main.yml
similarity index 81%
rename from playbooks/roles/nvim/tasks/main.yml
rename to playbooks/roles/vim/tasks/main.yml
index 4042f8a..d9d0dc7 100644
--- a/playbooks/roles/nvim/tasks/main.yml
+++ b/playbooks/roles/vim/tasks/main.yml
@@ -7,13 +7,13 @@
 
 - name: link-astronvim-user-config
   ansible.builtin.file:
-    src: "{{ dotfiles_dir }}/astronvim/init.lua"
+    src: "{{ dotfiles_dir }}/vim/astronvim/init.lua"
     dest: "{{ home_dir }}/.config/nvim/lua/user/init.lua"
     state: link
     force: true
 
 - name: link-vimrc
   ansible.builtin.file:
-    src: "{{ dotfiles_dir }}/vimrc"
+    src: "{{ dotfiles_dir }}/vim/vimrc"
     dest: "{{ home_dir }}/.vimrc"
     state: link
diff --git a/playbooks/roles/zsh/tasks/main.yml b/playbooks/roles/zsh/tasks/main.yml
index f5045b6..cbd270a 100644
--- a/playbooks/roles/zsh/tasks/main.yml
+++ b/playbooks/roles/zsh/tasks/main.yml
@@ -1,12 +1,12 @@
 - name: link-zshrc
   ansible.builtin.file:
-    src: "{{ dotfiles_dir }}/zshrc"
+    src: "{{ dotfiles_dir }}/zsh/zshrc"
     dest: "{{ home_dir }}/.zshrc"
     state: link
 
 - name: link-zshenv
   ansible.builtin.file:
-    src: "{{ dotfiles_dir }}/zshenv"
+    src: "{{ dotfiles_dir }}/zsh/zshenv"
     dest: "{{ home_dir }}/.zshenv"
     state: link
 
diff --git a/astronvim/init.lua b/vim/astronvim/init.lua
similarity index 100%
rename from astronvim/init.lua
rename to vim/astronvim/init.lua
diff --git a/vimrc b/vim/vimrc
similarity index 100%
rename from vimrc
rename to vim/vimrc
diff --git a/zshenv b/zsh/zshenv
similarity index 100%
rename from zshenv
rename to zsh/zshenv
diff --git a/zshrc b/zsh/zshrc
similarity index 100%
rename from zshrc
rename to zsh/zshrc