diff --git a/vim/.vim/after/plugin/mappings/fugitive.vim b/vim/.vim/after/plugin/mappings/fugitive.vim
new file mode 100644
index 0000000..4e4c9a9
--- /dev/null
+++ b/vim/.vim/after/plugin/mappings/fugitive.vim
@@ -0,0 +1,16 @@
+" Visual bindings for merging diffs as in normal mode
+xnoremap dp :diffput<cr>
+xnoremap do :diffget<cr>
+
+" Git add current file
+nnoremap <Leader>ga :Git add %:p<CR><CR>
+" Open status window
+nnoremap <Leader>gs :Gstatus<CR>
+" Open diff view of current buffer: the up/left window is the current index
+nnoremap <Leader>gd :Gdiffsplit!<CR>
+" Open current file log in new tab, populate its location list with history
+nnoremap <Leader>gl :sp<CR><C-w>T:Gllog --follow -- %:p<CR>
+" Open a buffer to the left with blame information
+nnoremap <Leader>gb :Gblame<CR>
+" Commit staged changes, open a new tab just for it
+nnoremap <Leader>gc :Gcommit -v -q<CR>
diff --git a/vim/.vim/after/plugin/mappings/fzf.vim b/vim/.vim/after/plugin/mappings/fzf.vim
new file mode 100644
index 0000000..9060390
--- /dev/null
+++ b/vim/.vim/after/plugin/mappings/fzf.vim
@@ -0,0 +1,20 @@
+" Only git-tracked files, Vim needs to be in a Git repository
+nnoremap <Leader>fg :GFiles<CR>
+" All files
+nnoremap <Leader>ff :Files<CR>
+" Currently open buffers
+nnoremap <Leader>fb :Buffers<CR>
+" Buffer history
+nnoremap <Leader>fh :History<CR>
+" Tags in buffer
+nnoremap <Leader>ft :BTags<CR>
+" Tags in all project files
+nnoremap <Leader>fT :Tags<CR>
+" Snippets for the current fileytpe (using Ultisnips)
+nnoremap <Leader>fs :Snippets<CR>
+" All available commands
+nnoremap <Leader>f: :Commands<CR>
+" All commits (using fugitive)
+nnoremap <Leader>fc :Commits<CR>
+" All commits for the current buffer (using fugitive)
+nnoremap <Leader>fC :BCommits<CR>
diff --git a/vim/.vim/after/plugin/mappings/misc.vim b/vim/.vim/after/plugin/mappings/misc.vim
new file mode 100644
index 0000000..5222b8e
--- /dev/null
+++ b/vim/.vim/after/plugin/mappings/misc.vim
@@ -0,0 +1,15 @@
+" Yank until the end of line with Y, to be more consistent with D and C
+nnoremap Y y$
+
+" Mappings for working with vimrc
+nnoremap <Leader>ev :edit $MYVIMRC<CR>
+nnoremap <Leader>es :source $MYVIMRC<CR>
+
+" Run make silently, then skip the 'Press ENTER to continue'
+noremap <Leader>m :silent! :make! \| :redraw!<CR>
+
+" Remove search-highlighting
+noremap <Leader><Leader> :nohls<CR>
+
+" Explicit map for vim-cheat40 which seems to fail because of my <Nop> map
+map <Leader>? :<C-u>Cheat40<CR>
diff --git a/vim/.vim/after/plugin/mappings/qf.vim b/vim/.vim/after/plugin/mappings/qf.vim
new file mode 100644
index 0000000..c5e353b
--- /dev/null
+++ b/vim/.vim/after/plugin/mappings/qf.vim
@@ -0,0 +1,11 @@
+" Next and previous in quick-fix list
+nmap <Leader>fn <Plug>(qf_qf_next)
+nmap <Leader>fp <Plug>(qf_qf_previous)
+
+" Next and previous in location list
+nmap <Leader>ln <Plug>(qf_loc_next)
+nmap <Leader>lp <Plug>(qf_loc_previous)
+
+" Toggle quick-fix and location lists
+nmap <Leader>tf <Plug>(qf_qf_toggle)
+nmap <Leader>tl <Plug>(qf_loc_toggle)
diff --git a/vim/.vim/after/plugin/mappings/unimpaired.vim b/vim/.vim/after/plugin/mappings/unimpaired.vim
new file mode 100644
index 0000000..53457bd
--- /dev/null
+++ b/vim/.vim/after/plugin/mappings/unimpaired.vim
@@ -0,0 +1,7 @@
+" Better fr layout mappings for vim-unimpaired and other '[' and ']' commands
+nmap ( [
+nmap ) ]
+omap ( [
+omap ) ]
+xmap ( [
+xmap ) ]
diff --git a/vim/.vim/plugin/mappings/leader.vim b/vim/.vim/plugin/mappings/leader.vim
new file mode 100644
index 0000000..0aba0b2
--- /dev/null
+++ b/vim/.vim/plugin/mappings/leader.vim
@@ -0,0 +1,6 @@
+" Map leader to space (needs the noremap trick to avoid moving the cursor)
+nnoremap <Space> <Nop>
+let mapleader=" "
+
+" Map localleader to '!' (if I want to filter text, I use visual mode)
+let maplocalleader="!"
diff --git a/vim/.vimrc b/vim/.vimrc
index 9e32684..c795e74 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -324,98 +324,6 @@ let g:fastfold_fold_command_suffixes=[
 " }}}
 " }}}
 
-" Mappings {{{
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Miscellaneous mappings {{{
-""""""""""""""""""""""""
-" Yank until the end of line with Y, to be more consistent with D and C
-nnoremap Y y$
-
-" Map leader to space (needs the noremap trick)
-nnoremap <Space> <Nop>
-let mapleader=" "
-" Map localleader to '!' (if I want to filter text, I use visual mode)
-let maplocalleader="!"
-
-" Mappings for working with this file.
-map <Leader>ev :edit $MYVIMRC<CR>
-map <Leader>es :source $MYVIMRC<CR>
-
-" Run make silently, then skip the 'Press ENTER to continue'
-noremap <Leader>m :silent! :make! \| :redraw!<CR>
-
-" Remove search-highlighting
-noremap <Leader><Leader> :nohls<CR>
-
-" Better fr layout mappings for vim-unimpaired and other '[' and ']' commands
-nmap ( [
-nmap ) ]
-omap ( [
-omap ) ]
-xmap ( [
-xmap ) ]
-
-" Map for vim-cheat40 which seems to fail because of my <Space> to <Nop> map
-map <Leader>? :<C-u>Cheat40<CR>
-" }}}
-
-" Mapping for quickfix bindings {{{
-"""""""""""""""""""""""""""""""
-" Next and previous in quick-fix list
-nmap <Leader>fn <Plug>(qf_qf_next)
-nmap <Leader>fp <Plug>(qf_qf_previous)
-" Next and previous in location list
-nmap <Leader>ln <Plug>(qf_loc_next)
-nmap <Leader>lp <Plug>(qf_loc_previous)
-" Toggle quick-fix and location lists
-nmap <Leader>tf <Plug>(qf_qf_toggle)
-nmap <Leader>tl <Plug>(qf_loc_toggle)
-" }}}
-
-" Fuzzy file finder bindings {{{
-""""""""""""""""""""""""""""
-" Only git-tracked files, Vim needs to be in a Git repository
-nmap <Leader>fg :GFiles<CR>
-" All files
-nmap <Leader>ff :Files<CR>
-" Currently open buffers
-nmap <Leader>fb :Buffers<CR>
-" Buffer history
-nmap <Leader>fh :History<CR>
-" Tags in buffer
-nmap <Leader>ft :BTags<CR>
-" Tags in all project files
-nmap <Leader>fT :Tags<CR>
-" Snippets for the current fileytpe (using Ultisnips)
-nmap <Leader>fs :Snippets<CR>
-" All available commands
-nmap <Leader>f: :Commands<CR>
-" All commits (using fugitive)
-nmap <Leader>fc :Commits<CR>
-" All commits for the current buffer (using fugitive)
-nmap <Leader>fC :BCommits<CR>
-" }}}
-
-" Git and diff mappings {{{
-"""""""""""""""""""""""
-" Visual bindings for merging diffs as in normal mode
-xnoremap dp :diffput<cr>
-xnoremap do :diffget<cr>
-" Git add current file
-nnoremap <Leader>ga :Git add %:p<CR><CR>
-" Open status window
-nnoremap <Leader>gs :Gstatus<CR>
-" Open diff view of current buffer: the up/left window is the current index
-nnoremap <Leader>gd :Gdiffsplit!<CR>
-" Open current file log in new tab, populate its location list with history
-nnoremap <Leader>gl :sp<CR><C-w>T:Gllog --follow -- %:p<CR>
-" Open a buffer to the left with blame information
-nnoremap <Leader>gb :Gblame<CR>
-" Commit staged changes, open a new tab just for it
-nnoremap <Leader>gc :Gcommit -v -q<CR>
-" }}}
-" }}}
-
 " Import settings when inside a git repository {{{
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 let git_settings=system("git config --get vim.settings")