diff --git a/vimrc.symlink b/init.vim
similarity index 100%
rename from vimrc.symlink
rename to init.vim
diff --git a/install.sh b/install.sh
index c1bd3ee..dd917e1 100755
--- a/install.sh
+++ b/install.sh
@@ -6,7 +6,7 @@ if [[ ! -d ~/.oh-my-zsh ]]; then
     echo -e "\nInstall oh-my-zsh"
     echo "============================="
     sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
-    ln -s $DOTFILES/zsh/{custom,aliases}.zsh ~/.oh-my-zsh/custom/{custom,aliases}.zsh
+    ln -s $DOTFILES/zsh/{custom,aliases}.zsh ~/.oh-my-zsh/custom/
 fi
 
 echo -e "\nCreating symlinks"
@@ -23,10 +23,12 @@ for file in $linkables ; do
 done
 
 # Vim folders
-echo -e "\eLinking vim folders"
+echo -e "\eLinking vim files and folders"
+ln "$DOTFILES/init.vim" "$HOME/.config/nvim"
 linkables=$( find vim -mindepth 1 -type d -exec basename {} \; )
+mkdir ~/.config/nvim
 for folder in $linkables ; do
-    target="$HOME/.vim/$folder"
+    target="$HOME/.config/nvim/$folder"
     if [ -e $target ]; then
         echo "~${target#$HOME/.vim} already exists... Skipping."
     else