diff --git a/.gitmodules b/.gitmodules
index 59fa21c0..c706de2f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,159 +1,159 @@
 [submodule "tmux/.tmux/bundle/tmux-yank"]
-	path = tmux/.tmux/bundle/tmux-yank
+	path = tmux/.tmux/pack/bundle/start/tmux-yank
 	url = https://github.com/tmux-plugins/tmux-yank
 [submodule "tmux/.tmux/bundle/tmux-sensible"]
-	path = tmux/.tmux/bundle/tmux-sensible
+	path = tmux/.tmux/pack/bundle/start/tmux-sensible
 	url = https://github.com/tmux-plugins/tmux-sensible
 [submodule "tmux/.tmux/bundle/tmux-copycat"]
-	path = tmux/.tmux/bundle/tmux-copycat
+	path = tmux/.tmux/pack/bundle/start/tmux-copycat
 	url = https://github.com/tmux-plugins/tmux-copycat
 [submodule "tmux/.tmux/bundle/tmux-continuum"]
-	path = tmux/.tmux/bundle/tmux-continuum
+	path = tmux/.tmux/pack/bundle/start/tmux-continuum
 	url = https://github.com/tmux-plugins/tmux-continuum
 [submodule "tmux/.tmux/bundle/vim-tmux-navigator"]
-	path = tmux/.tmux/bundle/vim-tmux-navigator
+	path = tmux/.tmux/pack/bundle/start/vim-tmux-navigator
 	url = https://github.com/christoomey/vim-tmux-navigator
 [submodule "tmux/.tmux/bundle/tmux-resurrect"]
-	path = tmux/.tmux/bundle/tmux-resurrect
+	path = tmux/.tmux/pack/bundle/start/tmux-resurrect
 	url = https://github.com/tmux-plugins/tmux-resurrect
 [submodule "tmux/.tmux/bundle/tmux-open"]
-	path = tmux/.tmux/bundle/tmux-open
+	path = tmux/.tmux/pack/bundle/start/tmux-open
 	url = https://github.com/tmux-plugins/tmux-open
 [submodule "vim/.vim/bundle/vim-snippets"]
-	path = vim/.vim/pack/vendor/start/vim-snippets
+	path = vim/.vim/pack/bundle/start/vim-snippets
 	url = https://github.com/honza/vim-snippets
 [submodule "vim/.vim/bundle/vim-rooter"]
-	path = vim/.vim/pack/vendor/start/vim-rooter
+	path = vim/.vim/pack/bundle/start/vim-rooter
 	url = https://github.com/airblade/vim-rooter
 [submodule "vim/.vim/bundle/base16-vim"]
-	path = vim/.vim/pack/vendor/start/base16-vim
+	path = vim/.vim/pack/bundle/start/base16-vim
 	url = https://github.com/chriskempson/base16-vim
 [submodule "vim/.vim/bundle/vim-obsession"]
-	path = vim/.vim/pack/vendor/start/vim-obsession
+	path = vim/.vim/pack/bundle/start/vim-obsession
 	url = https://github.com/tpope/vim-obsession
 [submodule "vim/.vim/bundle/vim-gutentags"]
-	path = vim/.vim/pack/vendor/start/vim-gutentags
+	path = vim/.vim/pack/bundle/start/vim-gutentags
 	url = https://github.com/ludovicchabant/vim-gutentags
 [submodule "vim/.vim/bundle/vimwiki"]
-	path = vim/.vim/pack/vendor/start/vimwiki
+	path = vim/.vim/pack/bundle/start/vimwiki
 	url = https://github.com/vimwiki/vimwiki
 [submodule "vim/.vim/bundle/fzf.vim"]
-	path = vim/.vim/pack/vendor/start/fzf.vim
+	path = vim/.vim/pack/bundle/start/fzf.vim
 	url = https://github.com/junegunn/fzf.vim
 [submodule "vim/.vim/bundle/vim-commentary"]
-	path = vim/.vim/pack/vendor/start/vim-commentary
+	path = vim/.vim/pack/bundle/start/vim-commentary
 	url = https://github.com/tpope/vim-commentary
 [submodule "vim/.vim/bundle/vim-surround"]
