diff --git a/update-home.sh b/update-home.sh
index 9724974..eedc6b8 100755
--- a/update-home.sh
+++ b/update-home.sh
@@ -6,7 +6,7 @@ rm ~/.zcompdump
 # Remove vim config directory
 rm -rf ~/.vim-backup
 mv ~/.vim ~/.vim-backup
-mkdir -p ~/.vim/{autoload,bundle,colors,doc,ftplugin,plugin,spell,syntax}
+mkdir -p ~/.vim/{autoload,pack/shapeshed/start,colors,doc,ftplugin,plugin,spell,syntax}
 
 # Install oh-my-zsh
 rm -rf ~/.oh-my-zsh
@@ -66,121 +66,121 @@ mkdir ~/.vim/autoload
 curl -Sso ~/.vim/autoload/pathogen.vim https://raw.githubusercontent.com/tpope/vim-pathogen/master/autoload/pathogen.vim
 
 # Install jedi plugin for vim
-rm -rf ~/.vim/bundle/jedi
-git clone https://github.com/davidhalter/jedi-vim.git ~/.vim/bundle/jedi
+rm -rf ~/.vim/pack/shapeshed/start/jedi
+git clone https://github.com/davidhalter/jedi-vim.git ~/.vim/pack/shapeshed/start/jedi
 
 # Install nerdtree for vim
-rm -rf ~/.vim/bundle/nerdtree
-git clone https://github.com/scrooloose/nerdtree.git ~/.vim/bundle/nerdtree
+rm -rf ~/.vim/pack/shapeshed/start/nerdtree
+git clone https://github.com/scrooloose/nerdtree.git ~/.vim/pack/shapeshed/start/nerdtree
 
 # Install xmledit for vim
-rm -rf ~/.vim/bundle/xmledit
-git clone https://github.com/sukima/xmledit.git ~/.vim/bundle/xmledit
-pushd ~/.vim/bundle/xmledit
+rm -rf ~/.vim/pack/shapeshed/start/xmledit
+git clone https://github.com/sukima/xmledit.git ~/.vim/pack/shapeshed/start/xmledit
+pushd ~/.vim/pack/shapeshed/start/xmledit
 make install
 popd
 
 # Install syntastic plugin
-rm -rf ~/.vim/bundle/syntastic
-git clone --recursive https://github.com/scrooloose/syntastic.git ~/.vim/bundle/syntastic
+rm -rf ~/.vim/pack/shapeshed/start/syntastic
+git clone --recursive https://github.com/scrooloose/syntastic.git ~/.vim/pack/shapeshed/start/syntastic
 
 # Install autoclose plugin
-rm -rf ~/.vim/bundle/autoclose
-git clone https://github.com/Townk/vim-autoclose.git ~/.vim/bundle/autoclose
+rm -rf ~/.vim/pack/shapeshed/start/autoclose
+git clone https://github.com/Townk/vim-autoclose.git ~/.vim/pack/shapeshed/start/autoclose
 
 # Install tagbar plugin
-rm -rf ~/.vim/bundle/tagbar
-git clone https://github.com/majutsushi/tagbar ~/.vim/bundle/tagbar
+rm -rf ~/.vim/pack/shapeshed/start/tagbar
+git clone https://github.com/majutsushi/tagbar ~/.vim/pack/shapeshed/start/tagbar
 
 # Install vcscommand plugin
-rm -rf ~/.vim/bundle/vcscommand
-git clone https://github.com/vim-scripts/vcscommand.vim.git ~/.vim/bundle/vcscommand
+rm -rf ~/.vim/pack/shapeshed/start/vcscommand
+git clone https://github.com/vim-scripts/vcscommand.vim.git ~/.vim/pack/shapeshed/start/vcscommand
 
 # Remove easytag plugin
-rm -rf ~/.vim/bundle/easytag
-#git clone https://github.com/vim-scripts/easytags.vim.git ~/.vim/bundle/easytag
+rm -rf ~/.vim/pack/shapeshed/start/easytag
+#git clone https://github.com/vim-scripts/easytags.vim.git ~/.vim/pack/shapeshed/start/easytag
 
 # Install closetag plugin
