diff --git a/.config/nvim/plugins/ayu.vim b/.config/nvim/plugins/ayu.vim
deleted file mode 100644
index 0b7de34a..00000000
--- a/.config/nvim/plugins/ayu.vim
+++ /dev/null
@@ -1 +0,0 @@
-let ayucolor="light"
diff --git a/.git_template/HEAD b/.git_template/HEAD
deleted file mode 100644
index b870d826..00000000
--- a/.git_template/HEAD
+++ /dev/null
@@ -1 +0,0 @@
-ref: refs/heads/main
diff --git a/.hushlogin b/.hushlogin
deleted file mode 100644
index 8b137891..00000000
--- a/.hushlogin
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/.npmrc b/.npmrc
deleted file mode 100644
index d883e4fa..00000000
--- a/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-progress=false
diff --git a/README.md b/README.md
index b23e27bb..9ac888ee 100644
--- a/README.md
+++ b/README.md
@@ -5,23 +5,7 @@ My personal dotfiles, originally for macOS only but currently being adapted for
 ## Installation
 
 ```
-git clone --bare git@github.com:opdavies/dotfiles.git $HOME/dotfiles
-git --git-dir $HOME/dotfiles --work-tree $HOME checkout
-git --git-dir $HOME/dotfiles --work-tree $HOME config status.showUntrackedFiles no
-```
-
-### Adding a `config` alias
-
-You can also set a `config` alias as a wrapper for the Git command, as described within [Atlassian's blog post](https://www.atlassian.com/git/tutorials/dotfiles):
-
-    alias config="git --git-dir $HOME/dotfiles --work-tree $HOME"
-
-### Adding new files
-
-```
-config add /path/to/file
-config commit -m "Some commit message"
-config push
+stow alactritty bin composer dconf git tmux vim zsh
 ```
 
 ## Inspiration
diff --git a/.config/alacritty/alacritty.yml b/alactritty/.config/alacritty.yml
similarity index 100%
rename from .config/alacritty/alacritty.yml
rename to alactritty/.config/alacritty.yml
diff --git a/bin/drupalorg b/bin/bin/drupalorg
similarity index 100%
rename from bin/drupalorg
rename to bin/bin/drupalorg
diff --git a/bin/git-abort b/bin/bin/git-abort
similarity index 100%
rename from bin/git-abort
rename to bin/bin/git-abort
diff --git a/bin/git-close-pull-request b/bin/bin/git-close-pull-request
similarity index 100%
rename from bin/git-close-pull-request
rename to bin/bin/git-close-pull-request
diff --git a/bin/git-cm b/bin/bin/git-cm
similarity index 100%
rename from bin/git-cm
rename to bin/bin/git-cm
diff --git a/bin/git-continue b/bin/bin/git-continue
similarity index 100%
rename from bin/git-continue
rename to bin/bin/git-continue
diff --git a/bin/git-create-new-tracking-branch b/bin/bin/git-create-new-tracking-branch
similarity index 100%
rename from bin/git-create-new-tracking-branch
rename to bin/bin/git-create-new-tracking-branch
diff --git a/bin/git-delete-merged-branches b/bin/bin/git-delete-merged-branches
similarity index 100%
rename from bin/git-delete-merged-branches
rename to bin/bin/git-delete-merged-branches
diff --git a/bin/git-master-to-main-wrapper b/bin/bin/git-master-to-main-wrapper
similarity index 100%
rename from bin/git-master-to-main-wrapper
rename to bin/bin/git-master-to-main-wrapper
diff --git a/bin/git-opr b/bin/bin/git-opr
similarity index 100%
rename from bin/git-opr
rename to bin/bin/git-opr
diff --git a/bin/git-publish b/bin/bin/git-publish
similarity index 100%
rename from bin/git-publish
rename to bin/bin/git-publish
diff --git a/bin/git-up b/bin/bin/git-up
similarity index 100%
rename from bin/git-up
rename to bin/bin/git-up
diff --git a/bin/git.sh b/bin/bin/git.sh
similarity index 100%
rename from bin/git.sh
rename to bin/bin/git.sh
diff --git a/bin/main-or-master-branch b/bin/bin/main-or-master-branch
similarity index 100%
rename from bin/main-or-master-branch
rename to bin/bin/main-or-master-branch
diff --git a/bin/phpunit-or-pest b/bin/bin/phpunit-or-pest
similarity index 100%
rename from bin/phpunit-or-pest
rename to bin/bin/phpunit-or-pest
diff --git a/bin/tat b/bin/bin/tat
similarity index 100%
rename from bin/tat
rename to bin/bin/tat
diff --git a/.composer/.gitignore b/composer/.composer/.gitignore
similarity index 100%
rename from .composer/.gitignore
rename to composer/.composer/.gitignore
diff --git a/.composer/composer.json b/composer/.composer/composer.json
similarity index 100%
rename from .composer/composer.json
rename to composer/.composer/composer.json
diff --git a/.composer/composer.lock b/composer/.composer/composer.lock
similarity index 100%
rename from .composer/composer.lock
rename to composer/.composer/composer.lock
diff --git a/.config/dconf-settings.ini b/dconf/.config/dconf-settings.ini
similarity index 100%
rename from .config/dconf-settings.ini
rename to dconf/.config/dconf-settings.ini
diff --git a/.gitconfig b/git/.gitconfig
similarity index 98%
rename from .gitconfig
rename to git/.gitconfig
index e879de5b..ab746ae6 100644
--- a/.gitconfig
+++ b/git/.gitconfig
@@ -135,3 +135,6 @@
 	required = true
 	clean = git-lfs clean -- %f
 	smudge = git-lfs smudge -- %f
+[user]
+	name = Oliver Davies
+	email = oliver@oliverdavies.uk
diff --git a/git/.gitignore b/git/.gitignore
new file mode 100644
index 00000000..b3817e5a
--- /dev/null
+++ b/git/.gitignore
@@ -0,0 +1,10 @@
+*
+!*/
+!/bin/**
+!/tag-*/**
+/tag-php/composer/.env
+/tag-php/composer/auth.json
+/tag-php/composer/bin/
+/tag-php/composer/config/
+/tag-php/composer/keys.*.pub
+/**/*.zwc
diff --git a/.gitignore-global b/git/.gitignore-global
similarity index 100%
rename from .gitignore-global
rename to git/.gitignore-global
diff --git a/.gitmessage b/git/.gitmessage
similarity index 100%
rename from .gitmessage
rename to git/.gitmessage
diff --git a/.tmux.conf b/tmux/.tmux.conf
similarity index 98%
rename from .tmux.conf
rename to tmux/.tmux.conf
index 3f405153..3fb6adbc 100644
--- a/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -79,6 +79,7 @@ bind C-l send-keys 'C-l'
 bind C-k send-keys 'C-k'
 
 # Plugins
+set -g @plugin "arcticicestudio/nord-tmux"
 set -g @plugin 'tmux-plugins/tmux-sensible'
 set -g @plugin 'tmux-plugins/tpm'
 
diff --git a/vim/.config/coc/extensions/db.json b/vim/.config/coc/extensions/db.json
new file mode 100644
index 00000000..9e26dfee
--- /dev/null
+++ b/vim/.config/coc/extensions/db.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/.config/coc/extensions/package.json b/vim/.config/coc/extensions/package.json
similarity index 100%
rename from .config/coc/extensions/package.json
rename to vim/.config/coc/extensions/package.json
diff --git a/vim/.config/coc/memos.json b/vim/.config/coc/memos.json
new file mode 100644
index 00000000..9e26dfee
--- /dev/null
+++ b/vim/.config/coc/memos.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/vim/.config/nvim/.netrwhist b/vim/.config/nvim/.netrwhist
new file mode 100644
index 00000000..1cb7b680
--- /dev/null
+++ b/vim/.config/nvim/.netrwhist
@@ -0,0 +1,12 @@
+let g:netrw_dirhistmax  =10
+let g:netrw_dirhistcnt =2
+let g:netrw_dirhist_2='/home/opdavies/Code/Personal/oliverdavies.uk/tools/docker/images/nginx/root/etc/nginx/conf.d'
+let g:netrw_dirhist_1='/home/opdavies/Code/Personal/oliverdavies.uk/tools/docker/images/nginx/root/etc/nginx'
+let g:netrw_dirhist_0='/home/opdavies/Code/Personal/oliverdavies.uk/tools/docker/images/nginx/root/etc'
+let g:netrw_dirhist_9='/home/opdavies/Code/Personal/oliverdavies.uk/tools/docker/images/nginx/root'
+let g:netrw_dirhist_8='/home/opdavies/Code/Personal/oliverdavies.uk/tools/docker/images/nginx'
+let g:netrw_dirhist_7='/home/opdavies/Code/Personal/oliverdavies.uk/tools/docker/images'
+let g:netrw_dirhist_6='/home/opdavies/Code/Personal/oliverdavies.uk/tools/docker'
+let g:netrw_dirhist_5='/home/opdavies/Code/Personal/oliverdavies.uk/tools'
+let g:netrw_dirhist_4='/home/opdavies/Code/Personal/oliverdavies.uk'
+let g:netrw_dirhist_3='/home/opdavies/Code/Personal/oliverdavies.uk/source'
diff --git a/.config/nvim/coc-settings.json b/vim/.config/nvim/coc-settings.json
similarity index 67%
rename from .config/nvim/coc-settings.json
rename to vim/.config/nvim/coc-settings.json
index f60b6a59..9dd169b5 100644
--- a/.config/nvim/coc-settings.json
+++ b/vim/.config/nvim/coc-settings.json
@@ -11,10 +11,5 @@
     "*.theme"
   ],
   "intelephense.progress.enable": false,
