diff --git a/.config/nvim b/.config/nvim
new file mode 120000
index 0000000..815cbcc
--- /dev/null
+++ b/.config/nvim
@@ -0,0 +1 @@
+../.vim
\ No newline at end of file
diff --git a/.nvim b/.nvim
deleted file mode 120000
index 8355b52..0000000
--- a/.nvim
+++ /dev/null
@@ -1 +0,0 @@
-.vim
\ No newline at end of file
diff --git a/.nvimrc b/.nvimrc
deleted file mode 120000
index 1490f7a..0000000
--- a/.nvimrc
+++ /dev/null
@@ -1 +0,0 @@
-.vimrc
\ No newline at end of file
diff --git a/.vim/init.vim b/.vim/init.vim
new file mode 120000
index 0000000..f67022e
--- /dev/null
+++ b/.vim/init.vim
@@ -0,0 +1 @@
+../.vimrc
\ No newline at end of file
diff --git a/install.sh b/install.sh
index 7655541..9e681a9 100755
--- a/install.sh
+++ b/install.sh
@@ -63,8 +63,7 @@ function performSetup() {
     echo "Linking vim..."
     linkFile ".vim"
     linkFile ".vimrc"
-    linkFile ".nvim"
-    linkFile ".nvimrc"
+    linkFile ".config/nvim"
 
     echo "Linking Git..."
     linkFile ".gitconfig"
@@ -88,7 +87,7 @@ function performSetup() {
     echo "Installing some default applications"
     sudo add-apt-repository ppa:neovim-ppa/unstable
     sudo apt-get update
-    sudo apt-get install -y python-dev python-pip python3-dev python3-pip neovim
+    sudo apt-get install -y cmake python-dev python-pip python3-dev python3-pip neovim
     sudo pip3 install -U neovim
     sudo pip2 install -U neovim