-rm -rf ~/.vim/bundle/closetag
-git clone https://github.com/vim-scripts/closetag.vim.git ~/.vim/bundle/closetag
+rm -rf ~/.vim/pack/shapeshed/start/closetag
+git clone https://github.com/vim-scripts/closetag.vim.git ~/.vim/pack/shapeshed/start/closetag
 
 # Install css3 syntax
-rm -rf ~/.vim/bundle/vim-css3-syntax
-git clone https://github.com/hail2u/vim-css3-syntax ~/.vim/bundle/vim-css3-syntax
+rm -rf ~/.vim/pack/shapeshed/start/vim-css3-syntax
+git clone https://github.com/hail2u/vim-css3-syntax ~/.vim/pack/shapeshed/start/vim-css3-syntax
 
 # Install less syntax
-rm -rf ~/.vim/bundle/vim-less
-git clone https://github.com/groenewege/vim-less.git ~/.vim/bundle/vim-less
+rm -rf ~/.vim/pack/shapeshed/start/vim-less
+git clone https://github.com/groenewege/vim-less.git ~/.vim/pack/shapeshed/start/vim-less
 
 # Install notes plugin
-rm -rf ~/.vim/bundle/misc
-git clone https://github.com/xolox/vim-misc.git ~/.vim/bundle/misc
+rm -rf ~/.vim/pack/shapeshed/start/misc
+git clone https://github.com/xolox/vim-misc.git ~/.vim/pack/shapeshed/start/misc
 
-rm -rf ~/.vim/bundle/notes
-git clone https://github.com/xolox/vim-notes.git ~/.vim/bundle/notes
+rm -rf ~/.vim/pack/shapeshed/start/notes
+git clone https://github.com/xolox/vim-notes.git ~/.vim/pack/shapeshed/start/notes
 
 # Install better highlighting for Python
-rm -rf ~/.vim/bundle/python-syntax
-git clone https://github.com/hdima/python-syntax.git ~/.vim/bundle/python-syntax
+rm -rf ~/.vim/pack/shapeshed/start/python-syntax
+git clone https://github.com/hdima/python-syntax.git ~/.vim/pack/shapeshed/start/python-syntax
 
 # Install better support of colorscheme
-rm -rf ~/.vim/bundle/csapprox
-git clone https://github.com/godlygeek/csapprox.git ~/.vim/bundle/csapprox
+rm -rf ~/.vim/pack/shapeshed/start/csapprox
+git clone https://github.com/godlygeek/csapprox.git ~/.vim/pack/shapeshed/start/csapprox
 
 # Install support of coffeescript
-rm -rf ~/.vim/bundle/coffeescript
-git clone https://github.com/kchmck/vim-coffee-script.git ~/.vim/bundle/coffeescript
+rm -rf ~/.vim/pack/shapeshed/start/coffeescript
+git clone https://github.com/kchmck/vim-coffee-script.git ~/.vim/pack/shapeshed/start/coffeescript
 
 # Install of multiple cursors
-rm -rf ~/.vim/bundle/vim-multiple-cursors
-git clone https://github.com/terryma/vim-multiple-cursors.git ~/.vim/bundle/vim-multiple-cursors
+rm -rf ~/.vim/pack/shapeshed/start/vim-multiple-cursors
+git clone https://github.com/terryma/vim-multiple-cursors.git ~/.vim/pack/shapeshed/start/vim-multiple-cursors
 
 # Install of HTML5 colors
-rm -rf ~/.vim/bundle/html5.vim
-git clone https://github.com/othree/html5.vim.git ~/.vim/bundle/html5.vim
+rm -rf ~/.vim/pack/shapeshed/start/html5.vim
+git clone https://github.com/othree/html5.vim.git ~/.vim/pack/shapeshed/start/html5.vim
 
 # Install vim airline
-rm -rf ~/.vim/bundle/vim-airline
-git clone https://github.com/vim-airline/vim-airline ~/.vim/bundle/vim-airline
-rm -rf ~/.vim/bundle/vim-airline-themes
-git clone https://github.com/vim-airline/vim-airline-themes ~/.vim/bundle/vim-airline-themes
+rm -rf ~/.vim/pack/shapeshed/start/vim-airline
+git clone https://github.com/vim-airline/vim-airline ~/.vim/pack/shapeshed/start/vim-airline
+rm -rf ~/.vim/pack/shapeshed/start/vim-airline-themes
+git clone https://github.com/vim-airline/vim-airline-themes ~/.vim/pack/shapeshed/start/vim-airline-themes
 
 # Install fugitive