-  "intelephense.telemetry.enabled": false,
-
-  "markdownlint.config": {
-    "default": true,
-    "line_length": false
-  }
+  "intelephense.telemetry.enabled": false
 }
diff --git a/.config/nvim/init.vim b/vim/.config/nvim/init.vim
similarity index 94%
rename from .config/nvim/init.vim
rename to vim/.config/nvim/init.vim
index 9a04190f..50368f5f 100644
--- a/.config/nvim/init.vim
+++ b/vim/.config/nvim/init.vim
@@ -26,22 +26,18 @@ set complete+=kspell
 set expandtab
 set foldlevelstart=99 " Start unfolded
 set foldmethod=indent
-set hlsearch
-set ignorecase
-set incsearch
 set noswapfile
 set nowrap
 set number relativenumber
 set scrolloff=10 " Automatically scroll
 set shiftwidth=2
-set smartcase
 set smartindent
 set tabstop=2 softtabstop=2
 set termguicolors
 
 call s:SourceConfigFilesIn('plugins')
 
-colorscheme jellybeans
+colorscheme nord
 
 " Remaps
 nnoremap <leader>pv :Vex<CR>
diff --git a/vim/.config/nvim/plugged/auto-pairs b/vim/.config/nvim/plugged/auto-pairs
new file mode 160000
index 00000000..39f06b87
--- /dev/null
+++ b/vim/.config/nvim/plugged/auto-pairs
@@ -0,0 +1 @@
+Subproject commit 39f06b873a8449af8ff6a3eee716d3da14d63a76
diff --git a/vim/.config/nvim/plugged/blamer.nvim b/vim/.config/nvim/plugged/blamer.nvim
new file mode 160000
index 00000000..12f8eea7
--- /dev/null
+++ b/vim/.config/nvim/plugged/blamer.nvim
@@ -0,0 +1 @@
+Subproject commit 12f8eea7586a91ea1994501722d2e1575d9c6b63
diff --git a/vim/.config/nvim/plugged/coc.nvim b/vim/.config/nvim/plugged/coc.nvim
new file mode 160000
index 00000000..acc2b95b
--- /dev/null
+++ b/vim/.config/nvim/plugged/coc.nvim
@@ -0,0 +1 @@
+Subproject commit acc2b95be6652d79f86d586e52c7566557608476
diff --git a/vim/.config/nvim/plugged/editorconfig-vim b/vim/.config/nvim/plugged/editorconfig-vim
new file mode 160000
index 00000000..f305bc77
--- /dev/null
+++ b/vim/.config/nvim/plugged/editorconfig-vim
@@ -0,0 +1 @@
+Subproject commit f305bc77faef4b418aee65682d7d147f64cfd5a9
diff --git a/vim/.config/nvim/plugged/fzf b/vim/.config/nvim/plugged/fzf
new file mode 160000
index 00000000..7191ebb6
--- /dev/null
+++ b/vim/.config/nvim/plugged/fzf
@@ -0,0 +1 @@
+Subproject commit 7191ebb615f5d6ebbf51d598d8ec853a65e2274d
diff --git a/vim/.config/nvim/plugged/fzf.vim b/vim/.config/nvim/plugged/fzf.vim
new file mode 160000
index 00000000..e34f6c12
--- /dev/null
+++ b/vim/.config/nvim/plugged/fzf.vim
@@ -0,0 +1 @@
+Subproject commit e34f6c129d39b90db44df1107c8b7dfacfd18946
diff --git a/vim/.config/nvim/plugged/indentLine b/vim/.config/nvim/plugged/indentLine
new file mode 160000
index 00000000..5617a1cf
--- /dev/null
+++ b/vim/.config/nvim/plugged/indentLine
@@ -0,0 +1 @@
+Subproject commit 5617a1cf7d315e6e6f84d825c85e3b669d220bfa
diff --git a/vim/.config/nvim/plugged/nerdcommenter b/vim/.config/nvim/plugged/nerdcommenter
new file mode 160000
index 00000000..a5d16631
--- /dev/null
+++ b/vim/.config/nvim/plugged/nerdcommenter
@@ -0,0 +1 @@
+Subproject commit a5d1663185bee20bfb120c9ab212144444514982
diff --git a/vim/.config/nvim/plugged/nerdtree b/vim/.config/nvim/plugged/nerdtree
new file mode 160000
index 00000000..81f3eaba
--- /dev/null
+++ b/vim/.config/nvim/plugged/nerdtree
@@ -0,0 +1 @@
+Subproject commit 81f3eaba295b3fceb2d032db57e5eae99ae480f8
diff --git a/vim/.config/nvim/plugged/nord-vim b/vim/.config/nvim/plugged/nord-vim
new file mode 160000
index 00000000..851322a9
--- /dev/null
+++ b/vim/.config/nvim/plugged/nord-vim
@@ -0,0 +1 @@
+Subproject commit 851322a9cec998ed81c25b653bf9c48c365ec316
diff --git a/vim/.config/nvim/plugged/plenary.nvim b/vim/.config/nvim/plugged/plenary.nvim
new file mode 160000
index 00000000..ca51b684
--- /dev/null
+++ b/vim/.config/nvim/plugged/plenary.nvim
@@ -0,0 +1 @@
+Subproject commit ca51b6842cd8021f58dc45c89b3e8d7994e0bf8f
diff --git a/vim/.config/nvim/plugged/popup.nvim b/vim/.config/nvim/plugged/popup.nvim
new file mode 160000
index 00000000..5e3bece7
--- /dev/null
+++ b/vim/.config/nvim/plugged/popup.nvim
@@ -0,0 +1 @@
+Subproject commit 5e3bece7b4b4905f4ec89bee74c09cfd8172a16a
diff --git a/vim/.config/nvim/plugged/telescope.nvim b/vim/.config/nvim/plugged/telescope.nvim
new file mode 160000
index 00000000..7cdaaaa3
--- /dev/null
+++ b/vim/.config/nvim/plugged/telescope.nvim
@@ -0,0 +1 @@
+Subproject commit 7cdaaaa39dde06b7372aa1b326c272ad11a95d4e
diff --git a/vim/.config/nvim/plugged/vim-airline b/vim/.config/nvim/plugged/vim-airline
new file mode 160000
index 00000000..a94d8034
--- /dev/null
+++ b/vim/.config/nvim/plugged/vim-airline
@@ -0,0 +1 @@
+Subproject commit a94d8034c3d6548575482b434a6cead8acc1cfab
diff --git a/vim/.config/nvim/plugged/vim-gitgutter b/vim/.config/nvim/plugged/vim-gitgutter
new file mode 160000
index 00000000..0f98634b
--- /dev/null
+++ b/vim/.config/nvim/plugged/vim-gitgutter
@@ -0,0 +1 @@
+Subproject commit 0f98634b92da9a35580b618c11a6d2adc42d9f90
diff --git a/vim/.config/nvim/plugged/vim-highlightedyank b/vim/.config/nvim/plugged/vim-highlightedyank
new file mode 160000
index 00000000..931cc6bd
--- /dev/null
+++ b/vim/.config/nvim/plugged/vim-highlightedyank
@@ -0,0 +1 @@
+Subproject commit 931cc6bd53e4a1fdbe592751f0e13c0e401f0a49
diff --git a/vim/.config/nvim/plugged/vim-polyglot b/vim/.config/nvim/plugged/vim-polyglot
new file mode 160000
index 00000000..554a6ac7
--- /dev/null
+++ b/vim/.config/nvim/plugged/vim-polyglot
@@ -0,0 +1 @@
+Subproject commit 554a6ac7575f87b5b85d1b2bf60e7071c4164cbc
diff --git a/vim/.config/nvim/plugged/vim-sort-motion b/vim/.config/nvim/plugged/vim-sort-motion
new file mode 160000
index 00000000..c8782be8
--- /dev/null
+++ b/vim/.config/nvim/plugged/vim-sort-motion
@@ -0,0 +1 @@
+Subproject commit c8782be8f7da414c6442b3ba4b6abb0345d392d9
diff --git a/vim/.config/nvim/plugged/vim-surround b/vim/.config/nvim/plugged/vim-surround
new file mode 160000
index 00000000..f51a26d3
--- /dev/null
+++ b/vim/.config/nvim/plugged/vim-surround
@@ -0,0 +1 @@
+Subproject commit f51a26d3710629d031806305b6c8727189cd1935
diff --git a/vim/.config/nvim/plugged/vim-tmux-navigator b/vim/.config/nvim/plugged/vim-tmux-navigator
new file mode 160000
index 00000000..0cabb1ef
--- /dev/null
+++ b/vim/.config/nvim/plugged/vim-tmux-navigator
@@ -0,0 +1 @@
+Subproject commit 0cabb1ef01af0986b7bf6fb7acf631debdbbb470
diff --git a/vim/.config/nvim/plugged/vim-visual-multi b/vim/.config/nvim/plugged/vim-visual-multi
new file mode 160000
index 00000000..f9946958
--- /dev/null
+++ b/vim/.config/nvim/plugged/vim-visual-multi
@@ -0,0 +1 @@
+Subproject commit f994695813ebaecc9e37c7ea216c65d9cd659767
diff --git a/.config/nvim/plugins.vim b/vim/.config/nvim/plugins.vim
similarity index 91%
rename from .config/nvim/plugins.vim
rename to vim/.config/nvim/plugins.vim
index 54f67ced..d64e2ae4 100644
--- a/.config/nvim/plugins.vim
+++ b/vim/.config/nvim/plugins.vim
@@ -1,7 +1,7 @@
+Plug 'APZelos/blamer.nvim'
 Plug 'Yggdroot/indentLine'
 Plug 'airblade/vim-gitgutter'
 Plug 'arcticicestudio/nord-vim'
