diff --git a/nvim/.config/nvim/after/plugin/fzf.vim b/nvim/.config/nvim/after/plugin/fzf.vim
new file mode 100644
index 0000000..482b15b
--- /dev/null
+++ b/nvim/.config/nvim/after/plugin/fzf.vim
@@ -0,0 +1,22 @@
+nnoremap <Leader>b   :Buffers<CR>
+nnoremap <Leader>/   :GFiles?<CR>
+nnoremap <Leader>ff  :GFiles<CR>
+nnoremap <Leader>fF  :Files<CR>
+nnoremap <Leader>fL  :Lines<CR>
+nnoremap <Leader>fl  :BLines<CR>
+nnoremap <Leader>ft  :exe ':Tags ' . expand('<cword>')<CR>
+nnoremap <Leader>fT  :Tags<SPACE>
+nnoremap <Leader>fc  :BCommits<CR>
+nnoremap <Leader>fC  :Commits<CR>
+nnoremap <Leader>fh  :History:<CR>
+nnoremap <Leader>fH  :History/<CR>
+nnoremap <Leader>fm  :Commands<CR>
+nnoremap <Leader>fo  :Locate<SPACE>
+nnoremap <Leader>fk  :Maps<CR>
+nnoremap <Leader>f/  :Rg<CR>
+nnoremap <Leader>fs  :exe ':Rg ' . expand('<cword>')<CR>
+
+imap <C-x><C-w> <Plug>(fzf-complete-word)
+imap <C-x><C-p> <Plug>(fzf-complete-path)
+imap <C-x><C-f> <Plug>(fzf-complete-file)
+imap <C-x><C-l> <Plug>(fzf-complete-line)
diff --git a/nvim/.config/nvim/after/plugin/gitgutter.vim b/nvim/.config/nvim/after/plugin/gitgutter.vim
new file mode 100644
index 0000000..14897fc
--- /dev/null
+++ b/nvim/.config/nvim/after/plugin/gitgutter.vim
@@ -0,0 +1,11 @@
+nnoremap ]c :GitGutterNextHunk<CR>
+nnoremap [c :GitGutterPrevHunk<CR>
+nnoremap ghs :GitGutterStageHunk<CR>
+nnoremap ghu :GitGutterUndoHunk<CR>
+nnoremap ghp :GitGutterPreviewHunk<CR>
+nnoremap ghq :GitGutterQuickFix<CR>
+nnoremap ghf :GitGutterFold<CR>
+omap ih <Plug>(GitGutterTextObjectInnerPending)
+omap ah <Plug>(GitGutterTextObjectOuterPending)
+xmap ih <Plug>(GitGutterTextObjectInnerVisual)
+xmap ah <Plug>(GitGutterTextObjectOuterVisual)
diff --git a/nvim/.config/nvim/keymappings.vim b/nvim/.config/nvim/keymappings.vim
index fcba047..160c0d1 100644
--- a/nvim/.config/nvim/keymappings.vim
+++ b/nvim/.config/nvim/keymappings.vim
@@ -11,28 +11,6 @@ nnoremap Q <Nop>
 nnoremap <LocalLeader>b :Make<CR>
 nnoremap <LocalLeader>B :LMake<CR>
 
-" For Fuzzy
-nnoremap <Leader>b   :Buffers<CR>
-nnoremap <Leader>/   :GFiles?<CR>
-nnoremap <Leader>ff  :GFiles<CR>
-nnoremap <Leader>fF  :Files<CR>
-nnoremap <Leader>fL  :Lines<CR>
-nnoremap <Leader>fl  :BLines<CR>
-nnoremap <Leader>ft  :exe ':Tags ' . expand('<cword>')<CR>
-nnoremap <Leader>fT  :Tags<SPACE>
-nnoremap <Leader>fc  :BCommits<CR>
-nnoremap <Leader>fC  :Commits<CR>
-nnoremap <Leader>fh  :History:<CR>
-nnoremap <Leader>fH  :History/<CR>
-nnoremap <Leader>fm  :Commands<CR>
-nnoremap <Leader>fo  :Locate<SPACE>
-nnoremap <Leader>fk  :Maps<CR>
-nnoremap <Leader>f/  :Rg<CR>
-nnoremap <Leader>fs  :exe ':Rg ' . expand('<cword>')<CR>
-imap <C-x><C-w> <Plug>(fzf-complete-word)
-imap <C-x><C-p> <Plug>(fzf-complete-path)
-imap <C-x><C-f> <Plug>(fzf-complete-file)
-imap <C-x><C-l> <Plug>(fzf-complete-line)
 " Save
 nnoremap <Leader>w <Esc>:w<CR>
 " Search and Replace
@@ -59,18 +37,6 @@ nnoremap ]t :tNext<CR>
 nnoremap [T :tfirst<CR>
 nnoremap ]T :tlast<CR>
 nnoremap <Leader>ts :exec("tselect ".expand("<cword>"))<CR>
-" For git
-nnoremap ]c :GitGutterNextHunk<CR>
-nnoremap [c :GitGutterPrevHunk<CR>
-nnoremap ghs :GitGutterStageHunk<CR>
-nnoremap ghu :GitGutterUndoHunk<CR>
-nnoremap ghp :GitGutterPreviewHunk<CR>
-nnoremap ghq :GitGutterQuickFix<CR>
-nnoremap ghf :GitGutterFold<CR>
-omap ih <Plug>(GitGutterTextObjectInnerPending)
-omap ah <Plug>(GitGutterTextObjectOuterPending)
-xmap ih <Plug>(GitGutterTextObjectInnerVisual)
-xmap ah <Plug>(GitGutterTextObjectOuterVisual)
 " For workspace
 nnoremap <Leader>ps :ToggleWorkspace<CR>
 " Quickfix & Location list mappings