-	path = vim/.vim/pack/vendor/start/vim-surround
+	path = vim/.vim/pack/bundle/start/vim-surround
 	url = https://github.com/tpope/vim-surround
 [submodule "vim/.vim/bundle/vim-dirvish"]
-	path = vim/.vim/pack/vendor/start/vim-dirvish
+	path = vim/.vim/pack/bundle/start/vim-dirvish
     url = https://github.com/justinmk/vim-dirvish
 [submodule "vim/.vim/bundle/vim-unimpaired"]
-	path = vim/.vim/pack/vendor/start/vim-unimpaired
+	path = vim/.vim/pack/bundle/start/vim-unimpaired
     url = https://github.com/tpope/vim-unimpaired
 [submodule "vim/.vim/bundle/vim-polyglot"]
-	path = vim/.vim/pack/vendor/start/vim-polyglot
+	path = vim/.vim/pack/bundle/start/vim-polyglot
 	url = https://github.com/sheerun/vim-polyglot
 [submodule "vim/.vim/bundle/vim-logreview"]
-	path = vim/.vim/pack/vendor/start/vim-logreview
+	path = vim/.vim/pack/bundle/start/vim-logreview
 	url = https://github.com/andreshazard/vim-logreview
 [submodule "vim/.vim/bundle/committia.vim"]
-	path = vim/.vim/pack/vendor/start/committia.vim
+	path = vim/.vim/pack/bundle/start/committia.vim
 	url = https://github.com/rhysd/committia.vim
 [submodule "vim/.vim/bundle/editorconfig-vim"]
-	path = vim/.vim/pack/vendor/start/editorconfig-vim
+	path = vim/.vim/pack/bundle/start/editorconfig-vim
 	url = https://github.com/editorconfig/editorconfig-vim
 [submodule "vim/.vim/bundle/codi.vim"]
-	path = vim/.vim/pack/vendor/start/codi.vim
+	path = vim/.vim/pack/bundle/start/codi.vim
 	url = https://github.com/metakirby5/codi.vim
 [submodule "zsh/.fzf"]
 	path = zsh/.fzf
 	url = https://github.com/junegunn/fzf
 [submodule "zsh/.zsh/bundle/base16-shell"]
-	path = zsh/.zsh/bundle/base16-shell
+	path = zsh/.zsh/pack/bundle/start/base16-shell
 	url = https://github.com/chriskempson/base16-shell
 [submodule "zsh/.zsh/bundle/alias-tips"]
-	path = zsh/.zsh/bundle/alias-tips
+	path = zsh/.zsh/pack/bundle/start/alias-tips
 	url = https://github.com/djui/alias-tips
 [submodule "tmux/.tmux/bundle/tmux-sessionist"]
-	path = tmux/.tmux/bundle/tmux-sessionist
+	path = tmux/.tmux/pack/bundle/start/tmux-sessionist
 	url = https://github.com/tmux-plugins/tmux-sessionist
 [submodule "mutt/.mutt/bundle/mutt-colors-solarized"]
 	path = mutt/.mutt/bundle/mutt-colors-solarized
 	url = https://github.com/altercation/mutt-colors-solarized
 [submodule "zsh/.zsh/bundle/zsh-kubernetes"]
-	path = zsh/.zsh/bundle/zsh-kubernetes
+	path = zsh/.zsh/pack/bundle/start/zsh-kubernetes
 	url = https://github.com/Dbz/zsh-kubernetes
 [submodule "vim/.vim/bundle/vim-which-key"]
-	path = vim/.vim/pack/vendor/start/vim-which-key
+	path = vim/.vim/pack/bundle/start/vim-which-key
 	url = https://github.com/liuchengxu/vim-which-key
 [submodule "vim/.vim/bundle/vim-rhubarb"]
-	path = vim/.vim/pack/vendor/start/vim-rhubarb
+	path = vim/.vim/pack/bundle/start/vim-rhubarb
 	url = https://github.com/tpope/vim-rhubarb
 [submodule "zsh/.zsh/bundle/utility"]