-Plug 'ayu-theme/ayu-vim'
 Plug 'christoomey/vim-sort-motion'
 Plug 'christoomey/vim-tmux-navigator'
 Plug 'editorconfig/editorconfig-vim'
@@ -10,7 +10,6 @@ Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
 Plug 'junegunn/fzf.vim'
 Plug 'machakann/vim-highlightedyank'
 Plug 'mg979/vim-visual-multi', {'branch': 'master'}
-Plug 'nanotech/jellybeans.vim'
 Plug 'neoclide/coc.nvim', {'branch': 'release'}
 Plug 'nvim-lua/plenary.nvim'
 Plug 'nvim-lua/popup.nvim'
@@ -18,3 +17,4 @@ Plug 'preservim/nerdcommenter'
 Plug 'preservim/nerdtree'
 Plug 'sheerun/vim-polyglot'
 Plug 'tpope/vim-surround'
+Plug 'vim-airline/vim-airline'
diff --git a/vim/.config/nvim/plugins/airline.vim b/vim/.config/nvim/plugins/airline.vim
new file mode 100644
index 00000000..e23e6063
--- /dev/null
+++ b/vim/.config/nvim/plugins/airline.vim
@@ -0,0 +1,5 @@
+let g:airline_left_alt_sep = ''
+let g:airline_left_sep = ''
+let g:airline_powerline_fonts = 1
+let g:airline_right_alt_sep = ''
+let g:airline_right_sep = ''
diff --git a/vim/.config/nvim/plugins/blamer.vim b/vim/.config/nvim/plugins/blamer.vim
new file mode 100644
index 00000000..1c39734c
--- /dev/null
+++ b/vim/.config/nvim/plugins/blamer.vim
@@ -0,0 +1,2 @@
+let g:blamer_delay = 500
+let g:blamer_enabled = 1
diff --git a/.config/nvim/plugins/coc.vim b/vim/.config/nvim/plugins/coc.vim
similarity index 53%
rename from .config/nvim/plugins/coc.vim
rename to vim/.config/nvim/plugins/coc.vim
index a8bcc4f2..e5b15d2d 100644
--- a/.config/nvim/plugins/coc.vim
+++ b/vim/.config/nvim/plugins/coc.vim
@@ -1,5 +1,3 @@
-let g:coc_global_extensions = ['coc-angular', 'coc-css', 'coc-emmet', 'coc-esbonio', 'coc-git', 'coc-go', 'coc-html', 'coc-json', 'coc-markdownlint', 'coc-php-cs-fixer', 'coc-phpls', 'coc-sh', 'coc-svg', 'coc-tailwindcss', 'coc-tsserver', 'coc-vetur', 'coc-vimlsp', 'coc-yaml', 'coc-yank']
-
 nmap <Leader>a <Plug>(coc-codeaction)
 nmap <Leader>gd <Plug>(coc-definition)
 nmap <Leader>gr <Plug>(coc-references)