-rm -rf ~/.vim/bundle/fugitive
-git clone https://github.com/tpope/vim-fugitive.git ~/.vim/bundle/fugitive
+rm -rf ~/.vim/pack/shapeshed/start/fugitive
+git clone https://github.com/tpope/vim-fugitive.git ~/.vim/pack/shapeshed/start/fugitive
 
 # Install vim lucius
-rm -rf ~/.vim/bundle/lucius
-git clone https://github.com/jonathanfilip/vim-lucius.git ~/.vim/bundle/lucius
+rm -rf ~/.vim/pack/shapeshed/start/lucius
+git clone https://github.com/jonathanfilip/vim-lucius.git ~/.vim/pack/shapeshed/start/lucius
 
 # Install vim renpy
-rm -rf ~/.vim/bundle/vim-renpy
-git clone https://github.com/chaimleib/vim-renpy ~/.vim/bundle/vim-renpy
+rm -rf ~/.vim/pack/shapeshed/start/vim-renpy
+git clone https://github.com/chaimleib/vim-renpy ~/.vim/pack/shapeshed/start/vim-renpy
 
 # Install tmux-airline generator
-rm -rf ~/.vim/bundle/tmuxline
-git clone https://github.com/edkolev/tmuxline.vim ~/.vim/bundle/tmuxline
+rm -rf ~/.vim/pack/shapeshed/start/tmuxline
+git clone https://github.com/edkolev/tmuxline.vim ~/.vim/pack/shapeshed/start/tmuxline
 
 # Install promptline generator
-rm -rf ~/.vim/bundle/promptline
-git clone https://github.com/edkolev/promptline.vim ~/.vim/bundle/promptline
+rm -rf ~/.vim/pack/shapeshed/start/promptline
+git clone https://github.com/edkolev/promptline.vim ~/.vim/pack/shapeshed/start/promptline
 
 # Install Alt mappings
-rm -rf ~/.vim/bundle/vim-alt-mappings
-git clone https://github.com/vim-utils/vim-alt-mappings.git ~/.vim/bundle/vim-alt-mappings
+rm -rf ~/.vim/pack/shapeshed/start/vim-alt-mappings
+git clone https://github.com/vim-utils/vim-alt-mappings.git ~/.vim/pack/shapeshed/start/vim-alt-mappings
 
 # Install typescript for vim
-rm -rf ~/.vim/bundle/typescript-vim
-git clone https://github.com/leafgarland/typescript-vim.git ~/.vim/bundle/typescript-vim
+rm -rf ~/.vim/pack/shapeshed/start/typescript-vim
+git clone https://github.com/leafgarland/typescript-vim.git ~/.vim/pack/shapeshed/start/typescript-vim
 
 # Install languagetool for vim
-rm -rf ~/.vim/bundle/languagetool
-git clone https://github.com/vim-scripts/LanguageTool.git ~/.vim/bundle/languagetool
+rm -rf ~/.vim/pack/shapeshed/start/languagetool
+git clone https://github.com/vim-scripts/LanguageTool.git ~/.vim/pack/shapeshed/start/languagetool
 
 # Install minimap for vim
-rm -rf ~/.vim/bundle/vim-minimap
-git clone https://github.com/severin-lemaignan/vim-minimap.git ~/.vim/bundle/vim-minimap
+rm -rf ~/.vim/pack/shapeshed/start/vim-minimap
+git clone https://github.com/severin-lemaignan/vim-minimap.git ~/.vim/pack/shapeshed/start/vim-minimap
 
 # Install vim pencil
-rm -rf ~/.vim/bundle/vim-pencil
-git clone https://github.com/reedes/vim-pencil ~/.vim/bundle/vim-pencil
+rm -rf ~/.vim/pack/shapeshed/start/vim-pencil
+git clone https://github.com/reedes/vim-pencil ~/.vim/pack/shapeshed/start/vim-pencil