-	path = zsh/.zsh/bundle/utility
+	path = zsh/.zsh/pack/bundle/start/utility
 	url = https://github.com/zimfw/utility
 [submodule "zsh/.zsh/bundle/archive"]
-	path = zsh/.zsh/bundle/archive
+	path = zsh/.zsh/pack/bundle/start/archive
 	url = https://github.com/zimfw/archive
 [submodule "zsh/.zsh/bundle/zsh-autosuggestions"]
-	path = zsh/.zsh/bundle/zsh-autosuggestions
+	path = zsh/.zsh/pack/bundle/start/zsh-autosuggestions
 	url = https://github.com/zsh-users/zsh-autosuggestions
 [submodule "zsh/.zsh/bundle/git"]
-	path = zsh/.zsh/bundle/git
+	path = zsh/.zsh/pack/bundle/start/git
 	url = https://github.com/zimfw/git
 [submodule "zsh/.zsh/bundle/zsh-completions"]
-	path = zsh/.zsh/bundle/zsh-completions
+	path = zsh/.zsh/pack/bundle/start/zsh-completions
 	url = https://github.com/zsh-users/zsh-completions
 [submodule "zsh/.zsh/bundle/completion"]
-	path = zsh/.zsh/bundle/completion
+	path = zsh/.zsh/pack/bundle/start/completion
 	url = https://github.com/zimfw/completion
 [submodule "zsh/.zsh/bundle/input"]
-	path = zsh/.zsh/bundle/input
+	path = zsh/.zsh/pack/bundle/start/input
 	url = https://github.com/zimfw/input
 [submodule "zsh/.zsh/bundle/termtitle"]
-	path = zsh/.zsh/bundle/termtitle
+	path = zsh/.zsh/pack/bundle/start/termtitle
 	url = https://github.com/zimfw/termtitle
 [submodule "zsh/.zsh/bundle/ssh"]
-	path = zsh/.zsh/bundle/ssh
+	path = zsh/.zsh/pack/bundle/start/ssh
 	url = https://github.com/zimfw/ssh
 [submodule "zsh/.zsh/bundle/pacman"]
-	path = zsh/.zsh/bundle/pacman
+	path = zsh/.zsh/pack/bundle/start/pacman
 	url = https://github.com/zimfw/pacman
 [submodule "zsh/.zsh/bundle/git-info"]
-	path = zsh/.zsh/bundle/git-info
+	path = zsh/.zsh/pack/bundle/start/git-info
 	url = https://github.com/zimfw/git-info
 [submodule "zsh/.zsh/bundle/pure"]
-	path = zsh/.zsh/bundle/pure
+	path = zsh/.zsh/pack/bundle/start/pure
 	url = https://github.com/sindresorhus/pure
 	branch = main
 [submodule "zsh/.zsh/bundle/fasd"]
-	path = zsh/.zsh/bundle/fasd
+	path = zsh/.zsh/pack/bundle/start/fasd
 	url = https://github.com/clvv/fasd
 [submodule "zsh/.zsh/bundle/imgur.sh"]
-	path = zsh/.zsh/bundle/imgur.sh
+	path = zsh/.zsh/pack/bundle/start/imgur.sh
 	url = https://github.com/tremby/imgur.sh
 	branch = main
 [submodule "zsh/.zsh/bundle/environment"]
-	path = zsh/.zsh/bundle/environment
+	path = zsh/.zsh/pack/bundle/start/environment
 	url = https://github.com/zimfw/environment
 [submodule "zsh/.zsh/bundle/zsh-history-substring-search"]
-	path = zsh/.zsh/bundle/zsh-history-substring-search
+	path = zsh/.zsh/pack/bundle/start/zsh-history-substring-search
 	url = https://github.com/zsh-users/zsh-history-substring-search
 [submodule "vim/.vim/bundle/vim-fugitive"]
-	path = vim/.vim/pack/vendor/start/vim-fugitive
+	path = vim/.vim/pack/bundle/start/vim-fugitive
 	url = https://github.com/tpope/vim-fugitive
 [submodule "vim/.vim/bundle/rainbow"]
-	path = vim/.vim/pack/vendor/start/rainbow
+	path = vim/.vim/pack/bundle/start/rainbow
 	url = https://github.com/luochen1990/rainbow
 [submodule "vim/.vim/bundle/coc.nvim"]
