diff --git a/etc/soft/vim/vim/+ftplugin/c.vim b/etc/soft/nvim/+ftplugin/c.vim
similarity index 100%
rename from etc/soft/vim/vim/+ftplugin/c.vim
rename to etc/soft/nvim/+ftplugin/c.vim
diff --git a/etc/soft/vim/vim/+ftplugin/cpp.vim b/etc/soft/nvim/+ftplugin/cpp.vim
similarity index 100%
rename from etc/soft/vim/vim/+ftplugin/cpp.vim
rename to etc/soft/nvim/+ftplugin/cpp.vim
diff --git a/etc/soft/vim/vim/+ftplugin/dockerfile.vim b/etc/soft/nvim/+ftplugin/dockerfile.vim
similarity index 100%
rename from etc/soft/vim/vim/+ftplugin/dockerfile.vim
rename to etc/soft/nvim/+ftplugin/dockerfile.vim
diff --git a/etc/soft/vim/vim/+ftplugin/erlang.vim b/etc/soft/nvim/+ftplugin/erlang.vim
similarity index 100%
rename from etc/soft/vim/vim/+ftplugin/erlang.vim
rename to etc/soft/nvim/+ftplugin/erlang.vim
diff --git a/etc/soft/vim/vim/+ftplugin/go.vim b/etc/soft/nvim/+ftplugin/go.vim
similarity index 100%
rename from etc/soft/vim/vim/+ftplugin/go.vim
rename to etc/soft/nvim/+ftplugin/go.vim
diff --git a/etc/soft/vim/vim/+ftplugin/graphviz.vim b/etc/soft/nvim/+ftplugin/graphviz.vim
similarity index 100%
rename from etc/soft/vim/vim/+ftplugin/graphviz.vim
rename to etc/soft/nvim/+ftplugin/graphviz.vim
diff --git a/etc/soft/vim/vim/+ftplugin/haskell.vim b/etc/soft/nvim/+ftplugin/haskell.vim
similarity index 100%
rename from etc/soft/vim/vim/+ftplugin/haskell.vim
rename to etc/soft/nvim/+ftplugin/haskell.vim
diff --git a/etc/soft/vim/vim/+ftplugin/html.vim b/etc/soft/nvim/+ftplugin/html.vim
similarity index 100%
rename from etc/soft/vim/vim/+ftplugin/html.vim
rename to etc/soft/nvim/+ftplugin/html.vim
diff --git a/etc/soft/vim/vim/+ftplugin/install.sh b/etc/soft/nvim/+ftplugin/install.sh
similarity index 100%
rename from etc/soft/vim/vim/+ftplugin/install.sh
rename to etc/soft/nvim/+ftplugin/install.sh
diff --git a/etc/soft/vim/vim/+ftplugin/lisp.vim b/etc/soft/nvim/+ftplugin/lisp.vim
similarity index 100%
rename from etc/soft/vim/vim/+ftplugin/lisp.vim
rename to etc/soft/nvim/+ftplugin/lisp.vim
diff --git a/etc/soft/vim/vim/+ftplugin/markdown.vim b/etc/soft/nvim/+ftplugin/markdown.vim
similarity index 100%
rename from etc/soft/vim/vim/+ftplugin/markdown.vim
rename to etc/soft/nvim/+ftplugin/markdown.vim
diff --git a/etc/soft/vim/vim/+ftplugin/ocaml.vim b/etc/soft/nvim/+ftplugin/ocaml.vim
similarity index 100%
rename from etc/soft/vim/vim/+ftplugin/ocaml.vim
rename to etc/soft/nvim/+ftplugin/ocaml.vim
diff --git a/etc/soft/vim/vim/+ftplugin/pascal.vim b/etc/soft/nvim/+ftplugin/pascal.vim
similarity index 100%
rename from etc/soft/vim/vim/+ftplugin/pascal.vim
rename to etc/soft/nvim/+ftplugin/pascal.vim
diff --git a/etc/soft/vim/vim/+ftplugin/perl.vim b/etc/soft/nvim/+ftplugin/perl.vim
similarity index 100%
rename from etc/soft/vim/vim/+ftplugin/perl.vim
rename to etc/soft/nvim/+ftplugin/perl.vim
diff --git a/etc/soft/vim/vim/+ftplugin/prolog.vim b/etc/soft/nvim/+ftplugin/prolog.vim
similarity index 100%
rename from etc/soft/vim/vim/+ftplugin/prolog.vim
rename to etc/soft/nvim/+ftplugin/prolog.vim
diff --git a/etc/soft/vim/vim/+ftplugin/racket.vim b/etc/soft/nvim/+ftplugin/racket.vim
similarity index 100%
rename from etc/soft/vim/vim/+ftplugin/racket.vim
rename to etc/soft/nvim/+ftplugin/racket.vim
diff --git a/etc/soft/vim/vim/+ftplugin/rename.vim b/etc/soft/nvim/+ftplugin/rename.vim
similarity index 100%
rename from etc/soft/vim/vim/+ftplugin/rename.vim
rename to etc/soft/nvim/+ftplugin/rename.vim
diff --git a/etc/soft/vim/vim/+ftplugin/scheme.vim b/etc/soft/nvim/+ftplugin/scheme.vim
similarity index 100%
rename from etc/soft/vim/vim/+ftplugin/scheme.vim
rename to etc/soft/nvim/+ftplugin/scheme.vim
diff --git a/etc/soft/vim/vim/+ftplugin/sh.vim b/etc/soft/nvim/+ftplugin/sh.vim
similarity index 100%
rename from etc/soft/vim/vim/+ftplugin/sh.vim
rename to etc/soft/nvim/+ftplugin/sh.vim
diff --git a/etc/soft/vim/vim/+ftplugin/tcl.vim b/etc/soft/nvim/+ftplugin/tcl.vim
similarity index 100%
rename from etc/soft/vim/vim/+ftplugin/tcl.vim
rename to etc/soft/nvim/+ftplugin/tcl.vim
diff --git a/etc/soft/vim/vim/+ftplugin/tex.vim b/etc/soft/nvim/+ftplugin/tex.vim
similarity index 100%
rename from etc/soft/vim/vim/+ftplugin/tex.vim
rename to etc/soft/nvim/+ftplugin/tex.vim
diff --git a/etc/soft/vim/vim/+ftplugin/vb.vim b/etc/soft/nvim/+ftplugin/vb.vim
similarity index 100%
rename from etc/soft/vim/vim/+ftplugin/vb.vim
rename to etc/soft/nvim/+ftplugin/vb.vim
diff --git a/etc/soft/vim/vim/+ftplugin/vimwiki.vim b/etc/soft/nvim/+ftplugin/vimwiki.vim
similarity index 100%
rename from etc/soft/vim/vim/+ftplugin/vimwiki.vim
rename to etc/soft/nvim/+ftplugin/vimwiki.vim
diff --git a/etc/soft/vim/vim/+layouts/greek.vim b/etc/soft/nvim/+layouts/greek.vim
similarity index 100%
rename from etc/soft/vim/vim/+layouts/greek.vim
rename to etc/soft/nvim/+layouts/greek.vim
diff --git a/etc/soft/vim/vim/+layouts/russian.vim b/etc/soft/nvim/+layouts/russian.vim
similarity index 100%
rename from etc/soft/vim/vim/+layouts/russian.vim
rename to etc/soft/nvim/+layouts/russian.vim
diff --git a/etc/soft/vim/vim/+omnicompletion/tcl/TclCompletion.vim b/etc/soft/nvim/+omnicompletion/tcl/TclCompletion.vim
similarity index 100%
rename from etc/soft/vim/vim/+omnicompletion/tcl/TclCompletion.vim
rename to etc/soft/nvim/+omnicompletion/tcl/TclCompletion.vim
diff --git a/etc/soft/vim/vim/+plugins/MRU/plugin/mru.vim b/etc/soft/nvim/+plugins/MRU/plugin/mru.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/MRU/plugin/mru.vim
rename to etc/soft/nvim/+plugins/MRU/plugin/mru.vim
diff --git a/etc/soft/vim/vim/+plugins/ansible-vim/LICENSE b/etc/soft/nvim/+plugins/ansible-vim/LICENSE
similarity index 100%
rename from etc/soft/vim/vim/+plugins/ansible-vim/LICENSE
rename to etc/soft/nvim/+plugins/ansible-vim/LICENSE
diff --git a/etc/soft/vim/vim/+plugins/ansible-vim/README.md b/etc/soft/nvim/+plugins/ansible-vim/README.md
similarity index 100%
rename from etc/soft/vim/vim/+plugins/ansible-vim/README.md
rename to etc/soft/nvim/+plugins/ansible-vim/README.md
diff --git a/etc/soft/vim/vim/+plugins/ansible-vim/UltiSnips/.gitignore b/etc/soft/nvim/+plugins/ansible-vim/UltiSnips/.gitignore
similarity index 100%
rename from etc/soft/vim/vim/+plugins/ansible-vim/UltiSnips/.gitignore
rename to etc/soft/nvim/+plugins/ansible-vim/UltiSnips/.gitignore
diff --git a/etc/soft/vim/vim/+plugins/ansible-vim/UltiSnips/README.md b/etc/soft/nvim/+plugins/ansible-vim/UltiSnips/README.md
similarity index 100%
rename from etc/soft/vim/vim/+plugins/ansible-vim/UltiSnips/README.md
rename to etc/soft/nvim/+plugins/ansible-vim/UltiSnips/README.md
diff --git a/etc/soft/vim/vim/+plugins/ansible-vim/UltiSnips/generate.py b/etc/soft/nvim/+plugins/ansible-vim/UltiSnips/generate.py
similarity index 100%
rename from etc/soft/vim/vim/+plugins/ansible-vim/UltiSnips/generate.py
rename to etc/soft/nvim/+plugins/ansible-vim/UltiSnips/generate.py
diff --git a/etc/soft/vim/vim/+plugins/ansible-vim/ftdetect/ansible.vim b/etc/soft/nvim/+plugins/ansible-vim/ftdetect/ansible.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/ansible-vim/ftdetect/ansible.vim
rename to etc/soft/nvim/+plugins/ansible-vim/ftdetect/ansible.vim
diff --git a/etc/soft/vim/vim/+plugins/ansible-vim/ftplugin/ansible.vim b/etc/soft/nvim/+plugins/ansible-vim/ftplugin/ansible.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/ansible-vim/ftplugin/ansible.vim
rename to etc/soft/nvim/+plugins/ansible-vim/ftplugin/ansible.vim
diff --git a/etc/soft/vim/vim/+plugins/ansible-vim/ftplugin/ansible_hosts.vim b/etc/soft/nvim/+plugins/ansible-vim/ftplugin/ansible_hosts.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/ansible-vim/ftplugin/ansible_hosts.vim
rename to etc/soft/nvim/+plugins/ansible-vim/ftplugin/ansible_hosts.vim
diff --git a/etc/soft/vim/vim/+plugins/ansible-vim/indent/ansible.vim b/etc/soft/nvim/+plugins/ansible-vim/indent/ansible.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/ansible-vim/indent/ansible.vim
rename to etc/soft/nvim/+plugins/ansible-vim/indent/ansible.vim
diff --git a/etc/soft/vim/vim/+plugins/ansible-vim/syntax/ansible.vim b/etc/soft/nvim/+plugins/ansible-vim/syntax/ansible.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/ansible-vim/syntax/ansible.vim
rename to etc/soft/nvim/+plugins/ansible-vim/syntax/ansible.vim
diff --git a/etc/soft/vim/vim/+plugins/ansible-vim/syntax/ansible_hosts.vim b/etc/soft/nvim/+plugins/ansible-vim/syntax/ansible_hosts.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/ansible-vim/syntax/ansible_hosts.vim
rename to etc/soft/nvim/+plugins/ansible-vim/syntax/ansible_hosts.vim
diff --git a/etc/soft/vim/vim/+plugins/ansible-vim/syntax/jinja2.vim b/etc/soft/nvim/+plugins/ansible-vim/syntax/jinja2.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/ansible-vim/syntax/jinja2.vim
rename to etc/soft/nvim/+plugins/ansible-vim/syntax/jinja2.vim
diff --git a/etc/soft/vim/vim/+plugins/ansible-vim/syntax/jinja2.vim_LICENSE b/etc/soft/nvim/+plugins/ansible-vim/syntax/jinja2.vim_LICENSE
similarity index 100%
rename from etc/soft/vim/vim/+plugins/ansible-vim/syntax/jinja2.vim_LICENSE
rename to etc/soft/nvim/+plugins/ansible-vim/syntax/jinja2.vim_LICENSE
diff --git a/etc/soft/vim/vim/+plugins/autoloadTemplate/plugin/autoloadTemplate.vim b/etc/soft/nvim/+plugins/autoloadTemplate/plugin/autoloadTemplate.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/autoloadTemplate/plugin/autoloadTemplate.vim
rename to etc/soft/nvim/+plugins/autoloadTemplate/plugin/autoloadTemplate.vim
diff --git a/etc/soft/vim/vim/+plugins/calendar/autoload/calendar.vim b/etc/soft/nvim/+plugins/calendar/autoload/calendar.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/calendar/autoload/calendar.vim
rename to etc/soft/nvim/+plugins/calendar/autoload/calendar.vim
diff --git a/etc/soft/vim/vim/+plugins/calendar/doc/calendar.txt b/etc/soft/nvim/+plugins/calendar/doc/calendar.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins/calendar/doc/calendar.txt
rename to etc/soft/nvim/+plugins/calendar/doc/calendar.txt
diff --git a/etc/soft/vim/vim/+plugins/calendar/plugin/calendar.vim b/etc/soft/nvim/+plugins/calendar/plugin/calendar.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/calendar/plugin/calendar.vim
rename to etc/soft/nvim/+plugins/calendar/plugin/calendar.vim
diff --git a/etc/soft/vim/vim/+plugins/cheat.sh-vim/Licence.txt b/etc/soft/nvim/+plugins/cheat.sh-vim/Licence.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins/cheat.sh-vim/Licence.txt
rename to etc/soft/nvim/+plugins/cheat.sh-vim/Licence.txt
diff --git a/etc/soft/vim/vim/+plugins/cheat.sh-vim/Readme.md b/etc/soft/nvim/+plugins/cheat.sh-vim/Readme.md
similarity index 100%
rename from etc/soft/vim/vim/+plugins/cheat.sh-vim/Readme.md
rename to etc/soft/nvim/+plugins/cheat.sh-vim/Readme.md
diff --git a/etc/soft/vim/vim/+plugins/cheat.sh-vim/autoload/cheat.vim b/etc/soft/nvim/+plugins/cheat.sh-vim/autoload/cheat.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/cheat.sh-vim/autoload/cheat.vim
rename to etc/soft/nvim/+plugins/cheat.sh-vim/autoload/cheat.vim
diff --git a/etc/soft/vim/vim/+plugins/cheat.sh-vim/autoload/cheat/frameworks.vim b/etc/soft/nvim/+plugins/cheat.sh-vim/autoload/cheat/frameworks.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/cheat.sh-vim/autoload/cheat/frameworks.vim
rename to etc/soft/nvim/+plugins/cheat.sh-vim/autoload/cheat/frameworks.vim
diff --git a/etc/soft/vim/vim/+plugins/cheat.sh-vim/autoload/cheat/providers.vim b/etc/soft/nvim/+plugins/cheat.sh-vim/autoload/cheat/providers.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/cheat.sh-vim/autoload/cheat/providers.vim
rename to etc/soft/nvim/+plugins/cheat.sh-vim/autoload/cheat/providers.vim
diff --git a/etc/soft/vim/vim/+plugins/cheat.sh-vim/autoload/cheat/providers/quickfix.vim b/etc/soft/nvim/+plugins/cheat.sh-vim/autoload/cheat/providers/quickfix.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/cheat.sh-vim/autoload/cheat/providers/quickfix.vim
rename to etc/soft/nvim/+plugins/cheat.sh-vim/autoload/cheat/providers/quickfix.vim
diff --git a/etc/soft/vim/vim/+plugins/cheat.sh-vim/autoload/cheat/providers/syntastic.vim b/etc/soft/nvim/+plugins/cheat.sh-vim/autoload/cheat/providers/syntastic.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/cheat.sh-vim/autoload/cheat/providers/syntastic.vim
rename to etc/soft/nvim/+plugins/cheat.sh-vim/autoload/cheat/providers/syntastic.vim
diff --git a/etc/soft/vim/vim/+plugins/cheat.sh-vim/autoload/cheat/requests.vim b/etc/soft/nvim/+plugins/cheat.sh-vim/autoload/cheat/requests.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/cheat.sh-vim/autoload/cheat/requests.vim
rename to etc/soft/nvim/+plugins/cheat.sh-vim/autoload/cheat/requests.vim
diff --git a/etc/soft/vim/vim/+plugins/cheat.sh-vim/autoload/cheat/session.vim b/etc/soft/nvim/+plugins/cheat.sh-vim/autoload/cheat/session.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/cheat.sh-vim/autoload/cheat/session.vim
rename to etc/soft/nvim/+plugins/cheat.sh-vim/autoload/cheat/session.vim
diff --git a/etc/soft/vim/vim/+plugins/cheat.sh-vim/doc/cheat.txt b/etc/soft/nvim/+plugins/cheat.sh-vim/doc/cheat.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins/cheat.sh-vim/doc/cheat.txt
rename to etc/soft/nvim/+plugins/cheat.sh-vim/doc/cheat.txt
diff --git a/etc/soft/vim/vim/+plugins/cheat.sh-vim/plugin/cheat.vim b/etc/soft/nvim/+plugins/cheat.sh-vim/plugin/cheat.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/cheat.sh-vim/plugin/cheat.vim
rename to etc/soft/nvim/+plugins/cheat.sh-vim/plugin/cheat.vim
diff --git a/etc/soft/vim/vim/+plugins/cheat.sh-vim/scripts/chtpager.sh b/etc/soft/nvim/+plugins/cheat.sh-vim/scripts/chtpager.sh
similarity index 100%
rename from etc/soft/vim/vim/+plugins/cheat.sh-vim/scripts/chtpager.sh
rename to etc/soft/nvim/+plugins/cheat.sh-vim/scripts/chtpager.sh
diff --git a/etc/soft/vim/vim/+plugins/cmdline_increment/plugin/cmdline-increment.vim b/etc/soft/nvim/+plugins/cmdline_increment/plugin/cmdline-increment.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/cmdline_increment/plugin/cmdline-increment.vim
rename to etc/soft/nvim/+plugins/cmdline_increment/plugin/cmdline-increment.vim
diff --git a/etc/soft/vim/vim/+plugins/commentToggle/plugin/commentToggle.patch b/etc/soft/nvim/+plugins/commentToggle/plugin/commentToggle.patch
similarity index 100%
rename from etc/soft/vim/vim/+plugins/commentToggle/plugin/commentToggle.patch
rename to etc/soft/nvim/+plugins/commentToggle/plugin/commentToggle.patch
diff --git a/etc/soft/vim/vim/+plugins/commentToggle/plugin/commentToggle.vim b/etc/soft/nvim/+plugins/commentToggle/plugin/commentToggle.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/commentToggle/plugin/commentToggle.vim
rename to etc/soft/nvim/+plugins/commentToggle/plugin/commentToggle.vim
diff --git a/etc/soft/vim/vim/+plugins/delimitMate/Makefile b/etc/soft/nvim/+plugins/delimitMate/Makefile
similarity index 100%
rename from etc/soft/vim/vim/+plugins/delimitMate/Makefile
rename to etc/soft/nvim/+plugins/delimitMate/Makefile
diff --git a/etc/soft/vim/vim/+plugins/delimitMate/README.md b/etc/soft/nvim/+plugins/delimitMate/README.md
similarity index 100%
rename from etc/soft/vim/vim/+plugins/delimitMate/README.md
rename to etc/soft/nvim/+plugins/delimitMate/README.md
diff --git a/etc/soft/vim/vim/+plugins/delimitMate/autoload/delimitMate.vim b/etc/soft/nvim/+plugins/delimitMate/autoload/delimitMate.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/delimitMate/autoload/delimitMate.vim
rename to etc/soft/nvim/+plugins/delimitMate/autoload/delimitMate.vim
diff --git a/etc/soft/vim/vim/+plugins/delimitMate/doc/delimitMate.txt b/etc/soft/nvim/+plugins/delimitMate/doc/delimitMate.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins/delimitMate/doc/delimitMate.txt
rename to etc/soft/nvim/+plugins/delimitMate/doc/delimitMate.txt
diff --git a/etc/soft/vim/vim/+plugins/delimitMate/plugin/delimitMate.vim b/etc/soft/nvim/+plugins/delimitMate/plugin/delimitMate.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/delimitMate/plugin/delimitMate.vim
rename to etc/soft/nvim/+plugins/delimitMate/plugin/delimitMate.vim
diff --git a/etc/soft/vim/vim/+plugins/delimitMate/test/README b/etc/soft/nvim/+plugins/delimitMate/test/README
similarity index 100%
rename from etc/soft/vim/vim/+plugins/delimitMate/test/README
rename to etc/soft/nvim/+plugins/delimitMate/test/README
diff --git a/etc/soft/vim/vim/+plugins/delimitMate/test/_setup.vim b/etc/soft/nvim/+plugins/delimitMate/test/_setup.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/delimitMate/test/_setup.vim
rename to etc/soft/nvim/+plugins/delimitMate/test/_setup.vim
diff --git a/etc/soft/vim/vim/+plugins/delimitMate/test/autoclose_matchpairs.txt b/etc/soft/nvim/+plugins/delimitMate/test/autoclose_matchpairs.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins/delimitMate/test/autoclose_matchpairs.txt
rename to etc/soft/nvim/+plugins/delimitMate/test/autoclose_matchpairs.txt
diff --git a/etc/soft/vim/vim/+plugins/delimitMate/test/autoclose_matchpairs.vim b/etc/soft/nvim/+plugins/delimitMate/test/autoclose_matchpairs.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/delimitMate/test/autoclose_matchpairs.vim
rename to etc/soft/nvim/+plugins/delimitMate/test/autoclose_matchpairs.vim
diff --git a/etc/soft/vim/vim/+plugins/delimitMate/test/autoclose_quotes.txt b/etc/soft/nvim/+plugins/delimitMate/test/autoclose_quotes.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins/delimitMate/test/autoclose_quotes.txt
rename to etc/soft/nvim/+plugins/delimitMate/test/autoclose_quotes.txt
diff --git a/etc/soft/vim/vim/+plugins/delimitMate/test/autoclose_quotes.vim b/etc/soft/nvim/+plugins/delimitMate/test/autoclose_quotes.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/delimitMate/test/autoclose_quotes.vim
rename to etc/soft/nvim/+plugins/delimitMate/test/autoclose_quotes.vim
diff --git a/etc/soft/vim/vim/+plugins/delimitMate/test/expand_cr.txt b/etc/soft/nvim/+plugins/delimitMate/test/expand_cr.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins/delimitMate/test/expand_cr.txt
rename to etc/soft/nvim/+plugins/delimitMate/test/expand_cr.txt
diff --git a/etc/soft/vim/vim/+plugins/delimitMate/test/expand_cr.vim b/etc/soft/nvim/+plugins/delimitMate/test/expand_cr.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/delimitMate/test/expand_cr.vim
rename to etc/soft/nvim/+plugins/delimitMate/test/expand_cr.vim
diff --git a/etc/soft/vim/vim/+plugins/delimitMate/test/expand_space.txt b/etc/soft/nvim/+plugins/delimitMate/test/expand_space.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins/delimitMate/test/expand_space.txt
rename to etc/soft/nvim/+plugins/delimitMate/test/expand_space.txt
diff --git a/etc/soft/vim/vim/+plugins/delimitMate/test/expand_space.vim b/etc/soft/nvim/+plugins/delimitMate/test/expand_space.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/delimitMate/test/expand_space.vim
rename to etc/soft/nvim/+plugins/delimitMate/test/expand_space.vim
diff --git a/etc/soft/vim/vim/+plugins/errormarker/doc/errormarker.txt b/etc/soft/nvim/+plugins/errormarker/doc/errormarker.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins/errormarker/doc/errormarker.txt
rename to etc/soft/nvim/+plugins/errormarker/doc/errormarker.txt
diff --git a/etc/soft/vim/vim/+plugins/errormarker/errormarker_origin.vim b/etc/soft/nvim/+plugins/errormarker/errormarker_origin.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/errormarker/errormarker_origin.vim
rename to etc/soft/nvim/+plugins/errormarker/errormarker_origin.vim
diff --git a/etc/soft/vim/vim/+plugins/errormarker/plugin/errormarker.vim b/etc/soft/nvim/+plugins/errormarker/plugin/errormarker.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/errormarker/plugin/errormarker.vim
rename to etc/soft/nvim/+plugins/errormarker/plugin/errormarker.vim
diff --git a/etc/soft/vim/vim/+plugins/filetype_completion/plugin/filetype-completion.vim b/etc/soft/nvim/+plugins/filetype_completion/plugin/filetype-completion.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/filetype_completion/plugin/filetype-completion.vim
rename to etc/soft/nvim/+plugins/filetype_completion/plugin/filetype-completion.vim
diff --git a/etc/soft/vim/vim/+plugins/goyo.vim/README.md b/etc/soft/nvim/+plugins/goyo.vim/README.md
similarity index 100%
rename from etc/soft/vim/vim/+plugins/goyo.vim/README.md
rename to etc/soft/nvim/+plugins/goyo.vim/README.md
diff --git a/etc/soft/vim/vim/+plugins/goyo.vim/autoload/goyo.vim b/etc/soft/nvim/+plugins/goyo.vim/autoload/goyo.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/goyo.vim/autoload/goyo.vim
rename to etc/soft/nvim/+plugins/goyo.vim/autoload/goyo.vim
diff --git a/etc/soft/vim/vim/+plugins/goyo.vim/doc/goyo.txt b/etc/soft/nvim/+plugins/goyo.vim/doc/goyo.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins/goyo.vim/doc/goyo.txt
rename to etc/soft/nvim/+plugins/goyo.vim/doc/goyo.txt
diff --git a/etc/soft/vim/vim/+plugins/goyo.vim/plugin/goyo.vim b/etc/soft/nvim/+plugins/goyo.vim/plugin/goyo.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/goyo.vim/plugin/goyo.vim
rename to etc/soft/nvim/+plugins/goyo.vim/plugin/goyo.vim
diff --git a/etc/soft/vim/vim/+plugins/help+src/plugin/help+src.vim b/etc/soft/nvim/+plugins/help+src/plugin/help+src.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/help+src/plugin/help+src.vim
rename to etc/soft/nvim/+plugins/help+src/plugin/help+src.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/Makefile b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/Makefile
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/Makefile
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/Makefile
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/README.md b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/README.md
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/README.md
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/README.md
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/after/syntax/coffee.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/after/syntax/coffee.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/after/syntax/coffee.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/after/syntax/coffee.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/after/syntax/html.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/after/syntax/html.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/after/syntax/html.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/after/syntax/html.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/after/syntax/javascript.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/after/syntax/javascript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/after/syntax/javascript.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/after/syntax/javascript.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/after/syntax/ls.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/after/syntax/ls.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/after/syntax/ls.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/after/syntax/ls.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/after/syntax/typescript.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/after/syntax/typescript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/after/syntax/typescript.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/after/syntax/typescript.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/jslibsyntax.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/jslibsyntax.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/jslibsyntax.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/jslibsyntax.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularjs.coffee.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularjs.coffee.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularjs.coffee.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularjs.coffee.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularjs.html.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularjs.html.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularjs.html.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularjs.html.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularjs.javascript.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularjs.javascript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularjs.javascript.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularjs.javascript.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularjs.ls.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularjs.ls.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularjs.ls.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularjs.ls.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularjs.typescript.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularjs.typescript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularjs.typescript.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularjs.typescript.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularui.html.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularui.html.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularui.html.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularui.html.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularuirouter.coffee.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularuirouter.coffee.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularuirouter.coffee.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularuirouter.coffee.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularuirouter.javascript.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularuirouter.javascript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularuirouter.javascript.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularuirouter.javascript.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularuirouter.ls.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularuirouter.ls.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularuirouter.ls.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularuirouter.ls.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularuirouter.typescript.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularuirouter.typescript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularuirouter.typescript.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/angularuirouter.typescript.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/backbone.coffee.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/backbone.coffee.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/backbone.coffee.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/backbone.coffee.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/backbone.javascript.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/backbone.javascript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/backbone.javascript.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/backbone.javascript.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/backbone.ls.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/backbone.ls.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/backbone.ls.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/backbone.ls.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/backbone.typescript.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/backbone.typescript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/backbone.typescript.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/backbone.typescript.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/chai.coffee.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/chai.coffee.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/chai.coffee.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/chai.coffee.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/chai.javascript.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/chai.javascript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/chai.javascript.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/chai.javascript.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/chai.ls.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/chai.ls.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/chai.ls.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/chai.ls.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/chai.typescript.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/chai.typescript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/chai.typescript.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/chai.typescript.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/flux.coffee.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/flux.coffee.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/flux.coffee.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/flux.coffee.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/flux.javascript.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/flux.javascript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/flux.javascript.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/flux.javascript.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/flux.ls.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/flux.ls.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/flux.ls.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/flux.ls.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/flux.typescript.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/flux.typescript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/flux.typescript.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/flux.typescript.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/handlebars.coffee.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/handlebars.coffee.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/handlebars.coffee.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/handlebars.coffee.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/handlebars.javascript.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/handlebars.javascript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/handlebars.javascript.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/handlebars.javascript.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/handlebars.ls.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/handlebars.ls.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/handlebars.ls.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/handlebars.ls.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/handlebars.typescript.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/handlebars.typescript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/handlebars.typescript.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/handlebars.typescript.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/jasmine.coffee.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/jasmine.coffee.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/jasmine.coffee.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/jasmine.coffee.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/jasmine.javascript.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/jasmine.javascript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/jasmine.javascript.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/jasmine.javascript.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/jasmine.ls.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/jasmine.ls.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/jasmine.ls.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/jasmine.ls.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/jasmine.typescript.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/jasmine.typescript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/jasmine.typescript.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/jasmine.typescript.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/jquery.coffee.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/jquery.coffee.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/jquery.coffee.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/jquery.coffee.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/jquery.javascript.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/jquery.javascript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/jquery.javascript.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/jquery.javascript.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/jquery.ls.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/jquery.ls.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/jquery.ls.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/jquery.ls.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/jquery.typescript.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/jquery.typescript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/jquery.typescript.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/jquery.typescript.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/postprocess.coffee.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/postprocess.coffee.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/postprocess.coffee.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/postprocess.coffee.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/postprocess.javascript.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/postprocess.javascript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/postprocess.javascript.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/postprocess.javascript.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/postprocess.ls.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/postprocess.ls.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/postprocess.ls.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/postprocess.ls.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/postprocess.typescript.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/postprocess.typescript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/postprocess.typescript.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/postprocess.typescript.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/prelude.coffee.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/prelude.coffee.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/prelude.coffee.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/prelude.coffee.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/prelude.javascript.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/prelude.javascript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/prelude.javascript.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/prelude.javascript.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/prelude.ls.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/prelude.ls.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/prelude.ls.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/prelude.ls.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/prelude.typescript.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/prelude.typescript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/prelude.typescript.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/prelude.typescript.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/react.coffee.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/react.coffee.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/react.coffee.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/react.coffee.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/react.javascript.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/react.javascript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/react.javascript.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/react.javascript.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/react.ls.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/react.ls.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/react.ls.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/react.ls.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/react.typescript.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/react.typescript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/react.typescript.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/react.typescript.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/requirejs.coffee.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/requirejs.coffee.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/requirejs.coffee.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/requirejs.coffee.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/requirejs.javascript.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/requirejs.javascript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/requirejs.javascript.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/requirejs.javascript.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/requirejs.ls.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/requirejs.ls.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/requirejs.ls.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/requirejs.ls.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/requirejs.typescript.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/requirejs.typescript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/requirejs.typescript.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/requirejs.typescript.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/sugar.coffee.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/sugar.coffee.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/sugar.coffee.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/sugar.coffee.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/sugar.javascript.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/sugar.javascript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/sugar.javascript.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/sugar.javascript.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/sugar.ls.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/sugar.ls.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/sugar.ls.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/sugar.ls.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/sugar.typescript.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/sugar.typescript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/sugar.typescript.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/sugar.typescript.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/underscore.coffee.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/underscore.coffee.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/underscore.coffee.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/underscore.coffee.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/underscore.javascript.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/underscore.javascript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/underscore.javascript.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/underscore.javascript.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/underscore.ls.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/underscore.ls.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/underscore.ls.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/underscore.ls.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/underscore.typescript.vim b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/underscore.typescript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/underscore.typescript.vim
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/underscore.typescript.vim
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/update.sh b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/update.sh
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/update.sh
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/autoload/syntax/update.sh
diff --git a/etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/config.mk b/etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/config.mk
similarity index 100%
rename from etc/soft/vim/vim/+plugins/javascript-libraries-syntax.vim/config.mk
rename to etc/soft/nvim/+plugins/javascript-libraries-syntax.vim/config.mk
diff --git a/etc/soft/vim/vim/+plugins/look-up/README.md b/etc/soft/nvim/+plugins/look-up/README.md
similarity index 100%
rename from etc/soft/vim/vim/+plugins/look-up/README.md
rename to etc/soft/nvim/+plugins/look-up/README.md
diff --git a/etc/soft/vim/vim/+plugins/look-up/look-up.png b/etc/soft/nvim/+plugins/look-up/look-up.png
similarity index 100%
rename from etc/soft/vim/vim/+plugins/look-up/look-up.png
rename to etc/soft/nvim/+plugins/look-up/look-up.png
diff --git a/etc/soft/vim/vim/+plugins/look-up/plugin/look-up.vim b/etc/soft/nvim/+plugins/look-up/plugin/look-up.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/look-up/plugin/look-up.vim
rename to etc/soft/nvim/+plugins/look-up/plugin/look-up.vim
diff --git a/etc/soft/vim/vim/+plugins/look-up/syntax/dict.vim b/etc/soft/nvim/+plugins/look-up/syntax/dict.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/look-up/syntax/dict.vim
rename to etc/soft/nvim/+plugins/look-up/syntax/dict.vim
diff --git a/etc/soft/vim/vim/+plugins/matchit/doc/matchit.txt b/etc/soft/nvim/+plugins/matchit/doc/matchit.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins/matchit/doc/matchit.txt
rename to etc/soft/nvim/+plugins/matchit/doc/matchit.txt
diff --git a/etc/soft/vim/vim/+plugins/matchit/plugin/matchit.vim b/etc/soft/nvim/+plugins/matchit/plugin/matchit.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/matchit/plugin/matchit.vim
rename to etc/soft/nvim/+plugins/matchit/plugin/matchit.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/.circleci/config.yml b/etc/soft/nvim/+plugins/neomake/.circleci/config.yml
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/.circleci/config.yml
rename to etc/soft/nvim/+plugins/neomake/.circleci/config.yml
diff --git a/etc/soft/vim/vim/+plugins/neomake/.coveragerc b/etc/soft/nvim/+plugins/neomake/.coveragerc
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/.coveragerc
rename to etc/soft/nvim/+plugins/neomake/.coveragerc
diff --git a/etc/soft/vim/vim/+plugins/neomake/.dockerignore b/etc/soft/nvim/+plugins/neomake/.dockerignore
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/.dockerignore
rename to etc/soft/nvim/+plugins/neomake/.dockerignore
diff --git a/etc/soft/vim/vim/+plugins/neomake/.vintrc.yaml b/etc/soft/nvim/+plugins/neomake/.vintrc.yaml
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/.vintrc.yaml
rename to etc/soft/nvim/+plugins/neomake/.vintrc.yaml
diff --git a/etc/soft/vim/vim/+plugins/neomake/Dockerfile.tests b/etc/soft/nvim/+plugins/neomake/Dockerfile.tests
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/Dockerfile.tests
rename to etc/soft/nvim/+plugins/neomake/Dockerfile.tests
diff --git a/etc/soft/vim/vim/+plugins/neomake/LICENSE b/etc/soft/nvim/+plugins/neomake/LICENSE
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/LICENSE
rename to etc/soft/nvim/+plugins/neomake/LICENSE
diff --git a/etc/soft/vim/vim/+plugins/neomake/Makefile b/etc/soft/nvim/+plugins/neomake/Makefile
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/Makefile
rename to etc/soft/nvim/+plugins/neomake/Makefile
diff --git a/etc/soft/vim/vim/+plugins/neomake/README.md b/etc/soft/nvim/+plugins/neomake/README.md
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/README.md
rename to etc/soft/nvim/+plugins/neomake/README.md
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/action_queue.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/action_queue.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/action_queue.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/action_queue.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/cmd.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/cmd.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/cmd.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/cmd.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/compat.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/compat.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/compat.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/compat.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/config.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/config.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/config.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/config.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/configure.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/configure.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/configure.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/configure.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/core.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/core.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/core.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/core.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/debug.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/debug.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/debug.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/debug.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/highlights.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/highlights.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/highlights.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/highlights.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/jobinfo.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/jobinfo.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/jobinfo.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/jobinfo.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/list.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/list.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/list.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/list.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/log.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/log.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/log.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/log.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/cabal.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/cabal.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/cabal.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/cabal.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/clippy.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/clippy.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/clippy.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/clippy.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/ada.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/ada.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/ada.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/ada.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/angular.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/angular.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/angular.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/angular.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/ansible.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/ansible.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/ansible.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/ansible.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/apiblueprint.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/apiblueprint.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/apiblueprint.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/apiblueprint.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/applescript.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/applescript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/applescript.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/applescript.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/asciidoc.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/asciidoc.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/asciidoc.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/asciidoc.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/beancount.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/beancount.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/beancount.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/beancount.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/bib.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/bib.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/bib.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/bib.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/c.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/c.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/c.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/c.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/cf3.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/cf3.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/cf3.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/cf3.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/chef.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/chef.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/chef.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/chef.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/coffee.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/coffee.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/coffee.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/coffee.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/cpp.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/cpp.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/cpp.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/cpp.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/crystal.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/crystal.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/crystal.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/crystal.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/cs.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/cs.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/cs.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/cs.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/css.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/css.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/css.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/css.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/cuda.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/cuda.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/cuda.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/cuda.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/d.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/d.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/d.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/d.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/docbk.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/docbk.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/docbk.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/docbk.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/dockerfile.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/dockerfile.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/dockerfile.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/dockerfile.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/elixir.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/elixir.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/elixir.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/elixir.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/elm.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/elm.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/elm.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/elm.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/erlang.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/erlang.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/erlang.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/erlang.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/fish.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/fish.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/fish.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/fish.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/fortran.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/fortran.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/fortran.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/fortran.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/go.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/go.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/go.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/go.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/haml.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/haml.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/haml.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/haml.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/haskell.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/haskell.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/haskell.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/haskell.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/haxe.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/haxe.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/haxe.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/haxe.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/help.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/help.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/help.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/help.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/html.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/html.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/html.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/html.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/idris.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/idris.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/idris.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/idris.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/jade.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/jade.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/jade.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/jade.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/jasmine.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/jasmine.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/jasmine.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/jasmine.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/java.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/java.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/java.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/java.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/java/classpath.gradle b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/java/classpath.gradle
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/java/classpath.gradle
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/java/classpath.gradle
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/java/classpath.py b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/java/classpath.py
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/java/classpath.py
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/java/classpath.py
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/javascript.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/javascript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/javascript.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/javascript.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/json.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/json.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/json.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/json.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/jsx.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/jsx.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/jsx.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/jsx.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/julia.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/julia.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/julia.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/julia.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/kotlin.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/kotlin.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/kotlin.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/kotlin.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/less.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/less.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/less.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/less.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/lex.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/lex.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/lex.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/lex.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/lua.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/lua.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/lua.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/lua.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/mail.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/mail.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/mail.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/mail.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/markdown.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/markdown.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/markdown.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/markdown.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/matlab.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/matlab.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/matlab.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/matlab.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/moon.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/moon.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/moon.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/moon.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/neomake_tests.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/neomake_tests.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/neomake_tests.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/neomake_tests.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/nim.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/nim.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/nim.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/nim.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/nix.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/nix.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/nix.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/nix.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/node.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/node.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/node.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/node.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/objc.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/objc.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/objc.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/objc.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/pandoc.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/pandoc.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/pandoc.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/pandoc.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/perl.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/perl.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/perl.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/perl.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/php.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/php.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/php.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/php.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/proto.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/proto.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/proto.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/proto.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/pug.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/pug.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/pug.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/pug.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/puppet.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/puppet.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/puppet.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/puppet.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/purescript.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/purescript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/purescript.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/purescript.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/python.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/python.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/python.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/python.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/python/compile.py b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/python/compile.py
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/python/compile.py
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/python/compile.py
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/r.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/r.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/r.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/r.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/racket.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/racket.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/racket.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/racket.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/rst.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/rst.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/rst.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/rst.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/ruby.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/ruby.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/ruby.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/ruby.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/rust.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/rust.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/rust.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/rust.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/scala.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/scala.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/scala.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/scala.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/scss.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/scss.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/scss.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/scss.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/serpent.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/serpent.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/serpent.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/serpent.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/sh.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/sh.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/sh.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/sh.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/slim.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/slim.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/slim.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/slim.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/sml.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/sml.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/sml.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/sml.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/solidity.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/solidity.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/solidity.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/solidity.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/spar.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/spar.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/spar.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/spar.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/spec.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/spec.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/spec.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/spec.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/sql.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/sql.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/sql.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/sql.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/stylus.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/stylus.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/stylus.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/stylus.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/swift.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/swift.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/swift.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/swift.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/tcl.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/tcl.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/tcl.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/tcl.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/tex.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/tex.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/tex.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/tex.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/text.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/text.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/text.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/text.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/toml.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/toml.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/toml.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/toml.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/tsx.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/tsx.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/tsx.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/tsx.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/typescript.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/typescript.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/typescript.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/typescript.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/verilog.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/verilog.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/verilog.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/verilog.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/vhdl.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/vhdl.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/vhdl.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/vhdl.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/vim.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/vim.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/vim.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/vim.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/vue.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/vue.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/vue.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/vue.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/xml.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/xml.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/xml.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/xml.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/xslt.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/xslt.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/xslt.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/xslt.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/yacc.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/yacc.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/yacc.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/yacc.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/yaml.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/yaml.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/yaml.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/yaml.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/zsh.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/zsh.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/ft/zsh.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/ft/zsh.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/gradle.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/gradle.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/gradle.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/gradle.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/mvn.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/mvn.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/mvn.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/mvn.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/sbt.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/sbt.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/makers/sbt.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/makers/sbt.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/postprocess.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/postprocess.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/postprocess.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/postprocess.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/quickfix.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/quickfix.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/quickfix.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/quickfix.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/setup.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/setup.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/setup.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/setup.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/signs.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/signs.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/signs.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/signs.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/statusline.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/statusline.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/statusline.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/statusline.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/utils.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/utils.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/utils.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/utils.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/autoload/neomake/virtualtext.vim b/etc/soft/nvim/+plugins/neomake/autoload/neomake/virtualtext.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/autoload/neomake/virtualtext.vim
rename to etc/soft/nvim/+plugins/neomake/autoload/neomake/virtualtext.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/contrib/highlight-log b/etc/soft/nvim/+plugins/neomake/contrib/highlight-log
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/contrib/highlight-log
rename to etc/soft/nvim/+plugins/neomake/contrib/highlight-log
diff --git a/etc/soft/vim/vim/+plugins/neomake/contrib/run-tests-watch b/etc/soft/nvim/+plugins/neomake/contrib/run-tests-watch
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/contrib/run-tests-watch
rename to etc/soft/nvim/+plugins/neomake/contrib/run-tests-watch
diff --git a/etc/soft/vim/vim/+plugins/neomake/contrib/vim-checks b/etc/soft/nvim/+plugins/neomake/contrib/vim-checks
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/contrib/vim-checks
rename to etc/soft/nvim/+plugins/neomake/contrib/vim-checks
diff --git a/etc/soft/vim/vim/+plugins/neomake/contrib/vimhelplint b/etc/soft/nvim/+plugins/neomake/contrib/vimhelplint
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/contrib/vimhelplint
rename to etc/soft/nvim/+plugins/neomake/contrib/vimhelplint
diff --git a/etc/soft/vim/vim/+plugins/neomake/doc/neomake.txt b/etc/soft/nvim/+plugins/neomake/doc/neomake.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/doc/neomake.txt
rename to etc/soft/nvim/+plugins/neomake/doc/neomake.txt
diff --git a/etc/soft/vim/vim/+plugins/neomake/plugin/neomake.vim b/etc/soft/nvim/+plugins/neomake/plugin/neomake.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/plugin/neomake.vim
rename to etc/soft/nvim/+plugins/neomake/plugin/neomake.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/syntax/neomake/python.vim b/etc/soft/nvim/+plugins/neomake/syntax/neomake/python.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/syntax/neomake/python.vim
rename to etc/soft/nvim/+plugins/neomake/syntax/neomake/python.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/syntax/neomake/qf.vim b/etc/soft/nvim/+plugins/neomake/syntax/neomake/qf.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/syntax/neomake/qf.vim
rename to etc/soft/nvim/+plugins/neomake/syntax/neomake/qf.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/syntax/qf.vim b/etc/soft/nvim/+plugins/neomake/syntax/qf.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/syntax/qf.vim
rename to etc/soft/nvim/+plugins/neomake/syntax/qf.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/action_queue.vader b/etc/soft/nvim/+plugins/neomake/tests/action_queue.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/action_queue.vader
rename to etc/soft/nvim/+plugins/neomake/tests/action_queue.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/all.vader b/etc/soft/nvim/+plugins/neomake/tests/all.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/all.vader
rename to etc/soft/nvim/+plugins/neomake/tests/all.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/args.vader b/etc/soft/nvim/+plugins/neomake/tests/args.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/args.vader
rename to etc/soft/nvim/+plugins/neomake/tests/args.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/automake.vader b/etc/soft/nvim/+plugins/neomake/tests/automake.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/automake.vader
rename to etc/soft/nvim/+plugins/neomake/tests/automake.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/cancellation.vader b/etc/soft/nvim/+plugins/neomake/tests/cancellation.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/cancellation.vader
rename to etc/soft/nvim/+plugins/neomake/tests/cancellation.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/clean.vader b/etc/soft/nvim/+plugins/neomake/tests/clean.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/clean.vader
rename to etc/soft/nvim/+plugins/neomake/tests/clean.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/cmd_neomakeinfo.vader b/etc/soft/nvim/+plugins/neomake/tests/cmd_neomakeinfo.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/cmd_neomakeinfo.vader
rename to etc/soft/nvim/+plugins/neomake/tests/cmd_neomakeinfo.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/compat.vader b/etc/soft/nvim/+plugins/neomake/tests/compat.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/compat.vader
rename to etc/soft/nvim/+plugins/neomake/tests/compat.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/completion.vader b/etc/soft/nvim/+plugins/neomake/tests/completion.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/completion.vader
rename to etc/soft/nvim/+plugins/neomake/tests/completion.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/config.vader b/etc/soft/nvim/+plugins/neomake/tests/config.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/config.vader
rename to etc/soft/nvim/+plugins/neomake/tests/config.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/current_error.vader b/etc/soft/nvim/+plugins/neomake/tests/current_error.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/current_error.vader
rename to etc/soft/nvim/+plugins/neomake/tests/current_error.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/customqf.vader b/etc/soft/nvim/+plugins/neomake/tests/customqf.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/customqf.vader
rename to etc/soft/nvim/+plugins/neomake/tests/customqf.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/cwd.vader b/etc/soft/nvim/+plugins/neomake/tests/cwd.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/cwd.vader
rename to etc/soft/nvim/+plugins/neomake/tests/cwd.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/debug.vader b/etc/soft/nvim/+plugins/neomake/tests/debug.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/debug.vader
rename to etc/soft/nvim/+plugins/neomake/tests/debug.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/env.vader b/etc/soft/nvim/+plugins/neomake/tests/env.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/env.vader
rename to etc/soft/nvim/+plugins/neomake/tests/env.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/errors.vader b/etc/soft/nvim/+plugins/neomake/tests/errors.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/errors.vader
rename to etc/soft/nvim/+plugins/neomake/tests/errors.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/filetypes.vader b/etc/soft/nvim/+plugins/neomake/tests/filetypes.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/filetypes.vader
rename to etc/soft/nvim/+plugins/neomake/tests/filetypes.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/filter_output.vader b/etc/soft/nvim/+plugins/neomake/tests/filter_output.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/filter_output.vader
rename to etc/soft/nvim/+plugins/neomake/tests/filter_output.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/a filename with spaces b/etc/soft/nvim/+plugins/neomake/tests/fixtures/a filename with spaces
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/a filename with spaces
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/a filename with spaces
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/errors.py b/etc/soft/nvim/+plugins/neomake/tests/fixtures/errors.py
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/errors.py
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/errors.py
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/errors.sh b/etc/soft/nvim/+plugins/neomake/tests/fixtures/errors.sh
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/errors.sh
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/errors.sh
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/input/puppet-lint/err_and_warn.pp b/etc/soft/nvim/+plugins/neomake/tests/fixtures/input/puppet-lint/err_and_warn.pp
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/input/puppet-lint/err_and_warn.pp
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/input/puppet-lint/err_and_warn.pp
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/input/puppet/syntax-error-eoi.pp b/etc/soft/nvim/+plugins/neomake/tests/fixtures/input/puppet/syntax-error-eoi.pp
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/input/puppet/syntax-error-eoi.pp
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/input/puppet/syntax-error-eoi.pp
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/input/puppet/syntax-error.pp b/etc/soft/nvim/+plugins/neomake/tests/fixtures/input/puppet/syntax-error.pp
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/input/puppet/syntax-error.pp
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/input/puppet/syntax-error.pp
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/input/xmllint/missingdtd.xml b/etc/soft/nvim/+plugins/neomake/tests/fixtures/input/xmllint/missingdtd.xml
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/input/xmllint/missingdtd.xml
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/input/xmllint/missingdtd.xml
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/input/xmllint/validity-error.xml b/etc/soft/nvim/+plugins/neomake/tests/fixtures/input/xmllint/validity-error.xml
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/input/xmllint/validity-error.xml
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/input/xmllint/validity-error.xml
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/puppet-lint/err_and_warn.pp.exitcode b/etc/soft/nvim/+plugins/neomake/tests/fixtures/output/puppet-lint/err_and_warn.pp.exitcode
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/puppet-lint/err_and_warn.pp.exitcode
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/output/puppet-lint/err_and_warn.pp.exitcode
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/puppet-lint/err_and_warn.pp.stderr b/etc/soft/nvim/+plugins/neomake/tests/fixtures/output/puppet-lint/err_and_warn.pp.stderr
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/puppet-lint/err_and_warn.pp.stderr
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/output/puppet-lint/err_and_warn.pp.stderr
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/puppet-lint/err_and_warn.pp.stdout b/etc/soft/nvim/+plugins/neomake/tests/fixtures/output/puppet-lint/err_and_warn.pp.stdout
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/puppet-lint/err_and_warn.pp.stdout
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/output/puppet-lint/err_and_warn.pp.stdout
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/puppet/syntax-error-eoi.pp.exitcode b/etc/soft/nvim/+plugins/neomake/tests/fixtures/output/puppet/syntax-error-eoi.pp.exitcode
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/puppet/syntax-error-eoi.pp.exitcode
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/output/puppet/syntax-error-eoi.pp.exitcode
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/puppet/syntax-error-eoi.pp.stderr b/etc/soft/nvim/+plugins/neomake/tests/fixtures/output/puppet/syntax-error-eoi.pp.stderr
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/puppet/syntax-error-eoi.pp.stderr
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/output/puppet/syntax-error-eoi.pp.stderr
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/puppet/syntax-error-eoi.pp.stdout b/etc/soft/nvim/+plugins/neomake/tests/fixtures/output/puppet/syntax-error-eoi.pp.stdout
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/puppet/syntax-error-eoi.pp.stdout
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/output/puppet/syntax-error-eoi.pp.stdout
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/puppet/syntax-error.pp.exitcode b/etc/soft/nvim/+plugins/neomake/tests/fixtures/output/puppet/syntax-error.pp.exitcode
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/puppet/syntax-error.pp.exitcode
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/output/puppet/syntax-error.pp.exitcode
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/puppet/syntax-error.pp.stderr b/etc/soft/nvim/+plugins/neomake/tests/fixtures/output/puppet/syntax-error.pp.stderr
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/puppet/syntax-error.pp.stderr
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/output/puppet/syntax-error.pp.stderr
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/puppet/syntax-error.pp.stdout b/etc/soft/nvim/+plugins/neomake/tests/fixtures/output/puppet/syntax-error.pp.stdout
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/puppet/syntax-error.pp.stdout
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/output/puppet/syntax-error.pp.stdout
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/xmllint/missingdtd.xml.exitcode b/etc/soft/nvim/+plugins/neomake/tests/fixtures/output/xmllint/missingdtd.xml.exitcode
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/xmllint/missingdtd.xml.exitcode
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/output/xmllint/missingdtd.xml.exitcode
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/xmllint/missingdtd.xml.stderr b/etc/soft/nvim/+plugins/neomake/tests/fixtures/output/xmllint/missingdtd.xml.stderr
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/xmllint/missingdtd.xml.stderr
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/output/xmllint/missingdtd.xml.stderr
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/xmllint/missingdtd.xml.stdout b/etc/soft/nvim/+plugins/neomake/tests/fixtures/output/xmllint/missingdtd.xml.stdout
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/xmllint/missingdtd.xml.stdout
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/output/xmllint/missingdtd.xml.stdout
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/xmllint/validity-error.xml.exitcode b/etc/soft/nvim/+plugins/neomake/tests/fixtures/output/xmllint/validity-error.xml.exitcode
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/xmllint/validity-error.xml.exitcode
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/output/xmllint/validity-error.xml.exitcode
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/xmllint/validity-error.xml.stderr b/etc/soft/nvim/+plugins/neomake/tests/fixtures/output/xmllint/validity-error.xml.stderr
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/xmllint/validity-error.xml.stderr
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/output/xmllint/validity-error.xml.stderr
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/xmllint/validity-error.xml.stdout b/etc/soft/nvim/+plugins/neomake/tests/fixtures/output/xmllint/validity-error.xml.stdout
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/xmllint/validity-error.xml.stdout
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/output/xmllint/validity-error.xml.stdout
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/zsh/parse-error.zsh.exitcode b/etc/soft/nvim/+plugins/neomake/tests/fixtures/output/zsh/parse-error.zsh.exitcode
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/zsh/parse-error.zsh.exitcode
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/output/zsh/parse-error.zsh.exitcode
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/zsh/parse-error.zsh.stderr b/etc/soft/nvim/+plugins/neomake/tests/fixtures/output/zsh/parse-error.zsh.stderr
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/zsh/parse-error.zsh.stderr
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/output/zsh/parse-error.zsh.stderr
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/zsh/parse-error.zsh.stdout b/etc/soft/nvim/+plugins/neomake/tests/fixtures/output/zsh/parse-error.zsh.stdout
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/output/zsh/parse-error.zsh.stdout
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/output/zsh/parse-error.zsh.stdout
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/rust/cargo_error.json b/etc/soft/nvim/+plugins/neomake/tests/fixtures/rust/cargo_error.json
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/rust/cargo_error.json
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/rust/cargo_error.json
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/rust/cargo_error_children.json b/etc/soft/nvim/+plugins/neomake/tests/fixtures/rust/cargo_error_children.json
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/rust/cargo_error_children.json
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/rust/cargo_error_children.json
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/rust/cargo_error_primary_span.json b/etc/soft/nvim/+plugins/neomake/tests/fixtures/rust/cargo_error_primary_span.json
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/rust/cargo_error_primary_span.json
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/rust/cargo_error_primary_span.json
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/rust/cargo_error_without_span.json b/etc/soft/nvim/+plugins/neomake/tests/fixtures/rust/cargo_error_without_span.json
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/rust/cargo_error_without_span.json
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/rust/cargo_error_without_span.json
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/rust/cargo_info.json b/etc/soft/nvim/+plugins/neomake/tests/fixtures/rust/cargo_info.json
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/rust/cargo_info.json
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/rust/cargo_info.json
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/rust/cargo_warning.json b/etc/soft/nvim/+plugins/neomake/tests/fixtures/rust/cargo_warning.json
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/rust/cargo_warning.json
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/rust/cargo_warning.json
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/rust/cargotest_with_failures b/etc/soft/nvim/+plugins/neomake/tests/fixtures/rust/cargotest_with_failures
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/rust/cargotest_with_failures
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/rust/cargotest_with_failures
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/vim/func-with-errors.vim b/etc/soft/nvim/+plugins/neomake/tests/fixtures/vim/func-with-errors.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/vim/func-with-errors.vim
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/vim/func-with-errors.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/vim/func-with-errors.vim.output b/etc/soft/nvim/+plugins/neomake/tests/fixtures/vim/func-with-errors.vim.output
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/vim/func-with-errors.vim.output
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/vim/func-with-errors.vim.output
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/fixtures/~ b/etc/soft/nvim/+plugins/neomake/tests/fixtures/~
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/fixtures/~
rename to etc/soft/nvim/+plugins/neomake/tests/fixtures/~
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/ft_asciidoc.vader b/etc/soft/nvim/+plugins/neomake/tests/ft_asciidoc.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/ft_asciidoc.vader
rename to etc/soft/nvim/+plugins/neomake/tests/ft_asciidoc.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/ft_cs.vader b/etc/soft/nvim/+plugins/neomake/tests/ft_cs.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/ft_cs.vader
rename to etc/soft/nvim/+plugins/neomake/tests/ft_cs.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/ft_css.vader b/etc/soft/nvim/+plugins/neomake/tests/ft_css.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/ft_css.vader
rename to etc/soft/nvim/+plugins/neomake/tests/ft_css.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/ft_elixir.vader b/etc/soft/nvim/+plugins/neomake/tests/ft_elixir.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/ft_elixir.vader
rename to etc/soft/nvim/+plugins/neomake/tests/ft_elixir.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/ft_elm.vader b/etc/soft/nvim/+plugins/neomake/tests/ft_elm.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/ft_elm.vader
rename to etc/soft/nvim/+plugins/neomake/tests/ft_elm.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/ft_erlang.vader b/etc/soft/nvim/+plugins/neomake/tests/ft_erlang.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/ft_erlang.vader
rename to etc/soft/nvim/+plugins/neomake/tests/ft_erlang.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/ft_go.vader b/etc/soft/nvim/+plugins/neomake/tests/ft_go.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/ft_go.vader
rename to etc/soft/nvim/+plugins/neomake/tests/ft_go.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/ft_haskell.vader b/etc/soft/nvim/+plugins/neomake/tests/ft_haskell.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/ft_haskell.vader
rename to etc/soft/nvim/+plugins/neomake/tests/ft_haskell.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/ft_html.vader b/etc/soft/nvim/+plugins/neomake/tests/ft_html.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/ft_html.vader
rename to etc/soft/nvim/+plugins/neomake/tests/ft_html.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/ft_idris.vader b/etc/soft/nvim/+plugins/neomake/tests/ft_idris.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/ft_idris.vader
rename to etc/soft/nvim/+plugins/neomake/tests/ft_idris.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/ft_javascript.vader b/etc/soft/nvim/+plugins/neomake/tests/ft_javascript.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/ft_javascript.vader
rename to etc/soft/nvim/+plugins/neomake/tests/ft_javascript.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/ft_markdown.vader b/etc/soft/nvim/+plugins/neomake/tests/ft_markdown.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/ft_markdown.vader
rename to etc/soft/nvim/+plugins/neomake/tests/ft_markdown.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/ft_perl.vader b/etc/soft/nvim/+plugins/neomake/tests/ft_perl.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/ft_perl.vader
rename to etc/soft/nvim/+plugins/neomake/tests/ft_perl.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/ft_php.vader b/etc/soft/nvim/+plugins/neomake/tests/ft_php.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/ft_php.vader
rename to etc/soft/nvim/+plugins/neomake/tests/ft_php.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/ft_puppet.vader b/etc/soft/nvim/+plugins/neomake/tests/ft_puppet.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/ft_puppet.vader
rename to etc/soft/nvim/+plugins/neomake/tests/ft_puppet.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/ft_purescript.vader b/etc/soft/nvim/+plugins/neomake/tests/ft_purescript.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/ft_purescript.vader
rename to etc/soft/nvim/+plugins/neomake/tests/ft_purescript.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/ft_python.vader b/etc/soft/nvim/+plugins/neomake/tests/ft_python.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/ft_python.vader
rename to etc/soft/nvim/+plugins/neomake/tests/ft_python.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/ft_rst.vader b/etc/soft/nvim/+plugins/neomake/tests/ft_rst.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/ft_rst.vader
rename to etc/soft/nvim/+plugins/neomake/tests/ft_rst.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/ft_rust.vader b/etc/soft/nvim/+plugins/neomake/tests/ft_rust.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/ft_rust.vader
rename to etc/soft/nvim/+plugins/neomake/tests/ft_rust.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/ft_sh.vader b/etc/soft/nvim/+plugins/neomake/tests/ft_sh.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/ft_sh.vader
rename to etc/soft/nvim/+plugins/neomake/tests/ft_sh.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/ft_sql.vader b/etc/soft/nvim/+plugins/neomake/tests/ft_sql.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/ft_sql.vader
rename to etc/soft/nvim/+plugins/neomake/tests/ft_sql.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/ft_text.vader b/etc/soft/nvim/+plugins/neomake/tests/ft_text.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/ft_text.vader
rename to etc/soft/nvim/+plugins/neomake/tests/ft_text.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/ft_typescript.vader b/etc/soft/nvim/+plugins/neomake/tests/ft_typescript.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/ft_typescript.vader
rename to etc/soft/nvim/+plugins/neomake/tests/ft_typescript.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/ft_vim.vader b/etc/soft/nvim/+plugins/neomake/tests/ft_vim.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/ft_vim.vader
rename to etc/soft/nvim/+plugins/neomake/tests/ft_vim.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/ft_xml.vader b/etc/soft/nvim/+plugins/neomake/tests/ft_xml.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/ft_xml.vader
rename to etc/soft/nvim/+plugins/neomake/tests/ft_xml.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/helpers/trap.sh b/etc/soft/nvim/+plugins/neomake/tests/helpers/trap.sh
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/helpers/trap.sh
rename to etc/soft/nvim/+plugins/neomake/tests/helpers/trap.sh
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/highlights.vader b/etc/soft/nvim/+plugins/neomake/tests/highlights.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/highlights.vader
rename to etc/soft/nvim/+plugins/neomake/tests/highlights.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/hooks-queue.vader b/etc/soft/nvim/+plugins/neomake/tests/hooks-queue.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/hooks-queue.vader
rename to etc/soft/nvim/+plugins/neomake/tests/hooks-queue.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/hooks.vader b/etc/soft/nvim/+plugins/neomake/tests/hooks.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/hooks.vader
rename to etc/soft/nvim/+plugins/neomake/tests/hooks.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/include/init.vim b/etc/soft/nvim/+plugins/neomake/tests/include/init.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/include/init.vim
rename to etc/soft/nvim/+plugins/neomake/tests/include/init.vim
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/include/setup.vader b/etc/soft/nvim/+plugins/neomake/tests/include/setup.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/include/setup.vader
rename to etc/soft/nvim/+plugins/neomake/tests/include/setup.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/integration.vader b/etc/soft/nvim/+plugins/neomake/tests/integration.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/integration.vader
rename to etc/soft/nvim/+plugins/neomake/tests/integration.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/isolated.vader b/etc/soft/nvim/+plugins/neomake/tests/isolated.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/isolated.vader
rename to etc/soft/nvim/+plugins/neomake/tests/isolated.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/isolated/compat-get_argv-on-emulated-windows.vader b/etc/soft/nvim/+plugins/neomake/tests/isolated/compat-get_argv-on-emulated-windows.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/isolated/compat-get_argv-on-emulated-windows.vader
rename to etc/soft/nvim/+plugins/neomake/tests/isolated/compat-get_argv-on-emulated-windows.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/isolated/completion-handles-throw.vader b/etc/soft/nvim/+plugins/neomake/tests/isolated/completion-handles-throw.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/isolated/completion-handles-throw.vader
rename to etc/soft/nvim/+plugins/neomake/tests/isolated/completion-handles-throw.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/isolated/configure.vader b/etc/soft/nvim/+plugins/neomake/tests/isolated/configure.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/isolated/configure.vader
rename to etc/soft/nvim/+plugins/neomake/tests/isolated/configure.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/isolated/customqf.vader b/etc/soft/nvim/+plugins/neomake/tests/isolated/customqf.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/isolated/customqf.vader
rename to etc/soft/nvim/+plugins/neomake/tests/isolated/customqf.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/isolated/ft_help.vader b/etc/soft/nvim/+plugins/neomake/tests/isolated/ft_help.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/isolated/ft_help.vader
rename to etc/soft/nvim/+plugins/neomake/tests/isolated/ft_help.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/isolated/ft_vim.vader b/etc/soft/nvim/+plugins/neomake/tests/isolated/ft_vim.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/isolated/ft_vim.vader
rename to etc/soft/nvim/+plugins/neomake/tests/isolated/ft_vim.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/isolated/highlights.vader b/etc/soft/nvim/+plugins/neomake/tests/isolated/highlights.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/isolated/highlights.vader
rename to etc/soft/nvim/+plugins/neomake/tests/isolated/highlights.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/isolated/logging.vader b/etc/soft/nvim/+plugins/neomake/tests/isolated/logging.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/isolated/logging.vader
rename to etc/soft/nvim/+plugins/neomake/tests/isolated/logging.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/isolated/modes.vader b/etc/soft/nvim/+plugins/neomake/tests/isolated/modes.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/isolated/modes.vader
rename to etc/soft/nvim/+plugins/neomake/tests/isolated/modes.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/isolated/resets-ignore_automake_events.vader b/etc/soft/nvim/+plugins/neomake/tests/isolated/resets-ignore_automake_events.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/isolated/resets-ignore_automake_events.vader
rename to etc/soft/nvim/+plugins/neomake/tests/isolated/resets-ignore_automake_events.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/isolated/sign-highlights.vader b/etc/soft/nvim/+plugins/neomake/tests/isolated/sign-highlights.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/isolated/sign-highlights.vader
rename to etc/soft/nvim/+plugins/neomake/tests/isolated/sign-highlights.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/isolated/signs.vader b/etc/soft/nvim/+plugins/neomake/tests/isolated/signs.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/isolated/signs.vader
rename to etc/soft/nvim/+plugins/neomake/tests/isolated/signs.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/isolated/statusline-highlights.vader b/etc/soft/nvim/+plugins/neomake/tests/isolated/statusline-highlights.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/isolated/statusline-highlights.vader
rename to etc/soft/nvim/+plugins/neomake/tests/isolated/statusline-highlights.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/isolated/tempfiles-cleanup.vader b/etc/soft/nvim/+plugins/neomake/tests/isolated/tempfiles-cleanup.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/isolated/tempfiles-cleanup.vader
rename to etc/soft/nvim/+plugins/neomake/tests/isolated/tempfiles-cleanup.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/jobinfo.vader b/etc/soft/nvim/+plugins/neomake/tests/jobinfo.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/jobinfo.vader
rename to etc/soft/nvim/+plugins/neomake/tests/jobinfo.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/json.vader b/etc/soft/nvim/+plugins/neomake/tests/json.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/json.vader
rename to etc/soft/nvim/+plugins/neomake/tests/json.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/list-entries.vader b/etc/soft/nvim/+plugins/neomake/tests/list-entries.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/list-entries.vader
rename to etc/soft/nvim/+plugins/neomake/tests/list-entries.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/list.vader b/etc/soft/nvim/+plugins/neomake/tests/list.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/list.vader
rename to etc/soft/nvim/+plugins/neomake/tests/list.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/lists.vader b/etc/soft/nvim/+plugins/neomake/tests/lists.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/lists.vader
rename to etc/soft/nvim/+plugins/neomake/tests/lists.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/log.vader b/etc/soft/nvim/+plugins/neomake/tests/log.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/log.vader
rename to etc/soft/nvim/+plugins/neomake/tests/log.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/main.vader b/etc/soft/nvim/+plugins/neomake/tests/main.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/main.vader
rename to etc/soft/nvim/+plugins/neomake/tests/main.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/makeprg.vader b/etc/soft/nvim/+plugins/neomake/tests/makeprg.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/makeprg.vader
rename to etc/soft/nvim/+plugins/neomake/tests/makeprg.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/maker_errors.vader b/etc/soft/nvim/+plugins/neomake/tests/maker_errors.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/maker_errors.vader
rename to etc/soft/nvim/+plugins/neomake/tests/maker_errors.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/makers.vader b/etc/soft/nvim/+plugins/neomake/tests/makers.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/makers.vader
rename to etc/soft/nvim/+plugins/neomake/tests/makers.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/mapexpr.vader b/etc/soft/nvim/+plugins/neomake/tests/mapexpr.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/mapexpr.vader
rename to etc/soft/nvim/+plugins/neomake/tests/mapexpr.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/postprocess.vader b/etc/soft/nvim/+plugins/neomake/tests/postprocess.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/postprocess.vader
rename to etc/soft/nvim/+plugins/neomake/tests/postprocess.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/processing.vader b/etc/soft/nvim/+plugins/neomake/tests/processing.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/processing.vader
rename to etc/soft/nvim/+plugins/neomake/tests/processing.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/serialize.vader b/etc/soft/nvim/+plugins/neomake/tests/serialize.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/serialize.vader
rename to etc/soft/nvim/+plugins/neomake/tests/serialize.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/signs.vader b/etc/soft/nvim/+plugins/neomake/tests/signs.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/signs.vader
rename to etc/soft/nvim/+plugins/neomake/tests/signs.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/statusline.vader b/etc/soft/nvim/+plugins/neomake/tests/statusline.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/statusline.vader
rename to etc/soft/nvim/+plugins/neomake/tests/statusline.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/stdin.vader b/etc/soft/nvim/+plugins/neomake/tests/stdin.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/stdin.vader
rename to etc/soft/nvim/+plugins/neomake/tests/stdin.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/tempfiles.vader b/etc/soft/nvim/+plugins/neomake/tests/tempfiles.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/tempfiles.vader
rename to etc/soft/nvim/+plugins/neomake/tests/tempfiles.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/toggle.vader b/etc/soft/nvim/+plugins/neomake/tests/toggle.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/toggle.vader
rename to etc/soft/nvim/+plugins/neomake/tests/toggle.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/utils.vader b/etc/soft/nvim/+plugins/neomake/tests/utils.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/utils.vader
rename to etc/soft/nvim/+plugins/neomake/tests/utils.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/utils_projectroot.vader b/etc/soft/nvim/+plugins/neomake/tests/utils_projectroot.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/utils_projectroot.vader
rename to etc/soft/nvim/+plugins/neomake/tests/utils_projectroot.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/verbosity.vader b/etc/soft/nvim/+plugins/neomake/tests/verbosity.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/verbosity.vader
rename to etc/soft/nvim/+plugins/neomake/tests/verbosity.vader
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/vim/vimrc b/etc/soft/nvim/+plugins/neomake/tests/vim/vimrc
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/vim/vimrc
rename to etc/soft/nvim/+plugins/neomake/tests/vim/vimrc
diff --git a/etc/soft/vim/vim/+plugins/neomake/tests/vim_and_neovim_behavior.vader b/etc/soft/nvim/+plugins/neomake/tests/vim_and_neovim_behavior.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/neomake/tests/vim_and_neovim_behavior.vader
rename to etc/soft/nvim/+plugins/neomake/tests/vim_and_neovim_behavior.vader
diff --git a/etc/soft/vim/vim/+plugins/nnn.vim/LICENSE b/etc/soft/nvim/+plugins/nnn.vim/LICENSE
similarity index 100%
rename from etc/soft/vim/vim/+plugins/nnn.vim/LICENSE
rename to etc/soft/nvim/+plugins/nnn.vim/LICENSE
diff --git a/etc/soft/vim/vim/+plugins/nnn.vim/README.md b/etc/soft/nvim/+plugins/nnn.vim/README.md
similarity index 100%
rename from etc/soft/vim/vim/+plugins/nnn.vim/README.md
rename to etc/soft/nvim/+plugins/nnn.vim/README.md
diff --git a/etc/soft/vim/vim/+plugins/nnn.vim/autoload/nnn.vim b/etc/soft/nvim/+plugins/nnn.vim/autoload/nnn.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/nnn.vim/autoload/nnn.vim
rename to etc/soft/nvim/+plugins/nnn.vim/autoload/nnn.vim
diff --git a/etc/soft/vim/vim/+plugins/nnn.vim/doc/nnn.txt b/etc/soft/nvim/+plugins/nnn.vim/doc/nnn.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins/nnn.vim/doc/nnn.txt
rename to etc/soft/nvim/+plugins/nnn.vim/doc/nnn.txt
diff --git a/etc/soft/vim/vim/+plugins/nnn.vim/ftplugin/nnn.vim b/etc/soft/nvim/+plugins/nnn.vim/ftplugin/nnn.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/nnn.vim/ftplugin/nnn.vim
rename to etc/soft/nvim/+plugins/nnn.vim/ftplugin/nnn.vim
diff --git a/etc/soft/vim/vim/+plugins/nnn.vim/plugin/nnn.vim b/etc/soft/nvim/+plugins/nnn.vim/plugin/nnn.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/nnn.vim/plugin/nnn.vim
rename to etc/soft/nvim/+plugins/nnn.vim/plugin/nnn.vim
diff --git a/etc/soft/vim/vim/+plugins/pummode/autoload/pummode.vim b/etc/soft/nvim/+plugins/pummode/autoload/pummode.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/pummode/autoload/pummode.vim
rename to etc/soft/nvim/+plugins/pummode/autoload/pummode.vim
diff --git a/etc/soft/vim/vim/+plugins/pummode/doc/pummode.txt b/etc/soft/nvim/+plugins/pummode/doc/pummode.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins/pummode/doc/pummode.txt
rename to etc/soft/nvim/+plugins/pummode/doc/pummode.txt
diff --git a/etc/soft/vim/vim/+plugins/rainbow/plugin/RainbowParenthsis.vim b/etc/soft/nvim/+plugins/rainbow/plugin/RainbowParenthsis.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/rainbow/plugin/RainbowParenthsis.vim
rename to etc/soft/nvim/+plugins/rainbow/plugin/RainbowParenthsis.vim
diff --git a/etc/soft/vim/vim/+plugins/rainbow/rainbow.patch b/etc/soft/nvim/+plugins/rainbow/rainbow.patch
similarity index 100%
rename from etc/soft/vim/vim/+plugins/rainbow/rainbow.patch
rename to etc/soft/nvim/+plugins/rainbow/rainbow.patch
diff --git a/etc/soft/vim/vim/+plugins/tasklist/plugin/tasklist.vim b/etc/soft/nvim/+plugins/tasklist/plugin/tasklist.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/tasklist/plugin/tasklist.vim
rename to etc/soft/nvim/+plugins/tasklist/plugin/tasklist.vim
diff --git a/etc/soft/vim/vim/+plugins/timestamp/doc/timestamp.txt b/etc/soft/nvim/+plugins/timestamp/doc/timestamp.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins/timestamp/doc/timestamp.txt
rename to etc/soft/nvim/+plugins/timestamp/doc/timestamp.txt
diff --git a/etc/soft/vim/vim/+plugins/timestamp/plugin/timestamp.vim b/etc/soft/nvim/+plugins/timestamp/plugin/timestamp.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/timestamp/plugin/timestamp.vim
rename to etc/soft/nvim/+plugins/timestamp/plugin/timestamp.vim
diff --git a/etc/soft/vim/vim/+plugins/toggle/plugin/toggle.vim b/etc/soft/nvim/+plugins/toggle/plugin/toggle.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/toggle/plugin/toggle.vim
rename to etc/soft/nvim/+plugins/toggle/plugin/toggle.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/.gitignore b/etc/soft/nvim/+plugins/vim-airline/.gitignore
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/.gitignore
rename to etc/soft/nvim/+plugins/vim-airline/.gitignore
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/.travis.yml b/etc/soft/nvim/+plugins/vim-airline/.travis.yml
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/.travis.yml
rename to etc/soft/nvim/+plugins/vim-airline/.travis.yml
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/Gemfile b/etc/soft/nvim/+plugins/vim-airline/Gemfile
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/Gemfile
rename to etc/soft/nvim/+plugins/vim-airline/Gemfile
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/LICENSE b/etc/soft/nvim/+plugins/vim-airline/LICENSE
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/LICENSE
rename to etc/soft/nvim/+plugins/vim-airline/LICENSE
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/README.md b/etc/soft/nvim/+plugins/vim-airline/README.md
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/README.md
rename to etc/soft/nvim/+plugins/vim-airline/README.md
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/Rakefile b/etc/soft/nvim/+plugins/vim-airline/Rakefile
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/Rakefile
rename to etc/soft/nvim/+plugins/vim-airline/Rakefile
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/builder.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/builder.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/builder.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/builder.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/debug.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/debug.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/debug.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/debug.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/deprecation.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/deprecation.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/deprecation.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/deprecation.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/branch.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/branch.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/branch.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/branch.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/bufferline.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/bufferline.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/bufferline.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/bufferline.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/commandt.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/commandt.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/commandt.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/commandt.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/csv.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/csv.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/csv.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/csv.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/ctrlp.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/ctrlp.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/ctrlp.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/ctrlp.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/default.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/default.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/default.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/default.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/eclim.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/eclim.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/eclim.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/eclim.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/example.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/example.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/example.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/example.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/hunks.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/hunks.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/hunks.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/hunks.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/syntastic.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/syntastic.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/syntastic.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/syntastic.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/tabline.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/tabline.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/tabline.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/tabline.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/tabline/formatters.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/tabline/formatters.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/tabline/formatters.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/tabline/formatters.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/tagbar.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/tagbar.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/tagbar.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/tagbar.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/undotree.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/undotree.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/undotree.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/undotree.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/unite.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/unite.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/unite.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/unite.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/virtualenv.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/virtualenv.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/virtualenv.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/virtualenv.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/whitespace.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/whitespace.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/extensions/whitespace.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/extensions/whitespace.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/highlighter.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/highlighter.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/highlighter.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/highlighter.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/init.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/init.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/init.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/init.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/parts.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/parts.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/parts.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/parts.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/section.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/section.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/section.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/section.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/alduin.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/alduin.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/alduin.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/alduin.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/angr.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/angr.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/angr.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/angr.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/atomic.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/atomic.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/atomic.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/atomic.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/aurora.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/aurora.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/aurora.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/aurora.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/ayu_dark.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/ayu_dark.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/ayu_dark.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/ayu_dark.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/ayu_light.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/ayu_light.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/ayu_light.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/ayu_light.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/ayu_mirage.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/ayu_mirage.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/ayu_mirage.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/ayu_mirage.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/badcat.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/badcat.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/badcat.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/badcat.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/badwolf.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/badwolf.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/badwolf.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/badwolf.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/base16.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/base16.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/base16.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/base16.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/base16color.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/base16color.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/base16color.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/base16color.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/behelit.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/behelit.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/behelit.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/behelit.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/biogoo.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/biogoo.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/biogoo.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/biogoo.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/bubblegum.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/bubblegum.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/bubblegum.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/bubblegum.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/cobalt2.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/cobalt2.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/cobalt2.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/cobalt2.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/cool.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/cool.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/cool.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/cool.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/dark.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/dark.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/dark.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/dark.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/dark_minimal.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/dark_minimal.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/dark_minimal.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/dark_minimal.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/desertink.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/desertink.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/desertink.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/desertink.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/deus.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/deus.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/deus.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/deus.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/distinguished.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/distinguished.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/distinguished.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/distinguished.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/dracula.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/dracula.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/dracula.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/dracula.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/durant.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/durant.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/durant.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/durant.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/fairyfloss.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/fairyfloss.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/fairyfloss.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/fairyfloss.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/fruit_punch.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/fruit_punch.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/fruit_punch.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/fruit_punch.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/hybrid.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/hybrid.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/hybrid.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/hybrid.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/hybridline.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/hybridline.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/hybridline.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/hybridline.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/jellybeans.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/jellybeans.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/jellybeans.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/jellybeans.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/jet.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/jet.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/jet.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/jet.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/kalisi.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/kalisi.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/kalisi.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/kalisi.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/kolor.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/kolor.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/kolor.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/kolor.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/laederon.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/laederon.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/laederon.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/laederon.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/light.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/light.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/light.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/light.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/lucius.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/lucius.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/lucius.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/lucius.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/luna.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/luna.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/luna.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/luna.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/minimalist.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/minimalist.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/minimalist.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/minimalist.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/molokai.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/molokai.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/molokai.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/molokai.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/monochrome.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/monochrome.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/monochrome.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/monochrome.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/murmur.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/murmur.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/murmur.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/murmur.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/night_owl.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/night_owl.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/night_owl.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/night_owl.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/onedark.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/onedark.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/onedark.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/onedark.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/ouo.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/ouo.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/ouo.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/ouo.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/papercolor.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/papercolor.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/papercolor.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/papercolor.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/peaksea.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/peaksea.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/peaksea.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/peaksea.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/powerlineish.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/powerlineish.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/powerlineish.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/powerlineish.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/qwq.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/qwq.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/qwq.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/qwq.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/raven.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/raven.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/raven.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/raven.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/ravenpower.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/ravenpower.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/ravenpower.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/ravenpower.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/seagull.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/seagull.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/seagull.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/seagull.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/serene.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/serene.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/serene.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/serene.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/sierra.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/sierra.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/sierra.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/sierra.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/silver.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/silver.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/silver.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/silver.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/simple.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/simple.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/simple.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/simple.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/soda.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/soda.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/soda.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/soda.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/sol.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/sol.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/sol.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/sol.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/solarized.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/solarized.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/solarized.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/solarized.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/solarized_flood.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/solarized_flood.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/solarized_flood.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/solarized_flood.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/term.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/term.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/term.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/term.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/term_light.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/term_light.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/term_light.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/term_light.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/tomorrow.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/tomorrow.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/tomorrow.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/tomorrow.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/ubaryd.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/ubaryd.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/ubaryd.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/ubaryd.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/understated.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/understated.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/understated.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/understated.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/vice.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/vice.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/vice.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/vice.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/violet.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/violet.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/violet.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/violet.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/wombat.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/wombat.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/wombat.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/wombat.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/xtermlight.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/xtermlight.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/xtermlight.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/xtermlight.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/zenburn.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/zenburn.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/themes/zenburn.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/themes/zenburn.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/util.vim b/etc/soft/nvim/+plugins/vim-airline/autoload/airline/util.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/autoload/airline/util.vim
rename to etc/soft/nvim/+plugins/vim-airline/autoload/airline/util.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/doc/airline.txt b/etc/soft/nvim/+plugins/vim-airline/doc/airline.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/doc/airline.txt
rename to etc/soft/nvim/+plugins/vim-airline/doc/airline.txt
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/plugin/airline.vim b/etc/soft/nvim/+plugins/vim-airline/plugin/airline.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/plugin/airline.vim
rename to etc/soft/nvim/+plugins/vim-airline/plugin/airline.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/t/airline.vim b/etc/soft/nvim/+plugins/vim-airline/t/airline.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/t/airline.vim
rename to etc/soft/nvim/+plugins/vim-airline/t/airline.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/t/builder.vim b/etc/soft/nvim/+plugins/vim-airline/t/builder.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/t/builder.vim
rename to etc/soft/nvim/+plugins/vim-airline/t/builder.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/t/commands.vim b/etc/soft/nvim/+plugins/vim-airline/t/commands.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/t/commands.vim
rename to etc/soft/nvim/+plugins/vim-airline/t/commands.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/t/extensions_default.vim b/etc/soft/nvim/+plugins/vim-airline/t/extensions_default.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/t/extensions_default.vim
rename to etc/soft/nvim/+plugins/vim-airline/t/extensions_default.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/t/highlighter.vim b/etc/soft/nvim/+plugins/vim-airline/t/highlighter.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/t/highlighter.vim
rename to etc/soft/nvim/+plugins/vim-airline/t/highlighter.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/t/init.vim b/etc/soft/nvim/+plugins/vim-airline/t/init.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/t/init.vim
rename to etc/soft/nvim/+plugins/vim-airline/t/init.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/t/parts.vim b/etc/soft/nvim/+plugins/vim-airline/t/parts.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/t/parts.vim
rename to etc/soft/nvim/+plugins/vim-airline/t/parts.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/t/section.vim b/etc/soft/nvim/+plugins/vim-airline/t/section.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/t/section.vim
rename to etc/soft/nvim/+plugins/vim-airline/t/section.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/t/themes.vim b/etc/soft/nvim/+plugins/vim-airline/t/themes.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/t/themes.vim
rename to etc/soft/nvim/+plugins/vim-airline/t/themes.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-airline/t/util.vim b/etc/soft/nvim/+plugins/vim-airline/t/util.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-airline/t/util.vim
rename to etc/soft/nvim/+plugins/vim-airline/t/util.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/Gemfile b/etc/soft/nvim/+plugins/vim-easymotion/Gemfile
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/Gemfile
rename to etc/soft/nvim/+plugins/vim-easymotion/Gemfile
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/README.md b/etc/soft/nvim/+plugins/vim-easymotion/README.md
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/README.md
rename to etc/soft/nvim/+plugins/vim-easymotion/README.md
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/Rakefile b/etc/soft/nvim/+plugins/vim-easymotion/Rakefile
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/Rakefile
rename to etc/soft/nvim/+plugins/vim-easymotion/Rakefile
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/EasyMotion.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/EasyMotion.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/EasyMotion.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/EasyMotion.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/EasyMotion/cmigemo.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/EasyMotion/cmigemo.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/EasyMotion/cmigemo.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/EasyMotion/cmigemo.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/EasyMotion/command_line.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/EasyMotion/command_line.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/EasyMotion/command_line.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/EasyMotion/command_line.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/EasyMotion/helper.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/EasyMotion/helper.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/EasyMotion/helper.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/EasyMotion/helper.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/EasyMotion/highlight.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/EasyMotion/highlight.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/EasyMotion/highlight.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/EasyMotion/highlight.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/EasyMotion/migemo/cp932.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/EasyMotion/migemo/cp932.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/EasyMotion/migemo/cp932.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/EasyMotion/migemo/cp932.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/EasyMotion/migemo/eucjp.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/EasyMotion/migemo/eucjp.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/EasyMotion/migemo/eucjp.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/EasyMotion/migemo/eucjp.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/EasyMotion/migemo/utf8.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/EasyMotion/migemo/utf8.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/EasyMotion/migemo/utf8.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/EasyMotion/migemo/utf8.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/EasyMotion/overwin.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/EasyMotion/overwin.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/EasyMotion/overwin.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/EasyMotion/overwin.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/EasyMotion/sticky_table.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/EasyMotion/sticky_table.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/EasyMotion/sticky_table.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/EasyMotion/sticky_table.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/EasyMotion/undo.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/EasyMotion/undo.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/EasyMotion/undo.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/EasyMotion/undo.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Data/Dict.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Data/Dict.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Data/Dict.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Data/Dict.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Data/List.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Data/List.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Data/List.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Data/List.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Data/Set.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Data/Set.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Data/Set.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Data/Set.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/HitAHint/Hint.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/HitAHint/Hint.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/HitAHint/Hint.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/HitAHint/Hint.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/HitAHint/Motion.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/HitAHint/Motion.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/HitAHint/Motion.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/HitAHint/Motion.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Base.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Base.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Base.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Base.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/BufferComplete.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/BufferComplete.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/BufferComplete.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/BufferComplete.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Cancel.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Cancel.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Cancel.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Cancel.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/CursorMove.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/CursorMove.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/CursorMove.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/CursorMove.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Delete.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Delete.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Delete.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Delete.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Doautocmd.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Doautocmd.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Doautocmd.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Doautocmd.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/DrawCommandline.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/DrawCommandline.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/DrawCommandline.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/DrawCommandline.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/ExceptionExit.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/ExceptionExit.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/ExceptionExit.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/ExceptionExit.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/ExceptionMessage.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/ExceptionMessage.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/ExceptionMessage.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/ExceptionMessage.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Exit.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Exit.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Exit.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Exit.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/History.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/History.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/History.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/History.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/InsertRegister.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/InsertRegister.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/InsertRegister.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/InsertRegister.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/KeyMapping.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/KeyMapping.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/KeyMapping.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/KeyMapping.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/NoInsert.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/NoInsert.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/NoInsert.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/NoInsert.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Paste.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Paste.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Paste.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Paste.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Redraw.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Redraw.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Redraw.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Redraw.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Exception.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Exception.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Exception.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Exception.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Input.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Input.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Input.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Input.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Keymapping.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Keymapping.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Keymapping.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Keymapping.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Signals.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Signals.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Signals.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/Signals.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/String.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/String.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/String.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Over/String.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Palette/Capture.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Palette/Capture.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Palette/Capture.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Palette/Capture.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Palette/Highlight.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Palette/Highlight.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Palette/Highlight.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Palette/Highlight.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Palette/Keymapping.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Palette/Keymapping.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Palette/Keymapping.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Palette/Keymapping.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Prelude.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Prelude.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Prelude.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Prelude.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Vim/Buffer.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Vim/Buffer.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Vim/Buffer.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Vim/Buffer.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Vim/Guard.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Vim/Guard.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Vim/Guard.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Vim/Guard.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Vim/Message.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Vim/Message.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/_easymotion/Vim/Message.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/_easymotion/Vim/Message.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/easymotion.vim b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/easymotion.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/easymotion.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/easymotion.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/easymotion.vital b/etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/easymotion.vital
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/autoload/vital/easymotion.vital
rename to etc/soft/nvim/+plugins/vim-easymotion/autoload/vital/easymotion.vital
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/doc/easymotion.txt b/etc/soft/nvim/+plugins/vim-easymotion/doc/easymotion.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/doc/easymotion.txt
rename to etc/soft/nvim/+plugins/vim-easymotion/doc/easymotion.txt
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/plugin/EasyMotion.vim b/etc/soft/nvim/+plugins/vim-easymotion/plugin/EasyMotion.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/plugin/EasyMotion.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/plugin/EasyMotion.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/t/compare_movements_spec.vim b/etc/soft/nvim/+plugins/vim-easymotion/t/compare_movements_spec.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/t/compare_movements_spec.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/t/compare_movements_spec.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/t/easymotion_spec.vim b/etc/soft/nvim/+plugins/vim-easymotion/t/easymotion_spec.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/t/easymotion_spec.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/t/easymotion_spec.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/t/operator_pending_spec.vim b/etc/soft/nvim/+plugins/vim-easymotion/t/operator_pending_spec.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/t/operator_pending_spec.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/t/operator_pending_spec.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-easymotion/t/smartsign_spec.vim b/etc/soft/nvim/+plugins/vim-easymotion/t/smartsign_spec.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-easymotion/t/smartsign_spec.vim
rename to etc/soft/nvim/+plugins/vim-easymotion/t/smartsign_spec.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-emmet/Makefile b/etc/soft/nvim/+plugins/vim-emmet/Makefile
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-emmet/Makefile
rename to etc/soft/nvim/+plugins/vim-emmet/Makefile
diff --git a/etc/soft/vim/vim/+plugins/vim-emmet/README.mkd b/etc/soft/nvim/+plugins/vim-emmet/README.mkd
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-emmet/README.mkd
rename to etc/soft/nvim/+plugins/vim-emmet/README.mkd
diff --git a/etc/soft/vim/vim/+plugins/vim-emmet/TODO b/etc/soft/nvim/+plugins/vim-emmet/TODO
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-emmet/TODO
rename to etc/soft/nvim/+plugins/vim-emmet/TODO
diff --git a/etc/soft/vim/vim/+plugins/vim-emmet/TUTORIAL b/etc/soft/nvim/+plugins/vim-emmet/TUTORIAL
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-emmet/TUTORIAL
rename to etc/soft/nvim/+plugins/vim-emmet/TUTORIAL
diff --git a/etc/soft/vim/vim/+plugins/vim-emmet/autoload/emmet.vim b/etc/soft/nvim/+plugins/vim-emmet/autoload/emmet.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-emmet/autoload/emmet.vim
rename to etc/soft/nvim/+plugins/vim-emmet/autoload/emmet.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-emmet/autoload/emmet/lang.vim b/etc/soft/nvim/+plugins/vim-emmet/autoload/emmet/lang.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-emmet/autoload/emmet/lang.vim
rename to etc/soft/nvim/+plugins/vim-emmet/autoload/emmet/lang.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-emmet/autoload/emmet/lang/css.vim b/etc/soft/nvim/+plugins/vim-emmet/autoload/emmet/lang/css.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-emmet/autoload/emmet/lang/css.vim
rename to etc/soft/nvim/+plugins/vim-emmet/autoload/emmet/lang/css.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-emmet/autoload/emmet/lang/haml.vim b/etc/soft/nvim/+plugins/vim-emmet/autoload/emmet/lang/haml.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-emmet/autoload/emmet/lang/haml.vim
rename to etc/soft/nvim/+plugins/vim-emmet/autoload/emmet/lang/haml.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-emmet/autoload/emmet/lang/html.vim b/etc/soft/nvim/+plugins/vim-emmet/autoload/emmet/lang/html.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-emmet/autoload/emmet/lang/html.vim
rename to etc/soft/nvim/+plugins/vim-emmet/autoload/emmet/lang/html.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-emmet/autoload/emmet/lang/jade.vim b/etc/soft/nvim/+plugins/vim-emmet/autoload/emmet/lang/jade.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-emmet/autoload/emmet/lang/jade.vim
rename to etc/soft/nvim/+plugins/vim-emmet/autoload/emmet/lang/jade.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-emmet/autoload/emmet/lang/less.vim b/etc/soft/nvim/+plugins/vim-emmet/autoload/emmet/lang/less.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-emmet/autoload/emmet/lang/less.vim
rename to etc/soft/nvim/+plugins/vim-emmet/autoload/emmet/lang/less.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-emmet/autoload/emmet/lang/sass.vim b/etc/soft/nvim/+plugins/vim-emmet/autoload/emmet/lang/sass.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-emmet/autoload/emmet/lang/sass.vim
rename to etc/soft/nvim/+plugins/vim-emmet/autoload/emmet/lang/sass.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-emmet/autoload/emmet/lang/scss.vim b/etc/soft/nvim/+plugins/vim-emmet/autoload/emmet/lang/scss.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-emmet/autoload/emmet/lang/scss.vim
rename to etc/soft/nvim/+plugins/vim-emmet/autoload/emmet/lang/scss.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-emmet/autoload/emmet/lang/slim.vim b/etc/soft/nvim/+plugins/vim-emmet/autoload/emmet/lang/slim.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-emmet/autoload/emmet/lang/slim.vim
rename to etc/soft/nvim/+plugins/vim-emmet/autoload/emmet/lang/slim.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-emmet/autoload/emmet/lorem/en.vim b/etc/soft/nvim/+plugins/vim-emmet/autoload/emmet/lorem/en.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-emmet/autoload/emmet/lorem/en.vim
rename to etc/soft/nvim/+plugins/vim-emmet/autoload/emmet/lorem/en.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-emmet/autoload/emmet/lorem/ja.vim b/etc/soft/nvim/+plugins/vim-emmet/autoload/emmet/lorem/ja.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-emmet/autoload/emmet/lorem/ja.vim
rename to etc/soft/nvim/+plugins/vim-emmet/autoload/emmet/lorem/ja.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-emmet/autoload/emmet/util.vim b/etc/soft/nvim/+plugins/vim-emmet/autoload/emmet/util.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-emmet/autoload/emmet/util.vim
rename to etc/soft/nvim/+plugins/vim-emmet/autoload/emmet/util.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-emmet/doc/emmet.txt b/etc/soft/nvim/+plugins/vim-emmet/doc/emmet.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-emmet/doc/emmet.txt
rename to etc/soft/nvim/+plugins/vim-emmet/doc/emmet.txt
diff --git a/etc/soft/vim/vim/+plugins/vim-emmet/doc/screenshot.gif b/etc/soft/nvim/+plugins/vim-emmet/doc/screenshot.gif
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-emmet/doc/screenshot.gif
rename to etc/soft/nvim/+plugins/vim-emmet/doc/screenshot.gif
diff --git a/etc/soft/vim/vim/+plugins/vim-emmet/emmet.vim.vimup b/etc/soft/nvim/+plugins/vim-emmet/emmet.vim.vimup
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-emmet/emmet.vim.vimup
rename to etc/soft/nvim/+plugins/vim-emmet/emmet.vim.vimup
diff --git a/etc/soft/vim/vim/+plugins/vim-emmet/plugin/emmet.vim b/etc/soft/nvim/+plugins/vim-emmet/plugin/emmet.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-emmet/plugin/emmet.vim
rename to etc/soft/nvim/+plugins/vim-emmet/plugin/emmet.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-emmet/unittest.vim b/etc/soft/nvim/+plugins/vim-emmet/unittest.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-emmet/unittest.vim
rename to etc/soft/nvim/+plugins/vim-emmet/unittest.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-enter-indent/README.md b/etc/soft/nvim/+plugins/vim-enter-indent/README.md
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-enter-indent/README.md
rename to etc/soft/nvim/+plugins/vim-enter-indent/README.md
diff --git a/etc/soft/vim/vim/+plugins/vim-enter-indent/plugin/enter-indent.vim b/etc/soft/nvim/+plugins/vim-enter-indent/plugin/enter-indent.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-enter-indent/plugin/enter-indent.vim
rename to etc/soft/nvim/+plugins/vim-enter-indent/plugin/enter-indent.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-haskellConceal/README b/etc/soft/nvim/+plugins/vim-haskellConceal/README
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-haskellConceal/README
rename to etc/soft/nvim/+plugins/vim-haskellConceal/README
diff --git a/etc/soft/vim/vim/+plugins/vim-haskellConceal/after/syntax/haskell.vim b/etc/soft/nvim/+plugins/vim-haskellConceal/after/syntax/haskell.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-haskellConceal/after/syntax/haskell.vim
rename to etc/soft/nvim/+plugins/vim-haskellConceal/after/syntax/haskell.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-liquid/ftdetect/liquid.vim b/etc/soft/nvim/+plugins/vim-liquid/ftdetect/liquid.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-liquid/ftdetect/liquid.vim
rename to etc/soft/nvim/+plugins/vim-liquid/ftdetect/liquid.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-liquid/ftplugin/liquid.vim b/etc/soft/nvim/+plugins/vim-liquid/ftplugin/liquid.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-liquid/ftplugin/liquid.vim
rename to etc/soft/nvim/+plugins/vim-liquid/ftplugin/liquid.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-liquid/indent/liquid.vim b/etc/soft/nvim/+plugins/vim-liquid/indent/liquid.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-liquid/indent/liquid.vim
rename to etc/soft/nvim/+plugins/vim-liquid/indent/liquid.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-liquid/syntax/liquid.vim b/etc/soft/nvim/+plugins/vim-liquid/syntax/liquid.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-liquid/syntax/liquid.vim
rename to etc/soft/nvim/+plugins/vim-liquid/syntax/liquid.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-quickhl/README.md b/etc/soft/nvim/+plugins/vim-quickhl/README.md
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-quickhl/README.md
rename to etc/soft/nvim/+plugins/vim-quickhl/README.md
diff --git a/etc/soft/vim/vim/+plugins/vim-quickhl/Rakefile b/etc/soft/nvim/+plugins/vim-quickhl/Rakefile
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-quickhl/Rakefile
rename to etc/soft/nvim/+plugins/vim-quickhl/Rakefile
diff --git a/etc/soft/vim/vim/+plugins/vim-quickhl/VERSION b/etc/soft/nvim/+plugins/vim-quickhl/VERSION
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-quickhl/VERSION
rename to etc/soft/nvim/+plugins/vim-quickhl/VERSION
diff --git a/etc/soft/vim/vim/+plugins/vim-quickhl/autoload/quickhl.vim b/etc/soft/nvim/+plugins/vim-quickhl/autoload/quickhl.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-quickhl/autoload/quickhl.vim
rename to etc/soft/nvim/+plugins/vim-quickhl/autoload/quickhl.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-quickhl/doc/quickhl.txt b/etc/soft/nvim/+plugins/vim-quickhl/doc/quickhl.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-quickhl/doc/quickhl.txt
rename to etc/soft/nvim/+plugins/vim-quickhl/doc/quickhl.txt
diff --git a/etc/soft/vim/vim/+plugins/vim-quickhl/plugin/quickhl.vim b/etc/soft/nvim/+plugins/vim-quickhl/plugin/quickhl.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-quickhl/plugin/quickhl.vim
rename to etc/soft/nvim/+plugins/vim-quickhl/plugin/quickhl.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-repeat/README.markdown b/etc/soft/nvim/+plugins/vim-repeat/README.markdown
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-repeat/README.markdown
rename to etc/soft/nvim/+plugins/vim-repeat/README.markdown
diff --git a/etc/soft/vim/vim/+plugins/vim-repeat/autoload/repeat.vim b/etc/soft/nvim/+plugins/vim-repeat/autoload/repeat.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-repeat/autoload/repeat.vim
rename to etc/soft/nvim/+plugins/vim-repeat/autoload/repeat.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-speeddating/README.markdown b/etc/soft/nvim/+plugins/vim-speeddating/README.markdown
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-speeddating/README.markdown
rename to etc/soft/nvim/+plugins/vim-speeddating/README.markdown
diff --git a/etc/soft/vim/vim/+plugins/vim-speeddating/autoload/speeddating.vim b/etc/soft/nvim/+plugins/vim-speeddating/autoload/speeddating.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-speeddating/autoload/speeddating.vim
rename to etc/soft/nvim/+plugins/vim-speeddating/autoload/speeddating.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-speeddating/doc/speeddating.txt b/etc/soft/nvim/+plugins/vim-speeddating/doc/speeddating.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-speeddating/doc/speeddating.txt
rename to etc/soft/nvim/+plugins/vim-speeddating/doc/speeddating.txt
diff --git a/etc/soft/vim/vim/+plugins/vim-speeddating/plugin/speeddating.vim b/etc/soft/nvim/+plugins/vim-speeddating/plugin/speeddating.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-speeddating/plugin/speeddating.vim
rename to etc/soft/nvim/+plugins/vim-speeddating/plugin/speeddating.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-startify/CONTRIBUTING.md b/etc/soft/nvim/+plugins/vim-startify/CONTRIBUTING.md
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-startify/CONTRIBUTING.md
rename to etc/soft/nvim/+plugins/vim-startify/CONTRIBUTING.md
diff --git a/etc/soft/vim/vim/+plugins/vim-startify/LICENSE b/etc/soft/nvim/+plugins/vim-startify/LICENSE
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-startify/LICENSE
rename to etc/soft/nvim/+plugins/vim-startify/LICENSE
diff --git a/etc/soft/vim/vim/+plugins/vim-startify/README.md b/etc/soft/nvim/+plugins/vim-startify/README.md
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-startify/README.md
rename to etc/soft/nvim/+plugins/vim-startify/README.md
diff --git a/etc/soft/vim/vim/+plugins/vim-startify/autoload/startify.vim b/etc/soft/nvim/+plugins/vim-startify/autoload/startify.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-startify/autoload/startify.vim
rename to etc/soft/nvim/+plugins/vim-startify/autoload/startify.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-startify/autoload/startify/fortune.vim b/etc/soft/nvim/+plugins/vim-startify/autoload/startify/fortune.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-startify/autoload/startify/fortune.vim
rename to etc/soft/nvim/+plugins/vim-startify/autoload/startify/fortune.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-startify/doc/startify.txt b/etc/soft/nvim/+plugins/vim-startify/doc/startify.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-startify/doc/startify.txt
rename to etc/soft/nvim/+plugins/vim-startify/doc/startify.txt
diff --git a/etc/soft/vim/vim/+plugins/vim-startify/images/startify-logo.png b/etc/soft/nvim/+plugins/vim-startify/images/startify-logo.png
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-startify/images/startify-logo.png
rename to etc/soft/nvim/+plugins/vim-startify/images/startify-logo.png
diff --git a/etc/soft/vim/vim/+plugins/vim-startify/images/startify-menu.png b/etc/soft/nvim/+plugins/vim-startify/images/startify-menu.png
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-startify/images/startify-menu.png
rename to etc/soft/nvim/+plugins/vim-startify/images/startify-menu.png
diff --git a/etc/soft/vim/vim/+plugins/vim-startify/plugin/startify.vim b/etc/soft/nvim/+plugins/vim-startify/plugin/startify.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-startify/plugin/startify.vim
rename to etc/soft/nvim/+plugins/vim-startify/plugin/startify.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-startify/syntax/startify.vim b/etc/soft/nvim/+plugins/vim-startify/syntax/startify.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-startify/syntax/startify.vim
rename to etc/soft/nvim/+plugins/vim-startify/syntax/startify.vim
diff --git a/etc/soft/vim/vim/+plugins/vim-startify/test/feature/buffer.vader b/etc/soft/nvim/+plugins/vim-startify/test/feature/buffer.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-startify/test/feature/buffer.vader
rename to etc/soft/nvim/+plugins/vim-startify/test/feature/buffer.vader
diff --git a/etc/soft/vim/vim/+plugins/vim-startify/test/feature/mapping.vader b/etc/soft/nvim/+plugins/vim-startify/test/feature/mapping.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-startify/test/feature/mapping.vader
rename to etc/soft/nvim/+plugins/vim-startify/test/feature/mapping.vader
diff --git a/etc/soft/vim/vim/+plugins/vim-startify/test/feature/session.vader b/etc/soft/nvim/+plugins/vim-startify/test/feature/session.vader
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-startify/test/feature/session.vader
rename to etc/soft/nvim/+plugins/vim-startify/test/feature/session.vader
diff --git a/etc/soft/vim/vim/+plugins/vim-startify/test/include/testfile.txt b/etc/soft/nvim/+plugins/vim-startify/test/include/testfile.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-startify/test/include/testfile.txt
rename to etc/soft/nvim/+plugins/vim-startify/test/include/testfile.txt
diff --git a/etc/soft/vim/vim/+plugins/vim-startify/test/run b/etc/soft/nvim/+plugins/vim-startify/test/run
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-startify/test/run
rename to etc/soft/nvim/+plugins/vim-startify/test/run
diff --git a/etc/soft/vim/vim/+plugins/vim-startify/test/session/.gitkeep b/etc/soft/nvim/+plugins/vim-startify/test/session/.gitkeep
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-startify/test/session/.gitkeep
rename to etc/soft/nvim/+plugins/vim-startify/test/session/.gitkeep
diff --git a/etc/soft/vim/vim/+plugins/vim-startify/test/viminfo b/etc/soft/nvim/+plugins/vim-startify/test/viminfo
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-startify/test/viminfo
rename to etc/soft/nvim/+plugins/vim-startify/test/viminfo
diff --git a/etc/soft/vim/vim/+plugins/vim-startify/test/vimrc b/etc/soft/nvim/+plugins/vim-startify/test/vimrc
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-startify/test/vimrc
rename to etc/soft/nvim/+plugins/vim-startify/test/vimrc
diff --git a/etc/soft/vim/vim/+plugins/vim-surround/README.markdown b/etc/soft/nvim/+plugins/vim-surround/README.markdown
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-surround/README.markdown
rename to etc/soft/nvim/+plugins/vim-surround/README.markdown
diff --git a/etc/soft/vim/vim/+plugins/vim-surround/doc/surround.txt b/etc/soft/nvim/+plugins/vim-surround/doc/surround.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-surround/doc/surround.txt
rename to etc/soft/nvim/+plugins/vim-surround/doc/surround.txt
diff --git a/etc/soft/vim/vim/+plugins/vim-surround/plugin/surround.vim b/etc/soft/nvim/+plugins/vim-surround/plugin/surround.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vim-surround/plugin/surround.vim
rename to etc/soft/nvim/+plugins/vim-surround/plugin/surround.vim
diff --git a/etc/soft/vim/vim/+plugins/vimwiki/autoload/vimwiki/base.vim b/etc/soft/nvim/+plugins/vimwiki/autoload/vimwiki/base.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vimwiki/autoload/vimwiki/base.vim
rename to etc/soft/nvim/+plugins/vimwiki/autoload/vimwiki/base.vim
diff --git a/etc/soft/vim/vim/+plugins/vimwiki/autoload/vimwiki/default.tpl b/etc/soft/nvim/+plugins/vimwiki/autoload/vimwiki/default.tpl
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vimwiki/autoload/vimwiki/default.tpl
rename to etc/soft/nvim/+plugins/vimwiki/autoload/vimwiki/default.tpl
diff --git a/etc/soft/vim/vim/+plugins/vimwiki/autoload/vimwiki/diary.vim b/etc/soft/nvim/+plugins/vimwiki/autoload/vimwiki/diary.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vimwiki/autoload/vimwiki/diary.vim
rename to etc/soft/nvim/+plugins/vimwiki/autoload/vimwiki/diary.vim
diff --git a/etc/soft/vim/vim/+plugins/vimwiki/autoload/vimwiki/html.vim b/etc/soft/nvim/+plugins/vimwiki/autoload/vimwiki/html.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vimwiki/autoload/vimwiki/html.vim
rename to etc/soft/nvim/+plugins/vimwiki/autoload/vimwiki/html.vim
diff --git a/etc/soft/vim/vim/+plugins/vimwiki/autoload/vimwiki/lst.vim b/etc/soft/nvim/+plugins/vimwiki/autoload/vimwiki/lst.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vimwiki/autoload/vimwiki/lst.vim
rename to etc/soft/nvim/+plugins/vimwiki/autoload/vimwiki/lst.vim
diff --git a/etc/soft/vim/vim/+plugins/vimwiki/autoload/vimwiki/style.css b/etc/soft/nvim/+plugins/vimwiki/autoload/vimwiki/style.css
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vimwiki/autoload/vimwiki/style.css
rename to etc/soft/nvim/+plugins/vimwiki/autoload/vimwiki/style.css
diff --git a/etc/soft/vim/vim/+plugins/vimwiki/autoload/vimwiki/tbl.vim b/etc/soft/nvim/+plugins/vimwiki/autoload/vimwiki/tbl.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vimwiki/autoload/vimwiki/tbl.vim
rename to etc/soft/nvim/+plugins/vimwiki/autoload/vimwiki/tbl.vim
diff --git a/etc/soft/vim/vim/+plugins/vimwiki/doc/vimwiki.txt b/etc/soft/nvim/+plugins/vimwiki/doc/vimwiki.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vimwiki/doc/vimwiki.txt
rename to etc/soft/nvim/+plugins/vimwiki/doc/vimwiki.txt
diff --git a/etc/soft/vim/vim/+plugins/vimwiki/ftplugin/vimwiki.vim b/etc/soft/nvim/+plugins/vimwiki/ftplugin/vimwiki.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vimwiki/ftplugin/vimwiki.vim
rename to etc/soft/nvim/+plugins/vimwiki/ftplugin/vimwiki.vim
diff --git a/etc/soft/vim/vim/+plugins/vimwiki/plugin/vimwiki.vim b/etc/soft/nvim/+plugins/vimwiki/plugin/vimwiki.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vimwiki/plugin/vimwiki.vim
rename to etc/soft/nvim/+plugins/vimwiki/plugin/vimwiki.vim
diff --git a/etc/soft/vim/vim/+plugins/vimwiki/syntax/vimwiki.vim b/etc/soft/nvim/+plugins/vimwiki/syntax/vimwiki.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vimwiki/syntax/vimwiki.vim
rename to etc/soft/nvim/+plugins/vimwiki/syntax/vimwiki.vim
diff --git a/etc/soft/vim/vim/+plugins/vimwiki/syntax/vimwiki_default.vim b/etc/soft/nvim/+plugins/vimwiki/syntax/vimwiki_default.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vimwiki/syntax/vimwiki_default.vim
rename to etc/soft/nvim/+plugins/vimwiki/syntax/vimwiki_default.vim
diff --git a/etc/soft/vim/vim/+plugins/vimwiki/syntax/vimwiki_media.vim b/etc/soft/nvim/+plugins/vimwiki/syntax/vimwiki_media.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/vimwiki/syntax/vimwiki_media.vim
rename to etc/soft/nvim/+plugins/vimwiki/syntax/vimwiki_media.vim
diff --git a/etc/soft/vim/vim/+plugins/yankring/doc/yankring.txt b/etc/soft/nvim/+plugins/yankring/doc/yankring.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins/yankring/doc/yankring.txt
rename to etc/soft/nvim/+plugins/yankring/doc/yankring.txt
diff --git a/etc/soft/vim/vim/+plugins/yankring/plugin/yankring.vim b/etc/soft/nvim/+plugins/yankring/plugin/yankring.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/yankring/plugin/yankring.vim
rename to etc/soft/nvim/+plugins/yankring/plugin/yankring.vim
diff --git a/etc/soft/vim/vim/+plugins/yankring/yankring.vim b/etc/soft/nvim/+plugins/yankring/yankring.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins/yankring/yankring.vim
rename to etc/soft/nvim/+plugins/yankring/yankring.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/AnsiESC/README.md b/etc/soft/nvim/+plugins_disabled/AnsiESC/README.md
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/AnsiESC/README.md
rename to etc/soft/nvim/+plugins_disabled/AnsiESC/README.md
diff --git a/etc/soft/vim/vim/+plugins_disabled/AnsiESC/autoload/AnsiEsc.vim b/etc/soft/nvim/+plugins_disabled/AnsiESC/autoload/AnsiEsc.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/AnsiESC/autoload/AnsiEsc.vim
rename to etc/soft/nvim/+plugins_disabled/AnsiESC/autoload/AnsiEsc.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/AnsiESC/doc/AnsiEsc.txt b/etc/soft/nvim/+plugins_disabled/AnsiESC/doc/AnsiEsc.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/AnsiESC/doc/AnsiEsc.txt
rename to etc/soft/nvim/+plugins_disabled/AnsiESC/doc/AnsiEsc.txt
diff --git a/etc/soft/vim/vim/+plugins_disabled/AnsiESC/plugin/AnsiEscPlugin.vim b/etc/soft/nvim/+plugins_disabled/AnsiESC/plugin/AnsiEscPlugin.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/AnsiESC/plugin/AnsiEscPlugin.vim
rename to etc/soft/nvim/+plugins_disabled/AnsiESC/plugin/AnsiEscPlugin.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/AnsiESC/plugin/cecutil.vim b/etc/soft/nvim/+plugins_disabled/AnsiESC/plugin/cecutil.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/AnsiESC/plugin/cecutil.vim
rename to etc/soft/nvim/+plugins_disabled/AnsiESC/plugin/cecutil.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/Join/README.md b/etc/soft/nvim/+plugins_disabled/Join/README.md
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/Join/README.md
rename to etc/soft/nvim/+plugins_disabled/Join/README.md
diff --git a/etc/soft/vim/vim/+plugins_disabled/Join/doc/Join.txt b/etc/soft/nvim/+plugins_disabled/Join/doc/Join.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/Join/doc/Join.txt
rename to etc/soft/nvim/+plugins_disabled/Join/doc/Join.txt
diff --git a/etc/soft/vim/vim/+plugins_disabled/Join/plugin/Join.vim b/etc/soft/nvim/+plugins_disabled/Join/plugin/Join.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/Join/plugin/Join.vim
rename to etc/soft/nvim/+plugins_disabled/Join/plugin/Join.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/fff.vim/LICENSE.md b/etc/soft/nvim/+plugins_disabled/fff.vim/LICENSE.md
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/fff.vim/LICENSE.md
rename to etc/soft/nvim/+plugins_disabled/fff.vim/LICENSE.md
diff --git a/etc/soft/vim/vim/+plugins_disabled/fff.vim/README.md b/etc/soft/nvim/+plugins_disabled/fff.vim/README.md
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/fff.vim/README.md
rename to etc/soft/nvim/+plugins_disabled/fff.vim/README.md
diff --git a/etc/soft/vim/vim/+plugins_disabled/fff.vim/autoload/fff.vim b/etc/soft/nvim/+plugins_disabled/fff.vim/autoload/fff.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/fff.vim/autoload/fff.vim
rename to etc/soft/nvim/+plugins_disabled/fff.vim/autoload/fff.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/fff.vim/plugin/fff.vim b/etc/soft/nvim/+plugins_disabled/fff.vim/plugin/fff.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/fff.vim/plugin/fff.vim
rename to etc/soft/nvim/+plugins_disabled/fff.vim/plugin/fff.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/figlet/plugin/Figlet.vim b/etc/soft/nvim/+plugins_disabled/figlet/plugin/Figlet.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/figlet/plugin/Figlet.vim
rename to etc/soft/nvim/+plugins_disabled/figlet/plugin/Figlet.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/format_helper/README.txt b/etc/soft/nvim/+plugins_disabled/format_helper/README.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/format_helper/README.txt
rename to etc/soft/nvim/+plugins_disabled/format_helper/README.txt
diff --git a/etc/soft/vim/vim/+plugins_disabled/format_helper/format_helper.patch b/etc/soft/nvim/+plugins_disabled/format_helper/format_helper.patch
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/format_helper/format_helper.patch
rename to etc/soft/nvim/+plugins_disabled/format_helper/format_helper.patch
diff --git a/etc/soft/vim/vim/+plugins_disabled/format_helper/plugin/format_helper.vim b/etc/soft/nvim/+plugins_disabled/format_helper/plugin/format_helper.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/format_helper/plugin/format_helper.vim
rename to etc/soft/nvim/+plugins_disabled/format_helper/plugin/format_helper.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/functionator/functionator.patch b/etc/soft/nvim/+plugins_disabled/functionator/functionator.patch
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/functionator/functionator.patch
rename to etc/soft/nvim/+plugins_disabled/functionator/functionator.patch
diff --git a/etc/soft/vim/vim/+plugins_disabled/functionator/plugin/functionator.vim b/etc/soft/nvim/+plugins_disabled/functionator/plugin/functionator.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/functionator/plugin/functionator.vim
rename to etc/soft/nvim/+plugins_disabled/functionator/plugin/functionator.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/lispcomplete/autoload/lispcomplete.vim b/etc/soft/nvim/+plugins_disabled/lispcomplete/autoload/lispcomplete.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/lispcomplete/autoload/lispcomplete.vim
rename to etc/soft/nvim/+plugins_disabled/lispcomplete/autoload/lispcomplete.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/marks_corey/marks_corey.patch b/etc/soft/nvim/+plugins_disabled/marks_corey/marks_corey.patch
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/marks_corey/marks_corey.patch
rename to etc/soft/nvim/+plugins_disabled/marks_corey/marks_corey.patch
diff --git a/etc/soft/vim/vim/+plugins_disabled/marks_corey/plugin/marks_corey.vim b/etc/soft/nvim/+plugins_disabled/marks_corey/plugin/marks_corey.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/marks_corey/plugin/marks_corey.vim
rename to etc/soft/nvim/+plugins_disabled/marks_corey/plugin/marks_corey.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/README.md b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/README.md
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/README.md
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/README.md
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/async_cache.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/async_cache.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/async_cache.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/async_cache.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/cache.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/cache.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/cache.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/cache.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/commands.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/commands.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/commands.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/commands.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/complete.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/complete.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/complete.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/complete.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/context_filetype.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/context_filetype.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/context_filetype.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/context_filetype.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/converter_abbr.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/converter_abbr.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/converter_abbr.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/converter_abbr.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/converter_case.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/converter_case.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/converter_case.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/converter_case.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/converter_delimiter.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/converter_delimiter.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/converter_delimiter.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/converter_delimiter.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/converter_nothing.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/converter_nothing.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/converter_nothing.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/converter_nothing.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/converter_remove_next_keyword.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/converter_remove_next_keyword.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/converter_remove_next_keyword.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/converter_remove_next_keyword.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/matcher_fuzzy.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/matcher_fuzzy.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/matcher_fuzzy.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/matcher_fuzzy.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/matcher_head.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/matcher_head.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/matcher_head.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/matcher_head.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/matcher_old.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/matcher_old.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/matcher_old.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/matcher_old.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/sorter_length.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/sorter_length.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/sorter_length.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/sorter_length.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/sorter_nothing.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/sorter_nothing.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/sorter_nothing.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/sorter_nothing.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/sorter_rank.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/sorter_rank.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/sorter_rank.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/filters/sorter_rank.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/handler.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/handler.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/handler.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/handler.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/helper.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/helper.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/helper.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/helper.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/init.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/init.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/init.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/init.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/mappings.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/mappings.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/mappings.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/mappings.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/buffer_complete.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/buffer_complete.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/buffer_complete.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/buffer_complete.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/dictionary_complete.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/dictionary_complete.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/dictionary_complete.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/dictionary_complete.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/filename_complete.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/filename_complete.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/filename_complete.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/filename_complete.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/filename_include.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/filename_include.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/filename_include.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/filename_include.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/include_complete.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/include_complete.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/include_complete.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/include_complete.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/member_complete.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/member_complete.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/member_complete.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/member_complete.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/omni_complete.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/omni_complete.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/omni_complete.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/omni_complete.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/syntax_complete.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/syntax_complete.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/syntax_complete.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/syntax_complete.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/tags_complete.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/tags_complete.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/tags_complete.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/tags_complete.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/autocmds.dict b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/autocmds.dict
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/autocmds.dict
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/autocmds.dict
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/command_args.dict b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/command_args.dict
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/command_args.dict
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/command_args.dict
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/command_completions.dict b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/command_completions.dict
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/command_completions.dict
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/command_completions.dict
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/command_prototypes.dict b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/command_prototypes.dict
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/command_prototypes.dict
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/command_prototypes.dict
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/command_replaces.dict b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/command_replaces.dict
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/command_replaces.dict
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/command_replaces.dict
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/commands.dict b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/commands.dict
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/commands.dict
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/commands.dict
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/features.dict b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/features.dict
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/features.dict
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/features.dict
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/functions.dict b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/functions.dict
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/functions.dict
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/functions.dict
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/helper.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/helper.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/helper.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/helper.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/mappings.dict b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/mappings.dict
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/mappings.dict
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/mappings.dict
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/options.dict b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/options.dict
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/options.dict
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/options.dict
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/variables.dict b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/variables.dict
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/variables.dict
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/sources/vim_complete/variables.dict
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/util.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/util.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/util.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/util.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/variables.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/variables.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/variables.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/neocomplcache/variables.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/unite/sources/file_include.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/unite/sources/file_include.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/unite/sources/file_include.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/unite/sources/file_include.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/unite/sources/neocomplcache.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/unite/sources/neocomplcache.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/unite/sources/neocomplcache.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/unite/sources/neocomplcache.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/vital.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/vital.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/vital.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/vital.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/vital/_a20a988.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/vital/_a20a988.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/vital/_a20a988.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/vital/_a20a988.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/vital/_a20a988/Data/List.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/vital/_a20a988/Data/List.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/vital/_a20a988/Data/List.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/vital/_a20a988/Data/List.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/vital/_a20a988/Data/String.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/vital/_a20a988/Data/String.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/vital/_a20a988/Data/String.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/vital/_a20a988/Data/String.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/vital/_a20a988/Prelude.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/vital/_a20a988/Prelude.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/vital/_a20a988/Prelude.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/vital/_a20a988/Prelude.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/vital/_a20a988/System/Cache.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/vital/_a20a988/System/Cache.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/vital/_a20a988/System/Cache.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/vital/_a20a988/System/Cache.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/vital/neocomplcache.vital b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/vital/neocomplcache.vital
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/autoload/vital/neocomplcache.vital
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/autoload/vital/neocomplcache.vital
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/doc/neocomplcache.txt b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/doc/neocomplcache.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/doc/neocomplcache.txt
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/doc/neocomplcache.txt
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache/buffer_complete.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache/buffer_complete.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache/buffer_complete.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache/buffer_complete.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache/dictionary_complete.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache/dictionary_complete.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache/dictionary_complete.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache/dictionary_complete.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache/include_complete.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache/include_complete.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache/include_complete.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache/include_complete.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache/syntax_complete.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache/syntax_complete.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache/syntax_complete.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache/syntax_complete.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache/tags_complete.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache/tags_complete.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache/tags_complete.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/plugin/neocomplcache/tags_complete.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/vest/test-neocomplcache.vim b/etc/soft/nvim/+plugins_disabled/neocomplcache.vim/vest/test-neocomplcache.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neocomplcache.vim/vest/test-neocomplcache.vim
rename to etc/soft/nvim/+plugins_disabled/neocomplcache.vim/vest/test-neocomplcache.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/README.md b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/README.md
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/README.md
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/README.md
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neocomplcache/sources/snippets_complete.vim b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neocomplcache/sources/snippets_complete.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neocomplcache/sources/snippets_complete.vim
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neocomplcache/sources/snippets_complete.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neocomplete/sources/neosnippet.vim b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neocomplete/sources/neosnippet.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neocomplete/sources/neosnippet.vim
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neocomplete/sources/neosnippet.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet.vim b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet.vim
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/Gemfile.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/Gemfile.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/Gemfile.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/Gemfile.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/_.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/_.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/_.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/_.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/actionscript.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/actionscript.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/actionscript.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/actionscript.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/apache.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/apache.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/apache.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/apache.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/applescript.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/applescript.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/applescript.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/applescript.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/c.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/c.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/c.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/c.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/clojure.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/clojure.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/clojure.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/clojure.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/coffee.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/coffee.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/coffee.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/coffee.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/cpp.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/cpp.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/cpp.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/cpp.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/css.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/css.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/css.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/css.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/d.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/d.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/d.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/d.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/erlang.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/erlang.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/erlang.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/erlang.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/eruby.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/eruby.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/eruby.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/eruby.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/go.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/go.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/go.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/go.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/groovy.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/groovy.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/groovy.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/groovy.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/haskell.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/haskell.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/haskell.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/haskell.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/html.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/html.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/html.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/html.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/java.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/java.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/java.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/java.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/javascript.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/javascript.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/javascript.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/javascript.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/kp19pp.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/kp19pp.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/kp19pp.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/kp19pp.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/liquid.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/liquid.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/liquid.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/liquid.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/lua.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/lua.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/lua.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/lua.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/make.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/make.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/make.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/make.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/markdown.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/markdown.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/markdown.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/markdown.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/mediawiki.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/mediawiki.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/mediawiki.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/mediawiki.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/objc.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/objc.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/objc.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/objc.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/perl.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/perl.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/perl.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/perl.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/php.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/php.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/php.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/php.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/python.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/python.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/python.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/python.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/rails.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/rails.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/rails.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/rails.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/rst.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/rst.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/rst.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/rst.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/ruby.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/ruby.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/ruby.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/ruby.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/scala.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/scala.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/scala.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/scala.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/scheme.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/scheme.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/scheme.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/scheme.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/sh.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/sh.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/sh.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/sh.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/snippet.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/snippet.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/snippet.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/snippet.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/sql.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/sql.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/sql.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/sql.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/sshconfig.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/sshconfig.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/sshconfig.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/sshconfig.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/tcl.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/tcl.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/tcl.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/tcl.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/tex.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/tex.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/tex.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/tex.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/vim.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/vim.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/vim.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/vim.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/vim/vital.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/vim/vital.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/vim/vital.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/vim/vital.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/vimshell.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/vimshell.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/vimshell.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/vimshell.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/vimwiki.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/vimwiki.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/vimwiki.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/vimwiki.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/xhtml.snip b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/xhtml.snip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/xhtml.snip
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/snippets/xhtml.snip
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/util.vim b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/util.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/util.vim
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/neosnippet/util.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/unite/sources/neosnippet_file.vim b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/unite/sources/neosnippet_file.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/unite/sources/neosnippet_file.vim
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/unite/sources/neosnippet_file.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/unite/sources/snippet.vim b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/unite/sources/snippet.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/unite/sources/snippet.vim
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/unite/sources/snippet.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/unite/sources/snippet_target.vim b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/unite/sources/snippet_target.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/unite/sources/snippet_target.vim
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/unite/sources/snippet_target.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/vital.vim b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/vital.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/vital.vim
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/vital.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/vital/_de83b96.vim b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/vital/_de83b96.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/vital/_de83b96.vim
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/vital/_de83b96.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/vital/_de83b96/Prelude.vim b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/vital/_de83b96/Prelude.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/vital/_de83b96/Prelude.vim
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/vital/_de83b96/Prelude.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/vital/neosnippet.vital b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/vital/neosnippet.vital
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/autoload/vital/neosnippet.vital
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/autoload/vital/neosnippet.vital
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/doc/neosnippet.txt b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/doc/neosnippet.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/doc/neosnippet.txt
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/doc/neosnippet.txt
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/ftdetect/snippet.vim b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/ftdetect/snippet.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/ftdetect/snippet.vim
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/ftdetect/snippet.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/ftplugin/snippet.vim b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/ftplugin/snippet.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/ftplugin/snippet.vim
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/ftplugin/snippet.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/indent/snippet.vim b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/indent/snippet.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/indent/snippet.vim
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/indent/snippet.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/plugin/neosnippet.vim b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/plugin/neosnippet.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/plugin/neosnippet.vim
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/plugin/neosnippet.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/syntax/snippet.vim b/etc/soft/nvim/+plugins_disabled/neosnippet.vim/syntax/snippet.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/neosnippet.vim/syntax/snippet.vim
rename to etc/soft/nvim/+plugins_disabled/neosnippet.vim/syntax/snippet.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/tablify/README.md b/etc/soft/nvim/+plugins_disabled/tablify/README.md
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/tablify/README.md
rename to etc/soft/nvim/+plugins_disabled/tablify/README.md
diff --git a/etc/soft/vim/vim/+plugins_disabled/tablify/doc/tablify.txt b/etc/soft/nvim/+plugins_disabled/tablify/doc/tablify.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/tablify/doc/tablify.txt
rename to etc/soft/nvim/+plugins_disabled/tablify/doc/tablify.txt
diff --git a/etc/soft/vim/vim/+plugins_disabled/tablify/plugin/tablify.vim b/etc/soft/nvim/+plugins_disabled/tablify/plugin/tablify.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/tablify/plugin/tablify.vim
rename to etc/soft/nvim/+plugins_disabled/tablify/plugin/tablify.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/taglist/doc/taglist.txt b/etc/soft/nvim/+plugins_disabled/taglist/doc/taglist.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/taglist/doc/taglist.txt
rename to etc/soft/nvim/+plugins_disabled/taglist/doc/taglist.txt
diff --git a/etc/soft/vim/vim/+plugins_disabled/taglist/plugin/taglist.vim b/etc/soft/nvim/+plugins_disabled/taglist/plugin/taglist.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/taglist/plugin/taglist.vim
rename to etc/soft/nvim/+plugins_disabled/taglist/plugin/taglist.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/textmanip/autoload/textmanip.vim b/etc/soft/nvim/+plugins_disabled/textmanip/autoload/textmanip.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/textmanip/autoload/textmanip.vim
rename to etc/soft/nvim/+plugins_disabled/textmanip/autoload/textmanip.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/textmanip/doc/textmanip.txt b/etc/soft/nvim/+plugins_disabled/textmanip/doc/textmanip.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/textmanip/doc/textmanip.txt
rename to etc/soft/nvim/+plugins_disabled/textmanip/doc/textmanip.txt
diff --git a/etc/soft/vim/vim/+plugins_disabled/textmanip/plugin/textmanip.vim b/etc/soft/nvim/+plugins_disabled/textmanip/plugin/textmanip.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/textmanip/plugin/textmanip.vim
rename to etc/soft/nvim/+plugins_disabled/textmanip/plugin/textmanip.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vCoolor/autoload/vcoolor/convert.vim b/etc/soft/nvim/+plugins_disabled/vCoolor/autoload/vcoolor/convert.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vCoolor/autoload/vcoolor/convert.vim
rename to etc/soft/nvim/+plugins_disabled/vCoolor/autoload/vcoolor/convert.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vCoolor/autoload/vcoolor/misc.vim b/etc/soft/nvim/+plugins_disabled/vCoolor/autoload/vcoolor/misc.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vCoolor/autoload/vcoolor/misc.vim
rename to etc/soft/nvim/+plugins_disabled/vCoolor/autoload/vcoolor/misc.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vCoolor/doc/vCoolor.txt b/etc/soft/nvim/+plugins_disabled/vCoolor/doc/vCoolor.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vCoolor/doc/vCoolor.txt
rename to etc/soft/nvim/+plugins_disabled/vCoolor/doc/vCoolor.txt
diff --git a/etc/soft/vim/vim/+plugins_disabled/vCoolor/pickers/osx/color-picker b/etc/soft/nvim/+plugins_disabled/vCoolor/pickers/osx/color-picker
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vCoolor/pickers/osx/color-picker
rename to etc/soft/nvim/+plugins_disabled/vCoolor/pickers/osx/color-picker
diff --git a/etc/soft/vim/vim/+plugins_disabled/vCoolor/plugin/vCoolor.vim b/etc/soft/nvim/+plugins_disabled/vCoolor/plugin/vCoolor.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vCoolor/plugin/vCoolor.vim
rename to etc/soft/nvim/+plugins_disabled/vCoolor/plugin/vCoolor.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vicle/plugin/vicle.vim b/etc/soft/nvim/+plugins_disabled/vicle/plugin/vicle.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vicle/plugin/vicle.vim
rename to etc/soft/nvim/+plugins_disabled/vicle/plugin/vicle.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vim-easy-align/EXAMPLES.md b/etc/soft/nvim/+plugins_disabled/vim-easy-align/EXAMPLES.md
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vim-easy-align/EXAMPLES.md
rename to etc/soft/nvim/+plugins_disabled/vim-easy-align/EXAMPLES.md
diff --git a/etc/soft/vim/vim/+plugins_disabled/vim-easy-align/README.md b/etc/soft/nvim/+plugins_disabled/vim-easy-align/README.md
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vim-easy-align/README.md
rename to etc/soft/nvim/+plugins_disabled/vim-easy-align/README.md
diff --git a/etc/soft/vim/vim/+plugins_disabled/vim-easy-align/autoload/easy_align.vim b/etc/soft/nvim/+plugins_disabled/vim-easy-align/autoload/easy_align.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vim-easy-align/autoload/easy_align.vim
rename to etc/soft/nvim/+plugins_disabled/vim-easy-align/autoload/easy_align.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vim-easy-align/doc/easy_align.txt b/etc/soft/nvim/+plugins_disabled/vim-easy-align/doc/easy_align.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vim-easy-align/doc/easy_align.txt
rename to etc/soft/nvim/+plugins_disabled/vim-easy-align/doc/easy_align.txt
diff --git a/etc/soft/vim/vim/+plugins_disabled/vim-easy-align/plugin/easy_align.vim b/etc/soft/nvim/+plugins_disabled/vim-easy-align/plugin/easy_align.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vim-easy-align/plugin/easy_align.vim
rename to etc/soft/nvim/+plugins_disabled/vim-easy-align/plugin/easy_align.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vim-easy-align/test/basic.expected b/etc/soft/nvim/+plugins_disabled/vim-easy-align/test/basic.expected
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vim-easy-align/test/basic.expected
rename to etc/soft/nvim/+plugins_disabled/vim-easy-align/test/basic.expected
diff --git a/etc/soft/vim/vim/+plugins_disabled/vim-easy-align/test/basic.md b/etc/soft/nvim/+plugins_disabled/vim-easy-align/test/basic.md
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vim-easy-align/test/basic.md
rename to etc/soft/nvim/+plugins_disabled/vim-easy-align/test/basic.md
diff --git a/etc/soft/vim/vim/+plugins_disabled/vim-easy-align/test/basic.script b/etc/soft/nvim/+plugins_disabled/vim-easy-align/test/basic.script
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vim-easy-align/test/basic.script
rename to etc/soft/nvim/+plugins_disabled/vim-easy-align/test/basic.script
diff --git a/etc/soft/vim/vim/+plugins_disabled/vim-easy-align/test/include.vim b/etc/soft/nvim/+plugins_disabled/vim-easy-align/test/include.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vim-easy-align/test/include.vim
rename to etc/soft/nvim/+plugins_disabled/vim-easy-align/test/include.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vim-easy-align/test/regexp.expected b/etc/soft/nvim/+plugins_disabled/vim-easy-align/test/regexp.expected
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vim-easy-align/test/regexp.expected
rename to etc/soft/nvim/+plugins_disabled/vim-easy-align/test/regexp.expected
diff --git a/etc/soft/vim/vim/+plugins_disabled/vim-easy-align/test/regexp.md b/etc/soft/nvim/+plugins_disabled/vim-easy-align/test/regexp.md
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vim-easy-align/test/regexp.md
rename to etc/soft/nvim/+plugins_disabled/vim-easy-align/test/regexp.md
diff --git a/etc/soft/vim/vim/+plugins_disabled/vim-easy-align/test/regexp.script b/etc/soft/nvim/+plugins_disabled/vim-easy-align/test/regexp.script
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vim-easy-align/test/regexp.script
rename to etc/soft/nvim/+plugins_disabled/vim-easy-align/test/regexp.script
diff --git a/etc/soft/vim/vim/+plugins_disabled/vim-easy-align/test/run.vim b/etc/soft/nvim/+plugins_disabled/vim-easy-align/test/run.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vim-easy-align/test/run.vim
rename to etc/soft/nvim/+plugins_disabled/vim-easy-align/test/run.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vim-easy-align/zip b/etc/soft/nvim/+plugins_disabled/vim-easy-align/zip
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vim-easy-align/zip
rename to etc/soft/nvim/+plugins_disabled/vim-easy-align/zip
diff --git a/etc/soft/vim/vim/+plugins_disabled/vim-fugitive b/etc/soft/nvim/+plugins_disabled/vim-fugitive
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vim-fugitive
rename to etc/soft/nvim/+plugins_disabled/vim-fugitive
diff --git a/etc/soft/vim/vim/+plugins_disabled/vim-racket/README.md b/etc/soft/nvim/+plugins_disabled/vim-racket/README.md
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vim-racket/README.md
rename to etc/soft/nvim/+plugins_disabled/vim-racket/README.md
diff --git a/etc/soft/vim/vim/+plugins_disabled/vim-racket/ftdetect/racket.vim b/etc/soft/nvim/+plugins_disabled/vim-racket/ftdetect/racket.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vim-racket/ftdetect/racket.vim
rename to etc/soft/nvim/+plugins_disabled/vim-racket/ftdetect/racket.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vim-racket/ftplugin/racket.vim b/etc/soft/nvim/+plugins_disabled/vim-racket/ftplugin/racket.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vim-racket/ftplugin/racket.vim
rename to etc/soft/nvim/+plugins_disabled/vim-racket/ftplugin/racket.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vim-racket/indent/racket.vim b/etc/soft/nvim/+plugins_disabled/vim-racket/indent/racket.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vim-racket/indent/racket.vim
rename to etc/soft/nvim/+plugins_disabled/vim-racket/indent/racket.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vim-racket/syntax/racket.vim b/etc/soft/nvim/+plugins_disabled/vim-racket/syntax/racket.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vim-racket/syntax/racket.vim
rename to etc/soft/nvim/+plugins_disabled/vim-racket/syntax/racket.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vim-racket/test/delimiters.rkt b/etc/soft/nvim/+plugins_disabled/vim-racket/test/delimiters.rkt
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vim-racket/test/delimiters.rkt
rename to etc/soft/nvim/+plugins_disabled/vim-racket/test/delimiters.rkt
diff --git a/etc/soft/vim/vim/+plugins_disabled/vim-racket/test/number-syntax-test.rkt b/etc/soft/nvim/+plugins_disabled/vim-racket/test/number-syntax-test.rkt
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vim-racket/test/number-syntax-test.rkt
rename to etc/soft/nvim/+plugins_disabled/vim-racket/test/number-syntax-test.rkt
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/README b/etc/soft/nvim/+plugins_disabled/vimple/README
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/README
rename to etc/soft/nvim/+plugins_disabled/vimple/README
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/args.vim b/etc/soft/nvim/+plugins_disabled/vimple/autoload/args.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/autoload/args.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/autoload/args.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/complete.vim b/etc/soft/nvim/+plugins_disabled/vimple/autoload/complete.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/autoload/complete.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/autoload/complete.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/completers.vim b/etc/soft/nvim/+plugins_disabled/vimple/autoload/completers.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/autoload/completers.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/autoload/completers.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/file.vim b/etc/soft/nvim/+plugins_disabled/vimple/autoload/file.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/autoload/file.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/autoload/file.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/list.vim b/etc/soft/nvim/+plugins_disabled/vimple/autoload/list.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/autoload/list.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/autoload/list.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/loclist.vim b/etc/soft/nvim/+plugins_disabled/vimple/autoload/loclist.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/autoload/loclist.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/autoload/loclist.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/ml/bayes.vim b/etc/soft/nvim/+plugins_disabled/vimple/autoload/ml/bayes.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/autoload/ml/bayes.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/autoload/ml/bayes.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/ml/porter.vim b/etc/soft/nvim/+plugins_disabled/vimple/autoload/ml/porter.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/autoload/ml/porter.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/autoload/ml/porter.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/overlay.vim b/etc/soft/nvim/+plugins_disabled/vimple/autoload/overlay.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/autoload/overlay.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/autoload/overlay.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/parse/ini.vim b/etc/soft/nvim/+plugins_disabled/vimple/autoload/parse/ini.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/autoload/parse/ini.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/autoload/parse/ini.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/quickfix.vim b/etc/soft/nvim/+plugins_disabled/vimple/autoload/quickfix.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/autoload/quickfix.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/autoload/quickfix.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/regex.vim b/etc/soft/nvim/+plugins_disabled/vimple/autoload/regex.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/autoload/regex.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/autoload/regex.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/rng.vim b/etc/soft/nvim/+plugins_disabled/vimple/autoload/rng.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/autoload/rng.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/autoload/rng.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/scope.vim b/etc/soft/nvim/+plugins_disabled/vimple/autoload/scope.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/autoload/scope.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/autoload/scope.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/scripts.vim b/etc/soft/nvim/+plugins_disabled/vimple/autoload/scripts.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/autoload/scripts.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/autoload/scripts.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/string.vim b/etc/soft/nvim/+plugins_disabled/vimple/autoload/string.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/autoload/string.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/autoload/string.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/variable.vim b/etc/soft/nvim/+plugins_disabled/vimple/autoload/variable.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/autoload/variable.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/autoload/variable.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple.vim b/etc/soft/nvim/+plugins_disabled/vimple/autoload/vimple.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/autoload/vimple.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/abbreviations.vim b/etc/soft/nvim/+plugins_disabled/vimple/autoload/vimple/abbreviations.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/abbreviations.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/autoload/vimple/abbreviations.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/comparators.vim b/etc/soft/nvim/+plugins_disabled/vimple/autoload/vimple/comparators.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/comparators.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/autoload/vimple/comparators.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/highlight.vim b/etc/soft/nvim/+plugins_disabled/vimple/autoload/vimple/highlight.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/highlight.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/autoload/vimple/highlight.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/history.vim b/etc/soft/nvim/+plugins_disabled/vimple/autoload/vimple/history.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/history.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/autoload/vimple/history.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/ls.vim b/etc/soft/nvim/+plugins_disabled/vimple/autoload/vimple/ls.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/ls.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/autoload/vimple/ls.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/map.vim b/etc/soft/nvim/+plugins_disabled/vimple/autoload/vimple/map.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/map.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/autoload/vimple/map.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/marks.vim b/etc/soft/nvim/+plugins_disabled/vimple/autoload/vimple/marks.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/marks.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/autoload/vimple/marks.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/options.vim b/etc/soft/nvim/+plugins_disabled/vimple/autoload/vimple/options.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/options.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/autoload/vimple/options.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/scriptnames.vim b/etc/soft/nvim/+plugins_disabled/vimple/autoload/vimple/scriptnames.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/scriptnames.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/autoload/vimple/scriptnames.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/undolist.vim b/etc/soft/nvim/+plugins_disabled/vimple/autoload/vimple/undolist.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/undolist.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/autoload/vimple/undolist.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/version.vim b/etc/soft/nvim/+plugins_disabled/vimple/autoload/vimple/version.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/autoload/vimple/version.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/autoload/vimple/version.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/demo/bufgrep.vim b/etc/soft/nvim/+plugins_disabled/vimple/demo/bufgrep.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/demo/bufgrep.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/demo/bufgrep.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/demo/calendar.vim b/etc/soft/nvim/+plugins_disabled/vimple/demo/calendar.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/demo/calendar.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/demo/calendar.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/demo/changelist.vim b/etc/soft/nvim/+plugins_disabled/vimple/demo/changelist.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/demo/changelist.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/demo/changelist.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/demo/global_marks.vim b/etc/soft/nvim/+plugins_disabled/vimple/demo/global_marks.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/demo/global_marks.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/demo/global_marks.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/demo/helptoc.vim b/etc/soft/nvim/+plugins_disabled/vimple/demo/helptoc.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/demo/helptoc.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/demo/helptoc.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/demo/iabbrevs.vim b/etc/soft/nvim/+plugins_disabled/vimple/demo/iabbrevs.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/demo/iabbrevs.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/demo/iabbrevs.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/demo/identsearch.vim b/etc/soft/nvim/+plugins_disabled/vimple/demo/identsearch.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/demo/identsearch.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/demo/identsearch.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/demo/jumplist.vim b/etc/soft/nvim/+plugins_disabled/vimple/demo/jumplist.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/demo/jumplist.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/demo/jumplist.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/demo/oldfiles.vim b/etc/soft/nvim/+plugins_disabled/vimple/demo/oldfiles.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/demo/oldfiles.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/demo/oldfiles.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/demo/spellsuggest.vim b/etc/soft/nvim/+plugins_disabled/vimple/demo/spellsuggest.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/demo/spellsuggest.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/demo/spellsuggest.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/demo/tagkinds.vim b/etc/soft/nvim/+plugins_disabled/vimple/demo/tagkinds.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/demo/tagkinds.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/demo/tagkinds.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/demo/tagsearch.vim b/etc/soft/nvim/+plugins_disabled/vimple/demo/tagsearch.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/demo/tagsearch.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/demo/tagsearch.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/doc/vimple.txt b/etc/soft/nvim/+plugins_disabled/vimple/doc/vimple.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/doc/vimple.txt
rename to etc/soft/nvim/+plugins_disabled/vimple/doc/vimple.txt
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/doc/vimple_ls.txt b/etc/soft/nvim/+plugins_disabled/vimple/doc/vimple_ls.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/doc/vimple_ls.txt
rename to etc/soft/nvim/+plugins_disabled/vimple/doc/vimple_ls.txt
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/ftplugin/python_scope.vim b/etc/soft/nvim/+plugins_disabled/vimple/ftplugin/python_scope.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/ftplugin/python_scope.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/ftplugin/python_scope.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/ftplugin/vim_scope.vim b/etc/soft/nvim/+plugins_disabled/vimple/ftplugin/vim_scope.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/ftplugin/vim_scope.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/ftplugin/vim_scope.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/plugin/vimple.vim b/etc/soft/nvim/+plugins_disabled/vimple/plugin/vimple.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/plugin/vimple.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/plugin/vimple.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/syntax/vimple_jumplist.vim b/etc/soft/nvim/+plugins_disabled/vimple/syntax/vimple_jumplist.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/syntax/vimple_jumplist.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/syntax/vimple_jumplist.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/test/Makefile b/etc/soft/nvim/+plugins_disabled/vimple/test/Makefile
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/test/Makefile
rename to etc/soft/nvim/+plugins_disabled/vimple/test/Makefile
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/test/README b/etc/soft/nvim/+plugins_disabled/vimple/test/README
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/test/README
rename to etc/soft/nvim/+plugins_disabled/vimple/test/README
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/test/_setup.vim b/etc/soft/nvim/+plugins_disabled/vimple/test/_setup.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/test/_setup.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/test/_setup.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/test/buffer_list.vim b/etc/soft/nvim/+plugins_disabled/vimple/test/buffer_list.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/test/buffer_list.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/test/buffer_list.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/test/ini_001.ini b/etc/soft/nvim/+plugins_disabled/vimple/test/ini_001.ini
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/test/ini_001.ini
rename to etc/soft/nvim/+plugins_disabled/vimple/test/ini_001.ini
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/test/ini_001_out.ini b/etc/soft/nvim/+plugins_disabled/vimple/test/ini_001_out.ini
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/test/ini_001_out.ini
rename to etc/soft/nvim/+plugins_disabled/vimple/test/ini_001_out.ini
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/test/ini_002.ini b/etc/soft/nvim/+plugins_disabled/vimple/test/ini_002.ini
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/test/ini_002.ini
rename to etc/soft/nvim/+plugins_disabled/vimple/test/ini_002.ini
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/test/ini_002_out.ini b/etc/soft/nvim/+plugins_disabled/vimple/test/ini_002_out.ini
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/test/ini_002_out.ini
rename to etc/soft/nvim/+plugins_disabled/vimple/test/ini_002_out.ini
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/test/parse_ini_001.vim b/etc/soft/nvim/+plugins_disabled/vimple/test/parse_ini_001.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/test/parse_ini_001.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/test/parse_ini_001.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/test/parse_ini_002.vim b/etc/soft/nvim/+plugins_disabled/vimple/test/parse_ini_002.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/test/parse_ini_002.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/test/parse_ini_002.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/test/string001.vim b/etc/soft/nvim/+plugins_disabled/vimple/test/string001.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/test/string001.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/test/string001.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/test/vimple001.vim b/etc/soft/nvim/+plugins_disabled/vimple/test/vimple001.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/test/vimple001.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/test/vimple001.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimple/test/vimple002.vim b/etc/soft/nvim/+plugins_disabled/vimple/test/vimple002.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimple/test/vimple002.vim
rename to etc/soft/nvim/+plugins_disabled/vimple/test/vimple002.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimwiki/autoload/vimwiki.vim b/etc/soft/nvim/+plugins_disabled/vimwiki/autoload/vimwiki.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimwiki/autoload/vimwiki.vim
rename to etc/soft/nvim/+plugins_disabled/vimwiki/autoload/vimwiki.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimwiki/autoload/vimwiki_diary.vim b/etc/soft/nvim/+plugins_disabled/vimwiki/autoload/vimwiki_diary.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimwiki/autoload/vimwiki_diary.vim
rename to etc/soft/nvim/+plugins_disabled/vimwiki/autoload/vimwiki_diary.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimwiki/autoload/vimwiki_html.vim b/etc/soft/nvim/+plugins_disabled/vimwiki/autoload/vimwiki_html.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimwiki/autoload/vimwiki_html.vim
rename to etc/soft/nvim/+plugins_disabled/vimwiki/autoload/vimwiki_html.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimwiki/autoload/vimwiki_lst.vim b/etc/soft/nvim/+plugins_disabled/vimwiki/autoload/vimwiki_lst.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimwiki/autoload/vimwiki_lst.vim
rename to etc/soft/nvim/+plugins_disabled/vimwiki/autoload/vimwiki_lst.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimwiki/autoload/vimwiki_tbl.vim b/etc/soft/nvim/+plugins_disabled/vimwiki/autoload/vimwiki_tbl.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimwiki/autoload/vimwiki_tbl.vim
rename to etc/soft/nvim/+plugins_disabled/vimwiki/autoload/vimwiki_tbl.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimwiki/doc/vimwiki.txt b/etc/soft/nvim/+plugins_disabled/vimwiki/doc/vimwiki.txt
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimwiki/doc/vimwiki.txt
rename to etc/soft/nvim/+plugins_disabled/vimwiki/doc/vimwiki.txt
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimwiki/ftplugin/vimwiki.vim b/etc/soft/nvim/+plugins_disabled/vimwiki/ftplugin/vimwiki.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimwiki/ftplugin/vimwiki.vim
rename to etc/soft/nvim/+plugins_disabled/vimwiki/ftplugin/vimwiki.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimwiki/plugin/vimwiki.vim b/etc/soft/nvim/+plugins_disabled/vimwiki/plugin/vimwiki.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimwiki/plugin/vimwiki.vim
rename to etc/soft/nvim/+plugins_disabled/vimwiki/plugin/vimwiki.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimwiki/syntax/vimwiki.vim b/etc/soft/nvim/+plugins_disabled/vimwiki/syntax/vimwiki.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimwiki/syntax/vimwiki.vim
rename to etc/soft/nvim/+plugins_disabled/vimwiki/syntax/vimwiki.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimwiki/syntax/vimwiki_default.vim b/etc/soft/nvim/+plugins_disabled/vimwiki/syntax/vimwiki_default.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimwiki/syntax/vimwiki_default.vim
rename to etc/soft/nvim/+plugins_disabled/vimwiki/syntax/vimwiki_default.vim
diff --git a/etc/soft/vim/vim/+plugins_disabled/vimwiki/syntax/vimwiki_media.vim b/etc/soft/nvim/+plugins_disabled/vimwiki/syntax/vimwiki_media.vim
similarity index 100%
rename from etc/soft/vim/vim/+plugins_disabled/vimwiki/syntax/vimwiki_media.vim
rename to etc/soft/nvim/+plugins_disabled/vimwiki/syntax/vimwiki_media.vim
diff --git a/etc/soft/vim/vim/+scripts/declarations/perl b/etc/soft/nvim/+scripts/declarations/perl
similarity index 100%
rename from etc/soft/vim/vim/+scripts/declarations/perl
rename to etc/soft/nvim/+scripts/declarations/perl
diff --git a/etc/soft/vim/vim/+scripts/declarations/prolog b/etc/soft/nvim/+scripts/declarations/prolog
similarity index 100%
rename from etc/soft/vim/vim/+scripts/declarations/prolog
rename to etc/soft/nvim/+scripts/declarations/prolog
diff --git a/etc/soft/vim/vim/+scripts/declarations/rebol b/etc/soft/nvim/+scripts/declarations/rebol
similarity index 100%
rename from etc/soft/vim/vim/+scripts/declarations/rebol
rename to etc/soft/nvim/+scripts/declarations/rebol
diff --git a/etc/soft/vim/vim/+scripts/declarations/scheme b/etc/soft/nvim/+scripts/declarations/scheme
similarity index 100%
rename from etc/soft/vim/vim/+scripts/declarations/scheme
rename to etc/soft/nvim/+scripts/declarations/scheme
diff --git a/etc/soft/vim/vim/+scripts/declarations/sh b/etc/soft/nvim/+scripts/declarations/sh
similarity index 100%
rename from etc/soft/vim/vim/+scripts/declarations/sh
rename to etc/soft/nvim/+scripts/declarations/sh
diff --git a/etc/soft/vim/vim/+scripts/declarations/tcl b/etc/soft/nvim/+scripts/declarations/tcl
similarity index 100%
rename from etc/soft/vim/vim/+scripts/declarations/tcl
rename to etc/soft/nvim/+scripts/declarations/tcl
diff --git a/etc/soft/vim/vim/+scripts/sources/getTclSrc b/etc/soft/nvim/+scripts/sources/getTclSrc
similarity index 100%
rename from etc/soft/vim/vim/+scripts/sources/getTclSrc
rename to etc/soft/nvim/+scripts/sources/getTclSrc
diff --git a/etc/soft/vim/vim/+snippets/install.sh b/etc/soft/nvim/+snippets/install.sh
similarity index 100%
rename from etc/soft/vim/vim/+snippets/install.sh
rename to etc/soft/nvim/+snippets/install.sh
diff --git a/etc/soft/vim/vim/+snippets/tcl.snip b/etc/soft/nvim/+snippets/tcl.snip
similarity index 100%
rename from etc/soft/vim/vim/+snippets/tcl.snip
rename to etc/soft/nvim/+snippets/tcl.snip
diff --git a/etc/soft/vim/vim/+snippets/vimwiki.snip b/etc/soft/nvim/+snippets/vimwiki.snip
similarity index 100%
rename from etc/soft/vim/vim/+snippets/vimwiki.snip
rename to etc/soft/nvim/+snippets/vimwiki.snip
diff --git a/etc/soft/vim/vim/after/syntax/c.vim b/etc/soft/nvim/after/syntax/c.vim
similarity index 100%
rename from etc/soft/vim/vim/after/syntax/c.vim
rename to etc/soft/nvim/after/syntax/c.vim
diff --git a/etc/soft/vim/vim/after/syntax/css.vim b/etc/soft/nvim/after/syntax/css.vim
similarity index 100%
rename from etc/soft/vim/vim/after/syntax/css.vim
rename to etc/soft/nvim/after/syntax/css.vim
diff --git a/etc/soft/vim/vim/autoload/pathogen.vim b/etc/soft/nvim/autoload/pathogen.vim
similarity index 100%
rename from etc/soft/vim/vim/autoload/pathogen.vim
rename to etc/soft/nvim/autoload/pathogen.vim
diff --git a/etc/soft/vim/vim/colors/OneHalfDark.vim b/etc/soft/nvim/colors/OneHalfDark.vim
similarity index 100%
rename from etc/soft/vim/vim/colors/OneHalfDark.vim
rename to etc/soft/nvim/colors/OneHalfDark.vim
diff --git a/etc/soft/vim/vim/colors/OneHalfLight.vim b/etc/soft/nvim/colors/OneHalfLight.vim
similarity index 100%
rename from etc/soft/vim/vim/colors/OneHalfLight.vim
rename to etc/soft/nvim/colors/OneHalfLight.vim
diff --git a/etc/soft/vim/vim/colors/PaperColor.vim b/etc/soft/nvim/colors/PaperColor.vim
similarity index 100%
rename from etc/soft/vim/vim/colors/PaperColor.vim
rename to etc/soft/nvim/colors/PaperColor.vim
diff --git a/etc/soft/vim/vim/colors/forgotten-light.vim b/etc/soft/nvim/colors/forgotten-light.vim
similarity index 100%
rename from etc/soft/vim/vim/colors/forgotten-light.vim
rename to etc/soft/nvim/colors/forgotten-light.vim
diff --git a/etc/soft/vim/vim/colors/wombat.vim b/etc/soft/nvim/colors/wombat.vim
similarity index 100%
rename from etc/soft/vim/vim/colors/wombat.vim
rename to etc/soft/nvim/colors/wombat.vim
diff --git a/etc/soft/vim/vim/colors/wombat256.vim b/etc/soft/nvim/colors/wombat256.vim
similarity index 100%
rename from etc/soft/vim/vim/colors/wombat256.vim
rename to etc/soft/nvim/colors/wombat256.vim
diff --git a/etc/soft/vim/vim/colors/wombat256mod.vim b/etc/soft/nvim/colors/wombat256mod.vim
similarity index 100%
rename from etc/soft/vim/vim/colors/wombat256mod.vim
rename to etc/soft/nvim/colors/wombat256mod.vim
diff --git a/etc/soft/vim/vim/colors/wombat_converted.vim b/etc/soft/nvim/colors/wombat_converted.vim
similarity index 100%
rename from etc/soft/vim/vim/colors/wombat_converted.vim
rename to etc/soft/nvim/colors/wombat_converted.vim
diff --git a/etc/soft/vim/vim/compiler/tex.vim b/etc/soft/nvim/compiler/tex.vim
similarity index 100%
rename from etc/soft/vim/vim/compiler/tex.vim
rename to etc/soft/nvim/compiler/tex.vim
diff --git a/etc/soft/vim/vim/dic/sh b/etc/soft/nvim/dic/sh
similarity index 100%
rename from etc/soft/vim/vim/dic/sh
rename to etc/soft/nvim/dic/sh
diff --git a/etc/soft/vim/vim/dic/tcl b/etc/soft/nvim/dic/tcl
similarity index 100%
rename from etc/soft/vim/vim/dic/tcl
rename to etc/soft/nvim/dic/tcl
diff --git a/etc/soft/vim/vim/doc/git-cheat.txt b/etc/soft/nvim/doc/git-cheat.txt
similarity index 100%
rename from etc/soft/vim/vim/doc/git-cheat.txt
rename to etc/soft/nvim/doc/git-cheat.txt
diff --git a/etc/soft/vim/vim/doc/latexhelp.txt b/etc/soft/nvim/doc/latexhelp.txt
similarity index 100%
rename from etc/soft/vim/vim/doc/latexhelp.txt
rename to etc/soft/nvim/doc/latexhelp.txt
diff --git a/etc/soft/vim/vim/doc/regexpref.txt b/etc/soft/nvim/doc/regexpref.txt
similarity index 100%
rename from etc/soft/vim/vim/doc/regexpref.txt
rename to etc/soft/nvim/doc/regexpref.txt
diff --git a/etc/soft/vim/vim/ftdetect/detect.vim b/etc/soft/nvim/ftdetect/detect.vim
similarity index 100%
rename from etc/soft/vim/vim/ftdetect/detect.vim
rename to etc/soft/nvim/ftdetect/detect.vim
diff --git a/etc/soft/vim/vim/ftplugin/c/c.custom.vim b/etc/soft/nvim/ftplugin/c/c.custom.vim
similarity index 100%
rename from etc/soft/vim/vim/ftplugin/c/c.custom.vim
rename to etc/soft/nvim/ftplugin/c/c.custom.vim
diff --git a/etc/soft/vim/vim/ftplugin/cpp/cpp.custom.vim b/etc/soft/nvim/ftplugin/cpp/cpp.custom.vim
similarity index 100%
rename from etc/soft/vim/vim/ftplugin/cpp/cpp.custom.vim
rename to etc/soft/nvim/ftplugin/cpp/cpp.custom.vim
diff --git a/etc/soft/vim/vim/ftplugin/dockerfile/dockerfile.custom.vim b/etc/soft/nvim/ftplugin/dockerfile/dockerfile.custom.vim
similarity index 100%
rename from etc/soft/vim/vim/ftplugin/dockerfile/dockerfile.custom.vim
rename to etc/soft/nvim/ftplugin/dockerfile/dockerfile.custom.vim
diff --git a/etc/soft/vim/vim/ftplugin/erlang/erlang.custom.vim b/etc/soft/nvim/ftplugin/erlang/erlang.custom.vim
similarity index 100%
rename from etc/soft/vim/vim/ftplugin/erlang/erlang.custom.vim
rename to etc/soft/nvim/ftplugin/erlang/erlang.custom.vim
diff --git a/etc/soft/vim/vim/ftplugin/go/go.custom.vim b/etc/soft/nvim/ftplugin/go/go.custom.vim
similarity index 100%
rename from etc/soft/vim/vim/ftplugin/go/go.custom.vim
rename to etc/soft/nvim/ftplugin/go/go.custom.vim
diff --git a/etc/soft/vim/vim/ftplugin/graphviz/graphviz.custom.vim b/etc/soft/nvim/ftplugin/graphviz/graphviz.custom.vim
similarity index 100%
rename from etc/soft/vim/vim/ftplugin/graphviz/graphviz.custom.vim
rename to etc/soft/nvim/ftplugin/graphviz/graphviz.custom.vim
diff --git a/etc/soft/vim/vim/ftplugin/haskell/haskell.custom.vim b/etc/soft/nvim/ftplugin/haskell/haskell.custom.vim
similarity index 100%
rename from etc/soft/vim/vim/ftplugin/haskell/haskell.custom.vim
rename to etc/soft/nvim/ftplugin/haskell/haskell.custom.vim
diff --git a/etc/soft/vim/vim/ftplugin/html/html.custom.vim b/etc/soft/nvim/ftplugin/html/html.custom.vim
similarity index 100%
rename from etc/soft/vim/vim/ftplugin/html/html.custom.vim
rename to etc/soft/nvim/ftplugin/html/html.custom.vim
diff --git a/etc/soft/vim/vim/ftplugin/lisp/lisp.custom.vim b/etc/soft/nvim/ftplugin/lisp/lisp.custom.vim
similarity index 100%
rename from etc/soft/vim/vim/ftplugin/lisp/lisp.custom.vim
rename to etc/soft/nvim/ftplugin/lisp/lisp.custom.vim
diff --git a/etc/soft/vim/vim/ftplugin/markdown/markdown.custom.vim b/etc/soft/nvim/ftplugin/markdown/markdown.custom.vim
similarity index 100%
rename from etc/soft/vim/vim/ftplugin/markdown/markdown.custom.vim
rename to etc/soft/nvim/ftplugin/markdown/markdown.custom.vim
diff --git a/etc/soft/vim/vim/ftplugin/ocaml/ocaml.custom.vim b/etc/soft/nvim/ftplugin/ocaml/ocaml.custom.vim
similarity index 100%
rename from etc/soft/vim/vim/ftplugin/ocaml/ocaml.custom.vim
rename to etc/soft/nvim/ftplugin/ocaml/ocaml.custom.vim
diff --git a/etc/soft/vim/vim/ftplugin/pascal/pascal.custom.vim b/etc/soft/nvim/ftplugin/pascal/pascal.custom.vim
similarity index 100%
rename from etc/soft/vim/vim/ftplugin/pascal/pascal.custom.vim
rename to etc/soft/nvim/ftplugin/pascal/pascal.custom.vim
diff --git a/etc/soft/vim/vim/ftplugin/perl/perl.custom.vim b/etc/soft/nvim/ftplugin/perl/perl.custom.vim
similarity index 100%
rename from etc/soft/vim/vim/ftplugin/perl/perl.custom.vim
rename to etc/soft/nvim/ftplugin/perl/perl.custom.vim
diff --git a/etc/soft/vim/vim/ftplugin/prolog/prolog.custom.vim b/etc/soft/nvim/ftplugin/prolog/prolog.custom.vim
similarity index 100%
rename from etc/soft/vim/vim/ftplugin/prolog/prolog.custom.vim
rename to etc/soft/nvim/ftplugin/prolog/prolog.custom.vim
diff --git a/etc/soft/vim/vim/ftplugin/racket/racket.custom.vim b/etc/soft/nvim/ftplugin/racket/racket.custom.vim
similarity index 100%
rename from etc/soft/vim/vim/ftplugin/racket/racket.custom.vim
rename to etc/soft/nvim/ftplugin/racket/racket.custom.vim
diff --git a/etc/soft/vim/vim/ftplugin/rename/rename.custom.vim b/etc/soft/nvim/ftplugin/rename/rename.custom.vim
similarity index 100%
rename from etc/soft/vim/vim/ftplugin/rename/rename.custom.vim
rename to etc/soft/nvim/ftplugin/rename/rename.custom.vim
diff --git a/etc/soft/vim/vim/ftplugin/scheme/scheme.custom.vim b/etc/soft/nvim/ftplugin/scheme/scheme.custom.vim
similarity index 100%
rename from etc/soft/vim/vim/ftplugin/scheme/scheme.custom.vim
rename to etc/soft/nvim/ftplugin/scheme/scheme.custom.vim
diff --git a/etc/soft/vim/vim/ftplugin/sh/sh.custom.vim b/etc/soft/nvim/ftplugin/sh/sh.custom.vim
similarity index 100%
rename from etc/soft/vim/vim/ftplugin/sh/sh.custom.vim
rename to etc/soft/nvim/ftplugin/sh/sh.custom.vim
diff --git a/etc/soft/vim/vim/ftplugin/tcl/tcl.custom.vim b/etc/soft/nvim/ftplugin/tcl/tcl.custom.vim
similarity index 100%
rename from etc/soft/vim/vim/ftplugin/tcl/tcl.custom.vim
rename to etc/soft/nvim/ftplugin/tcl/tcl.custom.vim
diff --git a/etc/soft/vim/vim/ftplugin/tex/tex.custom.vim b/etc/soft/nvim/ftplugin/tex/tex.custom.vim
similarity index 100%
rename from etc/soft/vim/vim/ftplugin/tex/tex.custom.vim
rename to etc/soft/nvim/ftplugin/tex/tex.custom.vim
diff --git a/etc/soft/vim/vim/ftplugin/vb/vb.custom.vim b/etc/soft/nvim/ftplugin/vb/vb.custom.vim
similarity index 100%
rename from etc/soft/vim/vim/ftplugin/vb/vb.custom.vim
rename to etc/soft/nvim/ftplugin/vb/vb.custom.vim
diff --git a/etc/soft/vim/vim/ftplugin/vimwiki/vimwiki.custom.vim b/etc/soft/nvim/ftplugin/vimwiki/vimwiki.custom.vim
similarity index 100%
rename from etc/soft/vim/vim/ftplugin/vimwiki/vimwiki.custom.vim
rename to etc/soft/nvim/ftplugin/vimwiki/vimwiki.custom.vim
diff --git a/etc/soft/vim/vim/indent/erlang.vim b/etc/soft/nvim/indent/erlang.vim
similarity index 100%
rename from etc/soft/vim/vim/indent/erlang.vim
rename to etc/soft/nvim/indent/erlang.vim
diff --git a/etc/soft/vim/vim/indent/tcl.vim b/etc/soft/nvim/indent/tcl.vim
similarity index 100%
rename from etc/soft/vim/vim/indent/tcl.vim
rename to etc/soft/nvim/indent/tcl.vim
diff --git a/etc/soft/nvim/init.vim b/etc/soft/nvim/init.vim
index f182e5b..26d9d2a 100644
--- a/etc/soft/nvim/init.vim
+++ b/etc/soft/nvim/init.vim
@@ -1,3 +1,3 @@
-set runtimepath^=~/.vim runtimepath+=~/.vim/after
+set runtimepath^=~/.config/nvim runtimepath+=~/.config/nvim/after
 let &packpath = &runtimepath