diff --git a/.config/nvim/plugins/nerdtree.vim b/vim/.config/nvim/plugins/nerdtree.vim
similarity index 100%
rename from .config/nvim/plugins/nerdtree.vim
rename to vim/.config/nvim/plugins/nerdtree.vim
diff --git a/.config/nvim/plugins/nord.vim b/vim/.config/nvim/plugins/nord.vim
similarity index 100%
rename from .config/nvim/plugins/nord.vim
rename to vim/.config/nvim/plugins/nord.vim
diff --git a/.config/nvim/plugins/telescope.vim b/vim/.config/nvim/plugins/telescope.vim
similarity index 100%
rename from .config/nvim/plugins/telescope.vim
rename to vim/.config/nvim/plugins/telescope.vim
diff --git a/.zsh/completion-scripts/_g b/zsh/.zsh/completion-scripts/_g
similarity index 100%
rename from .zsh/completion-scripts/_g
rename to zsh/.zsh/completion-scripts/_g
diff --git a/.zsh/completion-scripts/_m b/zsh/.zsh/completion-scripts/_m
similarity index 100%
rename from .zsh/completion-scripts/_m
rename to zsh/.zsh/completion-scripts/_m
diff --git a/.zsh/configs/aliases.zsh b/zsh/.zsh/configs/aliases.zsh
similarity index 100%
rename from .zsh/configs/aliases.zsh
rename to zsh/.zsh/configs/aliases.zsh
diff --git a/.zsh/configs/colour.zsh b/zsh/.zsh/configs/colour.zsh
similarity index 100%
rename from .zsh/configs/colour.zsh
rename to zsh/.zsh/configs/colour.zsh
diff --git a/.zsh/configs/functions.zsh b/zsh/.zsh/configs/functions.zsh
similarity index 100%
rename from .zsh/configs/functions.zsh
rename to zsh/.zsh/configs/functions.zsh
diff --git a/.zsh/configs/general.zsh b/zsh/.zsh/configs/general.zsh
similarity index 100%
rename from .zsh/configs/general.zsh
rename to zsh/.zsh/configs/general.zsh
diff --git a/.zsh/configs/git.zsh b/zsh/.zsh/configs/git.zsh
similarity index 100%
rename from .zsh/configs/git.zsh
rename to zsh/.zsh/configs/git.zsh
diff --git a/.zsh/configs/history.zsh b/zsh/.zsh/configs/history.zsh
similarity index 100%
rename from .zsh/configs/history.zsh
rename to zsh/.zsh/configs/history.zsh
diff --git a/.zsh/configs/nvm.zsh b/zsh/.zsh/configs/nvm.zsh
similarity index 100%
rename from .zsh/configs/nvm.zsh
rename to zsh/.zsh/configs/nvm.zsh
diff --git a/.zsh/configs/options.zsh b/zsh/.zsh/configs/options.zsh
similarity index 100%
rename from .zsh/configs/options.zsh
rename to zsh/.zsh/configs/options.zsh
diff --git a/.zsh/configs/path.zsh b/zsh/.zsh/configs/path.zsh
similarity index 100%
rename from .zsh/configs/path.zsh
rename to zsh/.zsh/configs/path.zsh
diff --git a/.zsh/configs/platformsh.zsh b/zsh/.zsh/configs/platformsh.zsh
similarity index 100%
rename from .zsh/configs/platformsh.zsh
rename to zsh/.zsh/configs/platformsh.zsh
diff --git a/.zsh/configs/plugins.zsh b/zsh/.zsh/configs/plugins.zsh
similarity index 100%
rename from .zsh/configs/plugins.zsh
rename to zsh/.zsh/configs/plugins.zsh
diff --git a/zsh/.zsh/configs/plugins.zsh.zwc b/zsh/.zsh/configs/plugins.zsh.zwc
new file mode 100644
index 00000000..7a6ac081
Binary files /dev/null and b/zsh/.zsh/configs/plugins.zsh.zwc differ
diff --git a/.zsh/configs/post/completion.zsh b/zsh/.zsh/configs/post/completion.zsh
similarity index 100%
rename from .zsh/configs/post/completion.zsh
rename to zsh/.zsh/configs/post/completion.zsh
diff --git a/.zsh/configs/prompt.zsh b/zsh/.zsh/configs/prompt.zsh
similarity index 100%
rename from .zsh/configs/prompt.zsh
rename to zsh/.zsh/configs/prompt.zsh
diff --git a/.zsh/configs/tmux.zsh b/zsh/.zsh/configs/tmux.zsh
similarity index 68%
rename from .zsh/configs/tmux.zsh
rename to zsh/.zsh/configs/tmux.zsh
index 35896603..61e6ad05 100644
--- a/.zsh/configs/tmux.zsh
+++ b/zsh/.zsh/configs/tmux.zsh
@@ -1,7 +1,3 @@
-_not_inside_tmux() {
-  [[ -z "$TMUX" ]]
-}
-
 ensure_tmux_is_running() {
   if _not_inside_tmux; then
     tat
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