-	path = vim/.vim/pack/vendor/start/coc.nvim
+	path = vim/.vim/pack/bundle/start/coc.nvim
 	url = https://github.com/neoclide/coc.nvim
 	branch = release
 [submodule "zsh/.zsh/bundle/fzf-tab"]
-	path = zsh/.zsh/bundle/fzf-tab
+	path = zsh/.zsh/pack/bundle/start/fzf-tab
 	url = https://github.com/Aloxaf/fzf-tab
 [submodule "vim/.vim/bundle/codeium.vim"]
-	path = vim/.vim/pack/vendor/start/codeium.vim
+	path = vim/.vim/pack/bundle/start/codeium.vim
 	url = https://github.com/Exafunction/codeium.vim
diff --git a/README.md b/README.md
index 0ae94b34..bfe4e68c 100644
--- a/README.md
+++ b/README.md
@@ -52,18 +52,18 @@ To add your own Vim, Tmux or Zsh plugin you can just clone it to proper
 
     # Add SuperTab vim plugin
     git clone git://github.com/ervandew/supertab \
-      ~/.vim/bundle/local/supertab
+      ~/.vim/pack/local/start/supertab
 
     # Add Tmux sessionist plugin
     git clone git://github.com/tmux-plugins/tmux-sessionist \
-      ~/.tmux/bundle/local/tmux-sessionist
+      ~/.tmux/pack/local/start/tmux-sessionist
 
     # Add zsh-autoenv zsh plugin
     git clone git://github.com/Tarrasch/zsh-autoenv \
-      ~/.zsh/bundle/local/zsh-autoenv
+      ~/.zsh/pack/local/start/zsh-autoenv
 
 ## Included stuff
 
-- [/zsh/.zsh/bundle](/zsh/.zsh/bundle) ZSH plugins
-- [/tmux/.tmux/bundle](/tmux/.tmux/bundle) TMUX plugins
-- [/vim/.vim/bundle](/vim/.vim/bundle) VIM plugins
+- [/zsh/.zsh/pack/bundle/start](/zsh/.zsh/pack/bundle/start) ZSH plugins
+- [/tmux/.tmux/pack/bundle/start](/tmux/.tmux/pack/bundle/start) TMUX plugins
+- [/vim/.vim/pack/bundle/start](/vim/.vim/pack/bundle/start) VIM plugins
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 91d8114e..d28fb22d 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -99,7 +99,7 @@ set -g @continuum-restore 'on'
 set -g @continuum-save-interval '10'
 
 # Pathogen-like loader for plugins
-run-shell 'find -L ~/.tmux/bundle -type f -name "*.tmux" | sort | while read f; do bash $f >/dev/null 2>&1; done'
+run-shell 'find -L ~/.tmux/pack/*/start -type f -name "*.tmux" | sort | while read f; do bash $f >/dev/null 2>&1; done'
 
 # }}}
 
