diff --git a/README.markdown b/README.markdown
index 71f4825..6e1364b 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,10 +1,9 @@
-# VIM config
+# Neovim config
 
-This repository holds my VIM configuration including installed bundles managed by vundle.
+This repository holds my Neovim configuration including installed bundles managed by plugged.
 
 ## Installation
 
-* Clone to ~/.vim: `git clone https://github.com/Luzifer/vim.git ~/.vim`
-* Initialize submodule: `cd ~/.vim && git submodule update --init`
-* Create symlink for vimrc: `ln -s ~/.vim/vimrc ~/.vimrc`
-* Initialize vundle `vim +BundleInstall +qall`
+* Clone to ~/.config/nvim: `git clone https://github.com/Luzifer/vim.git ~/.config/nvim`
+* Initialize submodule: `cd ~/.config/nvim && git submodule update --init`
+* Initialize plugged `nvim +PlugInstall +qall`
diff --git a/vimrc b/init.vim
similarity index 96%
rename from vimrc
rename to init.vim
index 0c5054b..4d0fdc7 100644
--- a/vimrc
+++ b/init.vim
@@ -1,7 +1,7 @@
 set nocompatible              " be iMproved, required
 filetype off                  " required
 
-call plug#begin('~/.vim/plugged')
+call plug#begin('~/.config/nvim/plugged')
 
 " Other plugins
 Plug 'nathanaelkane/vim-indent-guides'
@@ -12,14 +12,7 @@ Plug 'godlygeek/tabular'
 Plug 'Chiel92/vim-autoformat'
 Plug 'vim-airline/vim-airline'
 Plug 'reedes/vim-pencil'
-
-if has('nvim')
-  Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
-else
-  Plug 'Shougo/deoplete.nvim'
-  Plug 'roxma/nvim-yarp'
-  Plug 'roxma/vim-hug-neovim-rpc'
-endif
+Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
 
 " Languages
 Plug 'jakar/vim-json'
@@ -69,9 +62,6 @@ set mousem=extend
 " mousetime - maximum time in msec to recognize a double-click
 set mouset=500
 
-" ttymouse - "xterm", "xterm2", "dec" or "netterm"; type of mouse
-set ttym=xterm2
-
 " mouseshape - what the mouse pointer looks like in different modes
 set mouses=i-r:beam,s:updown,sd:udsizing,vs:leftright,vd:lrsizing,m:no,ml:up-arrow,v:rightup-arrow
 
@@ -105,24 +95,12 @@ set km=
 " ttytype - alias for 'term'
 "set tty=builtin_gui
 
-" ttybuiltin - check built-in termcaps first
-set tbi " notbi
-
 " ttyfast - terminal connection is fast
 set tf " notf
 
-" weirdinvert - terminal that requires extra redrawing
-set nowiv " wiv
-
-" esckeys - recognize keys that start with <Esc> in Insert mode
-set ek " noek
-
 " scrolljump - minimal number of lines to scroll at a time
 set sj=1
 
-" ttyscroll - maximum number of lines to use scrolling instead of redrawing
-set tsl=999
-
 " title - show info in the window title
 set title " notitle
 
@@ -636,9 +614,6 @@ set ar " noar
 " patchmode - keep oldest version of a file; specifies file name extension
 set pm=
 
-" shortname - use 8.3 file names (local to buffer)
-set nosn " sn
-
 "
 " the swap file
 " 
@@ -649,21 +624,12 @@ set nosn " sn
 " swapfile - use a swap file for this buffer (local to buffer)
 set swf " noswf
 
-" swapsync - "sync", "fsync" or empty; how to flush a swap file to disk
-set sws=fsync
-
 " updatecount - number of characters typed to cause a swap file update
 set uc=200
 
 " updatetime - time in msec after which the swap file will be updated
 set ut=4000
 
-" maxmem - maximum amount of memory in Kbyte used for one buffer
-set mm=32768
-
-" maxmemtot - maximum amount of memory in Kbyte used for all buffers
-set mmt=32768
-
 "
 " command line editing
 "
@@ -886,9 +852,6 @@ set ccv=
 " delcombine - Delete combining (composing) characters on their own
 set nodeco " deco
 
-" imactivatekey - key that activates the X input method
-set imak=
-
 " ambiwidth - Width of ambiguous width characters
 set ambw=single
 
@@ -954,7 +917,7 @@ hi SignColumn cterm=none ctermbg=none
 "
 " Use goimports for Fmt
 "
-let g:go_fmt_command = expand("~/.vim/bin/gofmtimport")
+let g:go_fmt_command = expand("~/.config/nvim/bin/gofmtimport")
 
 "
 " filetype (common for plugins)