-source ~/.vimrc
+source ~/.config/nvim/vimrc
diff --git a/etc/soft/vim/vim/spell/el.utf-8.spl b/etc/soft/nvim/spell/el.utf-8.spl
similarity index 100%
rename from etc/soft/vim/vim/spell/el.utf-8.spl
rename to etc/soft/nvim/spell/el.utf-8.spl
diff --git a/etc/soft/vim/vim/spell/en.utf-8.spl b/etc/soft/nvim/spell/en.utf-8.spl
similarity index 100%
rename from etc/soft/vim/vim/spell/en.utf-8.spl
rename to etc/soft/nvim/spell/en.utf-8.spl
diff --git a/etc/soft/vim/vim/spell/ru.utf-8.spl b/etc/soft/nvim/spell/ru.utf-8.spl
similarity index 100%
rename from etc/soft/vim/vim/spell/ru.utf-8.spl
rename to etc/soft/nvim/spell/ru.utf-8.spl
diff --git a/etc/soft/vim/vim/syntax/abnf.vim b/etc/soft/nvim/syntax/abnf.vim
similarity index 100%
rename from etc/soft/vim/vim/syntax/abnf.vim
rename to etc/soft/nvim/syntax/abnf.vim
diff --git a/etc/soft/vim/vim/syntax/alex.vim b/etc/soft/nvim/syntax/alex.vim
similarity index 100%
rename from etc/soft/vim/vim/syntax/alex.vim
rename to etc/soft/nvim/syntax/alex.vim
diff --git a/etc/soft/vim/vim/syntax/c.vim b/etc/soft/nvim/syntax/c.vim
similarity index 100%
rename from etc/soft/vim/vim/syntax/c.vim
rename to etc/soft/nvim/syntax/c.vim
diff --git a/etc/soft/vim/vim/syntax/conf.vim b/etc/soft/nvim/syntax/conf.vim
similarity index 100%
rename from etc/soft/vim/vim/syntax/conf.vim
rename to etc/soft/nvim/syntax/conf.vim
diff --git a/etc/soft/vim/vim/syntax/cpp.vim b/etc/soft/nvim/syntax/cpp.vim
similarity index 100%
rename from etc/soft/vim/vim/syntax/cpp.vim
rename to etc/soft/nvim/syntax/cpp.vim
diff --git a/etc/soft/vim/vim/syntax/delphi.vim b/etc/soft/nvim/syntax/delphi.vim
similarity index 100%
rename from etc/soft/vim/vim/syntax/delphi.vim
rename to etc/soft/nvim/syntax/delphi.vim
diff --git a/etc/soft/vim/vim/syntax/erlang.vim b/etc/soft/nvim/syntax/erlang.vim
similarity index 100%
rename from etc/soft/vim/vim/syntax/erlang.vim
rename to etc/soft/nvim/syntax/erlang.vim
diff --git a/etc/soft/vim/vim/syntax/graphviz.vim b/etc/soft/nvim/syntax/graphviz.vim
similarity index 100%
rename from etc/soft/vim/vim/syntax/graphviz.vim
rename to etc/soft/nvim/syntax/graphviz.vim
diff --git a/etc/soft/vim/vim/syntax/happy.vim b/etc/soft/nvim/syntax/happy.vim
similarity index 100%
rename from etc/soft/vim/vim/syntax/happy.vim
rename to etc/soft/nvim/syntax/happy.vim
diff --git a/etc/soft/vim/vim/syntax/haskell.vim b/etc/soft/nvim/syntax/haskell.vim
similarity index 100%
rename from etc/soft/vim/vim/syntax/haskell.vim
rename to etc/soft/nvim/syntax/haskell.vim
diff --git a/etc/soft/vim/vim/syntax/html.vim b/etc/soft/nvim/syntax/html.vim
similarity index 100%
rename from etc/soft/vim/vim/syntax/html.vim
rename to etc/soft/nvim/syntax/html.vim
diff --git a/etc/soft/vim/vim/syntax/j.vim b/etc/soft/nvim/syntax/j.vim
similarity index 100%
rename from etc/soft/vim/vim/syntax/j.vim
rename to etc/soft/nvim/syntax/j.vim
diff --git a/etc/soft/vim/vim/syntax/nmap.vim b/etc/soft/nvim/syntax/nmap.vim
similarity index 100%
rename from etc/soft/vim/vim/syntax/nmap.vim
rename to etc/soft/nvim/syntax/nmap.vim
diff --git a/etc/soft/vim/vim/syntax/note.vim b/etc/soft/nvim/syntax/note.vim
similarity index 100%
rename from etc/soft/vim/vim/syntax/note.vim
rename to etc/soft/nvim/syntax/note.vim
diff --git a/etc/soft/vim/vim/syntax/octave.vim b/etc/soft/nvim/syntax/octave.vim
similarity index 100%
rename from etc/soft/vim/vim/syntax/octave.vim
rename to etc/soft/nvim/syntax/octave.vim
diff --git a/etc/soft/vim/vim/syntax/perl.vim b/etc/soft/nvim/syntax/perl.vim
similarity index 100%
rename from etc/soft/vim/vim/syntax/perl.vim
rename to etc/soft/nvim/syntax/perl.vim
diff --git a/etc/soft/vim/vim/syntax/prolog.vim b/etc/soft/nvim/syntax/prolog.vim
similarity index 100%
rename from etc/soft/vim/vim/syntax/prolog.vim
rename to etc/soft/nvim/syntax/prolog.vim
diff --git a/etc/soft/vim/vim/syntax/rfc.vim b/etc/soft/nvim/syntax/rfc.vim
similarity index 100%
rename from etc/soft/vim/vim/syntax/rfc.vim
rename to etc/soft/nvim/syntax/rfc.vim
diff --git a/etc/soft/vim/vim/syntax/rsc.vim b/etc/soft/nvim/syntax/rsc.vim
similarity index 100%
rename from etc/soft/vim/vim/syntax/rsc.vim
rename to etc/soft/nvim/syntax/rsc.vim
diff --git a/etc/soft/vim/vim/syntax/rtorrent.vim b/etc/soft/nvim/syntax/rtorrent.vim
similarity index 100%
rename from etc/soft/vim/vim/syntax/rtorrent.vim
rename to etc/soft/nvim/syntax/rtorrent.vim
diff --git a/etc/soft/vim/vim/syntax/scheme.vim b/etc/soft/nvim/syntax/scheme.vim
similarity index 100%
rename from etc/soft/vim/vim/syntax/scheme.vim
rename to etc/soft/nvim/syntax/scheme.vim
diff --git a/etc/soft/vim/vim/syntax/tab.vim b/etc/soft/nvim/syntax/tab.vim
similarity index 100%
rename from etc/soft/vim/vim/syntax/tab.vim
rename to etc/soft/nvim/syntax/tab.vim
diff --git a/etc/soft/vim/vim/syntax/tcl.vim b/etc/soft/nvim/syntax/tcl.vim
similarity index 100%
rename from etc/soft/vim/vim/syntax/tcl.vim
rename to etc/soft/nvim/syntax/tcl.vim
diff --git a/etc/soft/vim/vim/syntax/tcl_critcl.vim b/etc/soft/nvim/syntax/tcl_critcl.vim
similarity index 100%
rename from etc/soft/vim/vim/syntax/tcl_critcl.vim
rename to etc/soft/nvim/syntax/tcl_critcl.vim
diff --git a/etc/soft/vim/vim/syntax/tcl_doctools.vim b/etc/soft/nvim/syntax/tcl_doctools.vim
similarity index 100%
rename from etc/soft/vim/vim/syntax/tcl_doctools.vim
rename to etc/soft/nvim/syntax/tcl_doctools.vim
diff --git a/etc/soft/vim/vim/syntax/tcl_itcl.vim b/etc/soft/nvim/syntax/tcl_itcl.vim
similarity index 100%
rename from etc/soft/vim/vim/syntax/tcl_itcl.vim
rename to etc/soft/nvim/syntax/tcl_itcl.vim
diff --git a/etc/soft/vim/vim/syntax/tcl_snit.vim b/etc/soft/nvim/syntax/tcl_snit.vim
similarity index 100%
rename from etc/soft/vim/vim/syntax/tcl_snit.vim
rename to etc/soft/nvim/syntax/tcl_snit.vim
diff --git a/etc/soft/vim/vim/syntax/tcl_sqlite.vim b/etc/soft/nvim/syntax/tcl_sqlite.vim
similarity index 100%
rename from etc/soft/vim/vim/syntax/tcl_sqlite.vim
rename to etc/soft/nvim/syntax/tcl_sqlite.vim
diff --git a/etc/soft/vim/vim/syntax/tcl_togl.vim b/etc/soft/nvim/syntax/tcl_togl.vim
similarity index 100%
rename from etc/soft/vim/vim/syntax/tcl_togl.vim
rename to etc/soft/nvim/syntax/tcl_togl.vim
diff --git a/etc/soft/vim/vim/syntax/todo.vim b/etc/soft/nvim/syntax/todo.vim
similarity index 100%
rename from etc/soft/vim/vim/syntax/todo.vim
rename to etc/soft/nvim/syntax/todo.vim
diff --git a/etc/soft/vim/vim/syntax/txt.vim b/etc/soft/nvim/syntax/txt.vim
similarity index 100%
rename from etc/soft/vim/vim/syntax/txt.vim
rename to etc/soft/nvim/syntax/txt.vim
diff --git a/etc/soft/vim/vim/template/cpp.vim b/etc/soft/nvim/template/cpp.vim
similarity index 100%
rename from etc/soft/vim/vim/template/cpp.vim
rename to etc/soft/nvim/template/cpp.vim
diff --git a/etc/soft/vim/vim/template/dosbatch.vim b/etc/soft/nvim/template/dosbatch.vim
similarity index 100%
rename from etc/soft/vim/vim/template/dosbatch.vim
rename to etc/soft/nvim/template/dosbatch.vim
diff --git a/etc/soft/vim/vim/template/haskell.vim b/etc/soft/nvim/template/haskell.vim
similarity index 100%
rename from etc/soft/vim/vim/template/haskell.vim
rename to etc/soft/nvim/template/haskell.vim
diff --git a/etc/soft/vim/vim/template/perl.vim b/etc/soft/nvim/template/perl.vim
similarity index 100%
rename from etc/soft/vim/vim/template/perl.vim
rename to etc/soft/nvim/template/perl.vim
diff --git a/etc/soft/vim/vim/template/prolog.vim b/etc/soft/nvim/template/prolog.vim
similarity index 100%
rename from etc/soft/vim/vim/template/prolog.vim
rename to etc/soft/nvim/template/prolog.vim
diff --git a/etc/soft/vim/vim/template/rebol.vim b/etc/soft/nvim/template/rebol.vim
similarity index 100%
rename from etc/soft/vim/vim/template/rebol.vim
rename to etc/soft/nvim/template/rebol.vim
diff --git a/etc/soft/vim/vim/template/scheme.vim b/etc/soft/nvim/template/scheme.vim
similarity index 100%
rename from etc/soft/vim/vim/template/scheme.vim
rename to etc/soft/nvim/template/scheme.vim
diff --git a/etc/soft/vim/vim/template/sh.vim b/etc/soft/nvim/template/sh.vim
similarity index 100%
rename from etc/soft/vim/vim/template/sh.vim
rename to etc/soft/nvim/template/sh.vim
diff --git a/etc/soft/vim/vim/template/tcl.vim b/etc/soft/nvim/template/tcl.vim
similarity index 100%
rename from etc/soft/vim/vim/template/tcl.vim
rename to etc/soft/nvim/template/tcl.vim
diff --git a/etc/soft/vim/vim/template/tex.vim b/etc/soft/nvim/template/tex.vim
similarity index 100%
rename from etc/soft/vim/vim/template/tex.vim
rename to etc/soft/nvim/template/tex.vim
diff --git a/etc/soft/vim/vim.rc b/etc/soft/nvim/vim.rc
similarity index 100%
rename from etc/soft/vim/vim.rc
rename to etc/soft/nvim/vim.rc
diff --git a/etc/soft/vim/vimrc b/etc/soft/nvim/vimrc
similarity index 99%
rename from etc/soft/vim/vimrc
rename to etc/soft/nvim/vimrc
index c7e8d3c..644d3a6 100644
--- a/etc/soft/vim/vimrc
+++ b/etc/soft/nvim/vimrc
@@ -592,8 +592,8 @@ nnoremap yaN" F"ya"
 " {{{			ВВОД КОМАНД В ДРУГИХ РАСКЛАДКАХ
 " ##############################################################################
 
-source ~/.shellrc/etc/soft/vim/vim/+layouts/russian.vim
-source ~/.shellrc/etc/soft/vim/vim/+layouts/greek.vim
+source ~/.shellrc/etc/soft/nvim/+layouts/russian.vim
+source ~/.shellrc/etc/soft/nvim/+layouts/greek.vim
 
 " }}}###########################################################################
 " {{{			      НАСТРОЙКИ ПЛАГИНОВ
diff --git a/etc/soft/vim/vim/+plugins/vim-emmet/.gitignore b/etc/soft/vim/vim/+plugins/vim-emmet/.gitignore
deleted file mode 100644
index 0a56e3f..0000000
--- a/etc/soft/vim/vim/+plugins/vim-emmet/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/doc/tags