diff --git a/.config/vim/pack/plugins/start/fzf b/.config/vim/pack/plugins/start/fzf
new file mode 120000
index 0000000..4664d1c
--- /dev/null
+++ b/.config/vim/pack/plugins/start/fzf
@@ -0,0 +1 @@
+../opt/fzf
\ No newline at end of file
diff --git a/.config/vim/pack/plugins/start/fzf.vim b/.config/vim/pack/plugins/start/fzf.vim
new file mode 120000
index 0000000..183ab08
--- /dev/null
+++ b/.config/vim/pack/plugins/start/fzf.vim
@@ -0,0 +1 @@
+../opt/fzf.vim
\ No newline at end of file
diff --git a/.config/vim/pack/plugins/start/vim-gutentags b/.config/vim/pack/plugins/start/vim-gutentags
new file mode 120000
index 0000000..8f9d810
--- /dev/null
+++ b/.config/vim/pack/plugins/start/vim-gutentags
@@ -0,0 +1 @@
+../opt/vim-gutentags/
\ No newline at end of file
diff --git a/.config/vim/pack/plugins/start/vim-surround b/.config/vim/pack/plugins/start/vim-surround
new file mode 120000
index 0000000..06c780e
--- /dev/null
+++ b/.config/vim/pack/plugins/start/vim-surround
@@ -0,0 +1 @@
+../opt/vim-surround/
\ No newline at end of file
diff --git a/.config/vim/vim-surround.vim b/.config/vim/vim-surround.vim
deleted file mode 100644
index e7af881..0000000
--- a/.config/vim/vim-surround.vim
+++ /dev/null
@@ -1,10 +0,0 @@
-" Overwrite vim-surround bindings.
-nmap ds  <Plug>Dsurround
-nmap cs  <Plug>Csurround
-nmap cS  <Plug>CSurround
-nmap ys  <Plug>Ysurround
-nmap yS  <Plug>YSurround
-nmap yss <Plug>Yssurround
-nmap ySS <Plug>YSsurround
-xmap s   <Plug>VSurround
-xmap gs  <Plug>VgSurround
diff --git a/.config/vim/vimrc.d/20-plugins.vim b/.config/vim/vimrc.d/20-plugins.vim
index a5cbac4..b424a0f 100644
--- a/.config/vim/vimrc.d/20-plugins.vim
+++ b/.config/vim/vimrc.d/20-plugins.vim
@@ -12,17 +12,6 @@ if (has('patch-8.1.1719') || has('nvim'))
 	packadd! coc.nvim
 	source $XDG_CONFIG_HOME/vim/coc.nvim.vim
 endif
-" Fuzzy finder
-packadd! fzf
-packadd! fzf.vim
-nmap <leader>f :Files<CR>
 " LaTeX
 autocmd BufNewFile,BufRead *.tex packadd! vimtex
 	\ | source $XDG_CONFIG_HOME/vim/vimtex.vim
-" ctags
-packadd! vim-gutentags
-nmap <leader>t :Tags<CR>
-" Surround text with parentheses, brackets, quotes, tags, etc.
-let g:surround_no_mappings = 1
-packadd! vim-surround
-source $XDG_CONFIG_HOME/vim/vim-surround.vim
diff --git a/.config/vim/vimrc.d/40-keybindings.vim b/.config/vim/vimrc.d/40-keybindings.vim
index aaed18d..7703860 100644
--- a/.config/vim/vimrc.d/40-keybindings.vim
+++ b/.config/vim/vimrc.d/40-keybindings.vim
@@ -83,3 +83,11 @@ if (has('nvim'))
 elseif (has('terminal'))
 	nmap <leader><CR> :terminal<CR>
 endif
+
+" Plugin specific bindings
+if (get(g:, 'loaded_fzf'))
+	nmap <leader>f :Files<CR>
+	if (get(g:, 'loaded_gutentags'))
+		nmap <leader>t :Tags<CR>
+	endif
+endif