diff --git a/tmux/.tmux/bundle/tmux-continuum b/tmux/.tmux/pack/bundle/start/tmux-continuum
similarity index 100%
rename from tmux/.tmux/bundle/tmux-continuum
rename to tmux/.tmux/pack/bundle/start/tmux-continuum
diff --git a/tmux/.tmux/bundle/tmux-copycat b/tmux/.tmux/pack/bundle/start/tmux-copycat
similarity index 100%
rename from tmux/.tmux/bundle/tmux-copycat
rename to tmux/.tmux/pack/bundle/start/tmux-copycat
diff --git a/tmux/.tmux/bundle/tmux-open b/tmux/.tmux/pack/bundle/start/tmux-open
similarity index 100%
rename from tmux/.tmux/bundle/tmux-open
rename to tmux/.tmux/pack/bundle/start/tmux-open
diff --git a/tmux/.tmux/bundle/tmux-resurrect b/tmux/.tmux/pack/bundle/start/tmux-resurrect
similarity index 100%
rename from tmux/.tmux/bundle/tmux-resurrect
rename to tmux/.tmux/pack/bundle/start/tmux-resurrect
diff --git a/tmux/.tmux/bundle/tmux-sensible b/tmux/.tmux/pack/bundle/start/tmux-sensible
similarity index 100%
rename from tmux/.tmux/bundle/tmux-sensible
rename to tmux/.tmux/pack/bundle/start/tmux-sensible
diff --git a/tmux/.tmux/bundle/tmux-sessionist b/tmux/.tmux/pack/bundle/start/tmux-sessionist
similarity index 100%
rename from tmux/.tmux/bundle/tmux-sessionist
rename to tmux/.tmux/pack/bundle/start/tmux-sessionist
diff --git a/tmux/.tmux/bundle/tmux-yank b/tmux/.tmux/pack/bundle/start/tmux-yank
similarity index 100%
rename from tmux/.tmux/bundle/tmux-yank
rename to tmux/.tmux/pack/bundle/start/tmux-yank
diff --git a/tmux/.tmux/bundle/vim-tmux-navigator b/tmux/.tmux/pack/bundle/start/vim-tmux-navigator
similarity index 100%
rename from tmux/.tmux/bundle/vim-tmux-navigator
rename to tmux/.tmux/pack/bundle/start/vim-tmux-navigator
diff --git a/vim/.vim/pack/vendor/start/base16-vim b/vim/.vim/pack/bundle/start/base16-vim
similarity index 100%
rename from vim/.vim/pack/vendor/start/base16-vim
rename to vim/.vim/pack/bundle/start/base16-vim
diff --git a/vim/.vim/pack/vendor/start/coc.nvim b/vim/.vim/pack/bundle/start/coc.nvim
similarity index 100%
rename from vim/.vim/pack/vendor/start/coc.nvim
rename to vim/.vim/pack/bundle/start/coc.nvim
diff --git a/vim/.vim/pack/vendor/start/codeium.vim b/vim/.vim/pack/bundle/start/codeium.vim
similarity index 100%
rename from vim/.vim/pack/vendor/start/codeium.vim
rename to vim/.vim/pack/bundle/start/codeium.vim
diff --git a/vim/.vim/pack/vendor/start/codi.vim b/vim/.vim/pack/bundle/start/codi.vim
similarity index 100%
rename from vim/.vim/pack/vendor/start/codi.vim
rename to vim/.vim/pack/bundle/start/codi.vim
diff --git a/vim/.vim/pack/vendor/start/committia.vim b/vim/.vim/pack/bundle/start/committia.vim
similarity index 100%
rename from vim/.vim/pack/vendor/start/committia.vim
rename to vim/.vim/pack/bundle/start/committia.vim
diff --git a/vim/.vim/pack/vendor/start/editorconfig-vim b/vim/.vim/pack/bundle/start/editorconfig-vim
similarity index 100%
rename from vim/.vim/pack/vendor/start/editorconfig-vim
rename to vim/.vim/pack/bundle/start/editorconfig-vim
diff --git a/vim/.vim/pack/vendor/start/fzf b/vim/.vim/pack/bundle/start/fzf
similarity index 100%
rename from vim/.vim/pack/vendor/start/fzf
rename to vim/.vim/pack/bundle/start/fzf
diff --git a/vim/.vim/pack/vendor/start/fzf.vim b/vim/.vim/pack/bundle/start/fzf.vim
similarity index 100%
rename from vim/.vim/pack/vendor/start/fzf.vim
rename to vim/.vim/pack/bundle/start/fzf.vim
diff --git a/vim/.vim/pack/vendor/start/rainbow b/vim/.vim/pack/bundle/start/rainbow
similarity index 100%
rename from vim/.vim/pack/vendor/start/rainbow
rename to vim/.vim/pack/bundle/start/rainbow
diff --git a/vim/.vim/pack/vendor/start/vim-commentary b/vim/.vim/pack/bundle/start/vim-commentary
similarity index 100%
rename from vim/.vim/pack/vendor/start/vim-commentary
rename to vim/.vim/pack/bundle/start/vim-commentary
diff --git a/vim/.vim/pack/vendor/start/vim-dirvish b/vim/.vim/pack/bundle/start/vim-dirvish
similarity index 100%
rename from vim/.vim/pack/vendor/start/vim-dirvish
rename to vim/.vim/pack/bundle/start/vim-dirvish
diff --git a/vim/.vim/pack/vendor/start/vim-fugitive b/vim/.vim/pack/bundle/start/vim-fugitive
similarity index 100%
rename from vim/.vim/pack/vendor/start/vim-fugitive
rename to vim/.vim/pack/bundle/start/vim-fugitive
diff --git a/vim/.vim/pack/vendor/start/vim-gutentags b/vim/.vim/pack/bundle/start/vim-gutentags
similarity index 100%
rename from vim/.vim/pack/vendor/start/vim-gutentags
rename to vim/.vim/pack/bundle/start/vim-gutentags
diff --git a/vim/.vim/pack/vendor/start/vim-logreview b/vim/.vim/pack/bundle/start/vim-logreview
similarity index 100%
rename from vim/.vim/pack/vendor/start/vim-logreview
rename to vim/.vim/pack/bundle/start/vim-logreview
diff --git a/vim/.vim/pack/vendor/start/vim-obsession b/vim/.vim/pack/bundle/start/vim-obsession
similarity index 100%
rename from vim/.vim/pack/vendor/start/vim-obsession
rename to vim/.vim/pack/bundle/start/vim-obsession
diff --git a/vim/.vim/pack/vendor/start/vim-polyglot b/vim/.vim/pack/bundle/start/vim-polyglot
similarity index 100%
rename from vim/.vim/pack/vendor/start/vim-polyglot
rename to vim/.vim/pack/bundle/start/vim-polyglot
diff --git a/vim/.vim/pack/vendor/start/vim-rhubarb b/vim/.vim/pack/bundle/start/vim-rhubarb
similarity index 100%
rename from vim/.vim/pack/vendor/start/vim-rhubarb
rename to vim/.vim/pack/bundle/start/vim-rhubarb
diff --git a/vim/.vim/pack/vendor/start/vim-rooter b/vim/.vim/pack/bundle/start/vim-rooter
similarity index 100%
rename from vim/.vim/pack/vendor/start/vim-rooter
rename to vim/.vim/pack/bundle/start/vim-rooter
diff --git a/vim/.vim/pack/vendor/start/vim-snippets b/vim/.vim/pack/bundle/start/vim-snippets
similarity index 100%
rename from vim/.vim/pack/vendor/start/vim-snippets
rename to vim/.vim/pack/bundle/start/vim-snippets
diff --git a/vim/.vim/pack/vendor/start/vim-surround b/vim/.vim/pack/bundle/start/vim-surround
similarity index 100%
rename from vim/.vim/pack/vendor/start/vim-surround
rename to vim/.vim/pack/bundle/start/vim-surround
diff --git a/vim/.vim/pack/vendor/start/vim-tmux-navigator b/vim/.vim/pack/bundle/start/vim-tmux-navigator
similarity index 100%
rename from vim/.vim/pack/vendor/start/vim-tmux-navigator
rename to vim/.vim/pack/bundle/start/vim-tmux-navigator
diff --git a/vim/.vim/pack/vendor/start/vim-unimpaired b/vim/.vim/pack/bundle/start/vim-unimpaired
similarity index 100%
rename from vim/.vim/pack/vendor/start/vim-unimpaired
rename to vim/.vim/pack/bundle/start/vim-unimpaired
diff --git a/vim/.vim/pack/vendor/start/vim-which-key b/vim/.vim/pack/bundle/start/vim-which-key
similarity index 100%
rename from vim/.vim/pack/vendor/start/vim-which-key
rename to vim/.vim/pack/bundle/start/vim-which-key
diff --git a/vim/.vim/pack/vendor/start/vimwiki b/vim/.vim/pack/bundle/start/vimwiki
similarity index 100%
rename from vim/.vim/pack/vendor/start/vimwiki
rename to vim/.vim/pack/bundle/start/vimwiki
diff --git a/zsh/.zsh/bundle/alias-tips b/zsh/.zsh/pack/bundle/start/alias-tips
similarity index 100%
rename from zsh/.zsh/bundle/alias-tips
rename to zsh/.zsh/pack/bundle/start/alias-tips
diff --git a/zsh/.zsh/bundle/archive b/zsh/.zsh/pack/bundle/start/archive
similarity index 100%
rename from zsh/.zsh/bundle/archive
rename to zsh/.zsh/pack/bundle/start/archive
diff --git a/zsh/.zsh/bundle/base16-shell b/zsh/.zsh/pack/bundle/start/base16-shell
similarity index 100%
rename from zsh/.zsh/bundle/base16-shell
rename to zsh/.zsh/pack/bundle/start/base16-shell
diff --git a/zsh/.zsh/bundle/cdls.plugin.zsh b/zsh/.zsh/pack/bundle/start/cdls.plugin.zsh
similarity index 100%
rename from zsh/.zsh/bundle/cdls.plugin.zsh
rename to zsh/.zsh/pack/bundle/start/cdls.plugin.zsh
diff --git a/zsh/.zsh/bundle/codi.plugin.zsh b/zsh/.zsh/pack/bundle/start/codi.plugin.zsh
similarity index 100%
rename from zsh/.zsh/bundle/codi.plugin.zsh
rename to zsh/.zsh/pack/bundle/start/codi.plugin.zsh
diff --git a/zsh/.zsh/bundle/completion b/zsh/.zsh/pack/bundle/start/completion
similarity index 100%
rename from zsh/.zsh/bundle/completion
rename to zsh/.zsh/pack/bundle/start/completion
diff --git a/zsh/.zsh/bundle/environment b/zsh/.zsh/pack/bundle/start/environment
similarity index 100%
rename from zsh/.zsh/bundle/environment
rename to zsh/.zsh/pack/bundle/start/environment
diff --git a/zsh/.zsh/bundle/fasd b/zsh/.zsh/pack/bundle/start/fasd
similarity index 100%
rename from zsh/.zsh/bundle/fasd
rename to zsh/.zsh/pack/bundle/start/fasd
diff --git a/zsh/.zsh/bundle/fasd.plugin.zsh b/zsh/.zsh/pack/bundle/start/fasd.plugin.zsh
similarity index 100%
rename from zsh/.zsh/bundle/fasd.plugin.zsh
rename to zsh/.zsh/pack/bundle/start/fasd.plugin.zsh
diff --git a/zsh/.zsh/bundle/fzf-tab b/zsh/.zsh/pack/bundle/start/fzf-tab
similarity index 100%
rename from zsh/.zsh/bundle/fzf-tab
rename to zsh/.zsh/pack/bundle/start/fzf-tab
diff --git a/zsh/.zsh/bundle/git b/zsh/.zsh/pack/bundle/start/git
similarity index 100%
rename from zsh/.zsh/bundle/git
rename to zsh/.zsh/pack/bundle/start/git
diff --git a/zsh/.zsh/bundle/git-info b/zsh/.zsh/pack/bundle/start/git-info
similarity index 100%
rename from zsh/.zsh/bundle/git-info
rename to zsh/.zsh/pack/bundle/start/git-info
diff --git a/zsh/.zsh/bundle/globalias.plugin.zsh b/zsh/.zsh/pack/bundle/start/globalias.plugin.zsh
similarity index 100%
rename from zsh/.zsh/bundle/globalias.plugin.zsh
rename to zsh/.zsh/pack/bundle/start/globalias.plugin.zsh
diff --git a/zsh/.zsh/bundle/imgur.plugin.zsh b/zsh/.zsh/pack/bundle/start/imgur.plugin.zsh
similarity index 100%
rename from zsh/.zsh/bundle/imgur.plugin.zsh
rename to zsh/.zsh/pack/bundle/start/imgur.plugin.zsh
diff --git a/zsh/.zsh/bundle/imgur.sh b/zsh/.zsh/pack/bundle/start/imgur.sh
similarity index 100%
rename from zsh/.zsh/bundle/imgur.sh
rename to zsh/.zsh/pack/bundle/start/imgur.sh
diff --git a/zsh/.zsh/bundle/input b/zsh/.zsh/pack/bundle/start/input
similarity index 100%
rename from zsh/.zsh/bundle/input
rename to zsh/.zsh/pack/bundle/start/input
diff --git a/zsh/.zsh/bundle/ix.plugin.zsh b/zsh/.zsh/pack/bundle/start/ix.plugin.zsh
similarity index 100%
rename from zsh/.zsh/bundle/ix.plugin.zsh
rename to zsh/.zsh/pack/bundle/start/ix.plugin.zsh
diff --git a/zsh/.zsh/bundle/pacman b/zsh/.zsh/pack/bundle/start/pacman
similarity index 100%
rename from zsh/.zsh/bundle/pacman
rename to zsh/.zsh/pack/bundle/start/pacman
diff --git a/zsh/.zsh/bundle/prompt.plugin.zsh b/zsh/.zsh/pack/bundle/start/prompt.plugin.zsh
similarity index 100%
rename from zsh/.zsh/bundle/prompt.plugin.zsh
rename to zsh/.zsh/pack/bundle/start/prompt.plugin.zsh
diff --git a/zsh/.zsh/bundle/pure b/zsh/.zsh/pack/bundle/start/pure
similarity index 100%
rename from zsh/.zsh/bundle/pure
rename to zsh/.zsh/pack/bundle/start/pure
diff --git a/zsh/.zsh/bundle/ssh b/zsh/.zsh/pack/bundle/start/ssh
similarity index 100%
rename from zsh/.zsh/bundle/ssh
rename to zsh/.zsh/pack/bundle/start/ssh
diff --git a/zsh/.zsh/bundle/termtitle b/zsh/.zsh/pack/bundle/start/termtitle
similarity index 100%
rename from zsh/.zsh/bundle/termtitle
rename to zsh/.zsh/pack/bundle/start/termtitle
diff --git a/zsh/.zsh/bundle/utility b/zsh/.zsh/pack/bundle/start/utility
similarity index 100%
rename from zsh/.zsh/bundle/utility
rename to zsh/.zsh/pack/bundle/start/utility
diff --git a/zsh/.zsh/bundle/vi-mode.plugin.zsh b/zsh/.zsh/pack/bundle/start/vi-mode.plugin.zsh
similarity index 100%
rename from zsh/.zsh/bundle/vi-mode.plugin.zsh
rename to zsh/.zsh/pack/bundle/start/vi-mode.plugin.zsh
diff --git a/zsh/.zsh/bundle/zsh-autosuggestions b/zsh/.zsh/pack/bundle/start/zsh-autosuggestions
similarity index 100%
rename from zsh/.zsh/bundle/zsh-autosuggestions
rename to zsh/.zsh/pack/bundle/start/zsh-autosuggestions
diff --git a/zsh/.zsh/bundle/zsh-completions b/zsh/.zsh/pack/bundle/start/zsh-completions
similarity index 100%
rename from zsh/.zsh/bundle/zsh-completions
rename to zsh/.zsh/pack/bundle/start/zsh-completions
diff --git a/zsh/.zsh/bundle/zsh-history-substring-search b/zsh/.zsh/pack/bundle/start/zsh-history-substring-search
similarity index 100%
rename from zsh/.zsh/bundle/zsh-history-substring-search
rename to zsh/.zsh/pack/bundle/start/zsh-history-substring-search
diff --git a/zsh/.zsh/bundle/zsh-kubernetes b/zsh/.zsh/pack/bundle/start/zsh-kubernetes
similarity index 100%
rename from zsh/.zsh/bundle/zsh-kubernetes
rename to zsh/.zsh/pack/bundle/start/zsh-kubernetes
diff --git a/zsh/.zshrc b/zsh/.zshrc
index d04dbd80..d1ae3c20 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -105,7 +105,7 @@ if [ -z "$PLUGINS_LOADED" ]; then
     source "$filename" >/dev/null 2>&1
 
     PLUGINS_LOADED+=("$filename")
-  done <<< $(find -L ~/.zsh/bundle -type f \( -name "*.zsh-theme" -or -name "*.plugin.zsh" -or -name "init.zsh" \) | sort)
+  done <<< $(find -L ~/.zsh/pack/*/start -type f \( -name "*.zsh-theme" -or -name "*.plugin.zsh" -or -name "init.zsh" \) | sort)
   export PLUGINS_LOADED
 fi