diff --git a/vim/UltiSnips/javascript.snippets b/SpaceVim.d/autoload/UltiSnips/javascript.snippets
similarity index 100%
rename from vim/UltiSnips/javascript.snippets
rename to SpaceVim.d/autoload/UltiSnips/javascript.snippets
diff --git a/vim/UltiSnips/sh.snippets b/SpaceVim.d/autoload/UltiSnips/sh.snippets
similarity index 100%
rename from vim/UltiSnips/sh.snippets
rename to SpaceVim.d/autoload/UltiSnips/sh.snippets
diff --git a/vim/UltiSnips/sshconfig.snippets b/SpaceVim.d/autoload/UltiSnips/sshconfig.snippets
similarity index 100%
rename from vim/UltiSnips/sshconfig.snippets
rename to SpaceVim.d/autoload/UltiSnips/sshconfig.snippets
diff --git a/vim/UltiSnips/zsh.snippets b/SpaceVim.d/autoload/UltiSnips/zsh.snippets
similarity index 100%
rename from vim/UltiSnips/zsh.snippets
rename to SpaceVim.d/autoload/UltiSnips/zsh.snippets
diff --git a/vim/after/plugin/vimrc_after.vim b/SpaceVim.d/autoload/after/plugin/vimrc_after.vim
similarity index 100%
rename from vim/after/plugin/vimrc_after.vim
rename to SpaceVim.d/autoload/after/plugin/vimrc_after.vim
diff --git a/vim/autoload/pathogen.vim b/SpaceVim.d/autoload/autoload/pathogen.vim
similarity index 100%
rename from vim/autoload/pathogen.vim
rename to SpaceVim.d/autoload/autoload/pathogen.vim
diff --git a/vim/ftplugin/gitcommit.vim b/SpaceVim.d/autoload/ftplugin/gitcommit.vim
similarity index 100%
rename from vim/ftplugin/gitcommit.vim
rename to SpaceVim.d/autoload/ftplugin/gitcommit.vim
diff --git a/vim/ftplugin/javascript.vim b/SpaceVim.d/autoload/ftplugin/javascript.vim
similarity index 100%
rename from vim/ftplugin/javascript.vim
rename to SpaceVim.d/autoload/ftplugin/javascript.vim
diff --git a/SpaceVim.d/autoload/paiyou.vim b/SpaceVim.d/autoload/paiyou.vim
index a80d8b3..045e58f 100644
--- a/SpaceVim.d/autoload/paiyou.vim
+++ b/SpaceVim.d/autoload/paiyou.vim
@@ -7,321 +7,21 @@ function! paiyou#after() abort
   let g:ctrlp_max_files=0
 endfunction
 
-" ========================================
-" General vim sanity improvements
-" ========================================
-"
-"
-" alias yw to yank the entire word 'yank inner word'
-" even if the cursor is halfway inside the word
-" FIXME: will not properly repeat when you use a dot (tie into repeat.vim)
-nnoremap ,yw yiww
+" load customized settings
 
-" ,ow = 'overwrite word', replace a word with what's in the yank buffer
-" FIXME: will not properly repeat when you use a dot (tie into repeat.vim)
-nnoremap ,ow "_diwhp
+let vimsettings = '~/.yadr/SpaceVim.d/autoload/settings'
+let uname = system("uname -s")
 
-"make Y consistent with C and D
-nnoremap Y y$
-function! YRRunAfterMaps()
-  nnoremap Y   :<C-U>YRYankCount 'y$'<CR>
-endfunction
+for fpath in split(globpath(vimsettings, 'yadr-keymap*.vim'), '\n')
+  echom fpath
 
-" Make 0 go to the first character rather than the beginning
-" of the line. When we're programming, we're almost always
-" interested in working with text rather than empty space. If
-" you want the traditional beginning of line, use ^
-nnoremap 0 ^
-nnoremap ^ 0
-
-" ,# Surround a word with #{ruby interpolation}
-map ,# ysiw#
-vmap ,# c#{<C-R>"}<ESC>
-
-" ," Surround a word with "quotes"
-map ," ysiw"
-vmap ," c"<C-R>""<ESC>
-
-" ,' Surround a word with 'single quotes'
-map ,' ysiw'
-vmap ,' c'<C-R>"'<ESC>
-
-" ,) or ,( Surround a word with (parens)
-" The difference is in whether a space is put in
-map ,( ysiw(
-map ,) ysiw)
-vmap ,( c( <C-R>" )<ESC>
-vmap ,) c(<C-R>")<ESC>
-
-" ,[ Surround a word with [brackets]
-map ,] ysiw]
-map ,[ ysiw[
-vmap ,[ c[ <C-R>" ]<ESC>
-vmap ,] c[<C-R>"]<ESC>
-
-" ,{ Surround a word with {braces}
-map ,} ysiw}
-map ,{ ysiw{
-vmap ,} c{ <C-R>" }<ESC>
-vmap ,{ c{<C-R>"}<ESC>
-
-map ,` ysiw`
-
-" gary bernhardt's hashrocket
-imap <c-l> <space>=><space>
-
-"Go to last edit location with ,.
-nnoremap ,. '.
-
-"When typing a string, your quotes auto complete. Move past the quote
-"while still in insert mode by hitting Ctrl-a. Example:
-"
-" type 'foo<c-a>
-"
-" the first quote will autoclose so you'll get 'foo' and hitting <c-a> will
-" put the cursor right after the quote
-imap <C-a> <esc>wa
-
-" ==== NERD tree
-" Open the project tree and expose current file in the nerdtree with Ctrl-\
-" " calls NERDTreeFind iff NERDTree is active, current window contains a modifiable file, and we're not in vimdiff
-function! OpenNerdTree()
-  if &modifiable && strlen(expand('%')) > 0 && !&diff
-    NERDTreeFind
-  else
-    NERDTreeToggle
+  if (fpath == expand(vimsettings) . "/yadr-keymap-mac.vim") && uname[:4] ==? "linux"
+    continue " skip mac mappings for linux
   endif
-endfunction
-nnoremap <silent> <C-\> :call OpenNerdTree()<CR>
 
-" ,q to toggle quickfix window (where you have stuff like Ag)
-" ,oq to open it back up (rare)
-nmap <silent> ,qc :cclose<CR>
-nmap <silent> ,qo :copen<CR>
-
-"Move back and forth through previous and next buffers
-"with ,z and ,x
-nnoremap <silent> ,z :bp<CR>
-nnoremap <silent> ,x :bn<CR>
-
-" ==============================
-" Window/Tab/Split Manipulation
-" ==============================
-" Move between split windows by using the four directions H, L, K, J
-" NOTE: This has moved to vim/settings/vim-tmux-navigator.vim.
-" nnoremap <silent> <C-h> <C-w>h
-" nnoremap <silent> <C-l> <C-w>l
-" nnoremap <silent> <C-k> <C-w>k
-" nnoremap <silent> <C-j> <C-w>j
-
-" Make gf (go to file) create the file, if not existent
-nnoremap <C-w>f :sp +e<cfile><CR>
-nnoremap <C-w>gf :tabe<cfile><CR>
-
-" Zoom in
-map <silent> ,gz <C-w>o
-
-" Create window splits easier. The default
-" way is Ctrl-w,v and Ctrl-w,s. I remap
-" this to vv and ss
-nnoremap <silent> vv <C-w>v
-nnoremap <silent> ss <C-w>s
-
-" create <%= foo %> erb tags using Ctrl-k in edit mode
-imap <silent> <C-K> <%=   %><Esc>3hi
-
-" create <%= foo %> erb tags using Ctrl-j in edit mode
-imap <silent> <C-J> <%  %><Esc>2hi
-
-" ============================
-" Shortcuts for everyday tasks
-" ============================
-
-" copy current filename into system clipboard - mnemonic: (c)urrent(f)ilename
-" this is helpful to paste someone the path you're looking at
-nnoremap <silent> ,cf :let @* = expand("%:~")<CR>
-nnoremap <silent> ,cr :let @* = expand("%")<CR>
-nnoremap <silent> ,cn :let @* = expand("%:t")<CR>
-
-"Clear current search highlight by double tapping //
-nmap <silent> // :nohlsearch<CR>
-
-"(v)im (c)ommand - execute current line as a vim command
-nmap <silent> ,vc yy:<C-f>p<C-c><CR>
-
-"(v)im (r)eload
-nmap <silent> ,vr :so %<CR>
-
-" Type ,hl to toggle highlighting on/off, and show current value.
-noremap ,hl :set hlsearch! hlsearch?<CR>
-
-" These are very similar keys. Typing 'a will jump to the line in the current
-" file marked with ma. However, `a will jump to the line and column marked
-" with ma.  ItŐs more useful in any case I can imagine, but itŐs located way
-" off in the corner of the keyboard. The best way to handle this is just to
-" swap them: http://items.sjbach.com/319/configuring-vim-right
-nnoremap ' `
-nnoremap ` '
-
-" ============================
-" SplitJoin plugin
-" ============================
-nmap sj :SplitjoinSplit<cr>
-nmap sk :SplitjoinJoin<cr>
-
-" Get the current highlight group. Useful for then remapping the color
-map ,hi :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<' . synIDattr(synID(line("."),col("."),0),"name") . "> lo<" . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">" . " FG:" . synIDattr(synIDtrans(synID(line("."),col("."),1)),"fg#")<CR>
-
-" ,hp = html preview
-map <silent> ,hp :!open -a Safari %<CR><CR>
-
-"paste text in insertion mode
-inoremap <C-X><C-V> <esc>"+pa
-"paste text in normal mode
-nnoremap <C-X><C-V> "+p"
-
-"------------------------------------------------------------------------------
-" Misc
-"------------------------------------------------------------------------------
-" Toggle paste mode on and off
-map <leader>pp :setlocal paste!<cr>
-" copy all out of vim
-nnoremap <C-X><C-A> <esc>gg"+yG
-" copy text in visual mode
-vnoremap <C-C> "+yy
-" copy all inside vim
-nnoremap <C-A> <esc>ggyG
-" edit file
-nmap <leader>ev :tabedit $MYVIMRC<cr>'tzo
-nmap <leader>em :tabedit makefile
-
-" move around compile errors
-nnoremap <leader>n :cnext<cr>
-nnoremap <leader>p :cprevious<cr>
-
-nnoremap <leader>l :redraw!<cr>
-imap <leader>cb ??
-nnoremap <leader>n :cn<cr>
-nnoremap <leader>p :cp<cr>
-
-" Fast Saving
-map <Leader>w :w<CR>
-imap <Leader>w <ESC>:w<CR>
-vmap <Leader>w <ESC><ESC>:w<CR>
-
-" :W sudo saves the file
-" (useful for handling the permission-denied error)
-if !exists(':W')
-  command W w !sudo tee % > /dev/null
-endif
-
-" Highlight current line - allows you to track cursor position more easily
-set cursorline
-
-" map CTRL-L to piece-wise copying of the line above the current one
-imap <C-L> @@@<esc>hhkywjl?@@@<CR>P/@@@<cr>3s
-
-
-" Allow to copy/paste between VIM instances
-"copy the current visual selection to ~/.vbuf
-vmap <leader>y :w! ~/.vbuf<cr>
-
-"copy the current line to the buffer file if no visual selection
-vmap <leader>y :.w! ~/.vbuf<cr>
-
-"paste the contents of the buffer file
-nmap <leader>p :r ~/.vbuf<cr>
-
-"------------------------------------------------------------------------------
-" Moving around, tabs, windows and buffers
-"------------------------------------------------------------------------------
-" Switch between the last two files
-nnoremap <leader><leader> <C-^>
-
-" easy way to edit reload .vimrc
-nmap <leader>V :source $MYVIMRC<cr>
-nmap <leader>v :vsp $MYVIMRC<cr>
-
-" Quickly open a buffer for scribble
-map <leader>q :e ~/buffer<cr>
-
-" Quickly open a markdown buffer for scribble
-map <leader>x :e ~/buffer.md<cr>
-
-" Remove the Windows ^M - when the encodings gets messed up
-noremap <Leader>m mmHmt:%s/<C-V><cr>//ge<cr>'tzt'm
-
-"------------------------------------------------------------------------------
-" Spell checking
-"------------------------------------------------------------------------------
-
-" Pressing ,ss will toggle and untoggle spell checking
-map <leader>ss :setlocal spell!<cr>
-
-" visual shifting (does not exit Visual mode)
-vnoremap < <gv
-vnoremap > >gv
-
-" Switch CWD to the directory of the open buffer
-map <leader>cd :cd %:p:h<cr>:pwd<cr>
-
-" Treat long lines as break lines (useful when moving around in them)
-map j gj
-map k gk
-
-" Close the current buffer (w/o closing the current window)
-map <leader>bd :bd<cr>
-
-" Close all the buffers
-map <leader>bda :1,1000 bd!<cr>
-
-" Useful mappings for managing tabs
-map <leader>tn :tabnew<cr>
-map <leader>to :tabonly<cr>
-map <leader>tc :tabclose<cr>
-map <leader>tm :tabmove
-map <leader>tj :tabnext
-map <leader>tk :tabprevious
-
-" Let 'tl' toggle between this and the last accessed tab
-let g:lasttab = 1
-nmap <Leader>tl :exe "tabn ".g:lasttab<CR>
-au TabLeave * let g:lasttab = tabpagenr()
-
-"------------------------------------------------------------------------------
-" Visual mode related
-"------------------------------------------------------------------------------
-
-" Visual mode pressing * or # searches for the current selection
-" Super useful! From an idea by Michael Naumann
-vnoremap <silent> * :call VisualSelection('f', '')<CR>
-vnoremap <silent> # :call VisualSelection('b', '')<CR>
-
-
-noremap <Up> :echo 'Action is not allowed'<CR>
-noremap <Down> :echo 'Action is not allowed'<CR>
-noremap <Left> :echo 'Action is not allowed'<CR>
-noremap <Right> :echo 'Action is not allowed'<CR>
-inoremap <leader>fn <C-R>=expand("%:t")<CR>
-
-
-function! TogglePaste()
-  if &paste
-    setlocal nopaste
-  else
-    setlocal paste
+  if (fpath == expand(vimsettings) . "/yadr-keymap-linux.vim") && uname[:4] !=? "linux"
+    continue " skip linux mappings for mac
   endif
-endfunction
 
-function! ToggleRspecTest()
-  let l:line=getline('.')
-  if l:line =~? ',\s*now:\s.*true'
-    call setline('.', substitute(l:line, "\,\\s*now:\\s*true", "", ""))
-  else
-    call setline('.', substitute(l:line, "\\([^\\s]\\)\\s*do", "\\1, now: true do", ""))
-  endif
-endfunction
-
-" set paste
-nnoremap <localleader>tp :call TogglePaste()<cr>
-nnoremap <localleader>tt :call ToggleRspecTest()<cr>
+  exe 'source' fpath
+endfor
diff --git a/vim/settings/NERDtree.vim b/SpaceVim.d/autoload/settings/NERDtree.vim
similarity index 100%
rename from vim/settings/NERDtree.vim
rename to SpaceVim.d/autoload/settings/NERDtree.vim
diff --git a/SpaceVim.d/autoload/README.md b/SpaceVim.d/autoload/settings/README.md
similarity index 100%
rename from SpaceVim.d/autoload/README.md
rename to SpaceVim.d/autoload/settings/README.md
diff --git a/SpaceVim.d/autoload/abbr.vim b/SpaceVim.d/autoload/settings/abbr.vim
similarity index 100%
rename from SpaceVim.d/autoload/abbr.vim
rename to SpaceVim.d/autoload/settings/abbr.vim
diff --git a/SpaceVim.d/autoload/ag.vim b/SpaceVim.d/autoload/settings/ag.vim
similarity index 100%
rename from SpaceVim.d/autoload/ag.vim
rename to SpaceVim.d/autoload/settings/ag.vim
diff --git a/vim/settings/ale.vim b/SpaceVim.d/autoload/settings/ale.vim
similarity index 100%
rename from vim/settings/ale.vim
rename to SpaceVim.d/autoload/settings/ale.vim
diff --git a/SpaceVim.d/autoload/autotag.vim b/SpaceVim.d/autoload/settings/autotag.vim
similarity index 100%
rename from SpaceVim.d/autoload/autotag.vim
rename to SpaceVim.d/autoload/settings/autotag.vim
diff --git a/SpaceVim.d/autoload/camelcasemotion.vim b/SpaceVim.d/autoload/settings/camelcasemotion.vim
similarity index 100%
rename from SpaceVim.d/autoload/camelcasemotion.vim
rename to SpaceVim.d/autoload/settings/camelcasemotion.vim
diff --git a/SpaceVim.d/autoload/ctrlp.vim b/SpaceVim.d/autoload/settings/ctrlp.vim
similarity index 100%
rename from SpaceVim.d/autoload/ctrlp.vim
rename to SpaceVim.d/autoload/settings/ctrlp.vim
diff --git a/SpaceVim.d/autoload/easy-grep.vim b/SpaceVim.d/autoload/settings/easy-grep.vim
similarity index 100%
rename from SpaceVim.d/autoload/easy-grep.vim
rename to SpaceVim.d/autoload/settings/easy-grep.vim
diff --git a/SpaceVim.d/autoload/easymotion.vim b/SpaceVim.d/autoload/settings/easymotion.vim
similarity index 100%
rename from SpaceVim.d/autoload/easymotion.vim
rename to SpaceVim.d/autoload/settings/easymotion.vim
diff --git a/SpaceVim.d/autoload/gh-markdown.vim b/SpaceVim.d/autoload/settings/gh-markdown.vim
similarity index 100%
rename from SpaceVim.d/autoload/gh-markdown.vim
rename to SpaceVim.d/autoload/settings/gh-markdown.vim
diff --git a/SpaceVim.d/autoload/go.vim b/SpaceVim.d/autoload/settings/go.vim
similarity index 100%
rename from SpaceVim.d/autoload/go.vim
rename to SpaceVim.d/autoload/settings/go.vim
diff --git a/SpaceVim.d/autoload/gotofile.vim b/SpaceVim.d/autoload/settings/gotofile.vim
similarity index 100%
rename from SpaceVim.d/autoload/gotofile.vim
rename to SpaceVim.d/autoload/settings/gotofile.vim
diff --git a/SpaceVim.d/autoload/grep.vim b/SpaceVim.d/autoload/settings/grep.vim
similarity index 100%
rename from SpaceVim.d/autoload/grep.vim
rename to SpaceVim.d/autoload/settings/grep.vim
diff --git a/SpaceVim.d/autoload/gundo.vim b/SpaceVim.d/autoload/settings/gundo.vim
similarity index 100%
rename from SpaceVim.d/autoload/gundo.vim
rename to SpaceVim.d/autoload/settings/gundo.vim
diff --git a/SpaceVim.d/autoload/iterm-rspec.vim b/SpaceVim.d/autoload/settings/iterm-rspec.vim
similarity index 100%
rename from SpaceVim.d/autoload/iterm-rspec.vim
rename to SpaceVim.d/autoload/settings/iterm-rspec.vim
diff --git a/SpaceVim.d/autoload/js.vim b/SpaceVim.d/autoload/settings/js.vim
similarity index 100%
rename from SpaceVim.d/autoload/js.vim
rename to SpaceVim.d/autoload/settings/js.vim
diff --git a/SpaceVim.d/autoload/lightline.vim b/SpaceVim.d/autoload/settings/lightline.vim
similarity index 100%
rename from SpaceVim.d/autoload/lightline.vim
rename to SpaceVim.d/autoload/settings/lightline.vim
diff --git a/SpaceVim.d/autoload/markdown.vim b/SpaceVim.d/autoload/settings/markdown.vim
similarity index 100%
rename from SpaceVim.d/autoload/markdown.vim
rename to SpaceVim.d/autoload/settings/markdown.vim
diff --git a/SpaceVim.d/autoload/next-textobject.vim b/SpaceVim.d/autoload/settings/next-textobject.vim
similarity index 100%
rename from SpaceVim.d/autoload/next-textobject.vim
rename to SpaceVim.d/autoload/settings/next-textobject.vim
diff --git a/SpaceVim.d/autoload/open-changed-files.vim b/SpaceVim.d/autoload/settings/open-changed-files.vim
similarity index 100%
rename from SpaceVim.d/autoload/open-changed-files.vim
rename to SpaceVim.d/autoload/settings/open-changed-files.vim
diff --git a/SpaceVim.d/autoload/outerblock.vim b/SpaceVim.d/autoload/settings/outerblock.vim
similarity index 100%
rename from SpaceVim.d/autoload/outerblock.vim
rename to SpaceVim.d/autoload/settings/outerblock.vim
diff --git a/SpaceVim.d/autoload/path.vim b/SpaceVim.d/autoload/settings/path.vim
similarity index 100%
rename from SpaceVim.d/autoload/path.vim
rename to SpaceVim.d/autoload/settings/path.vim
diff --git a/SpaceVim.d/autoload/python-mode.vim b/SpaceVim.d/autoload/settings/python-mode.vim
similarity index 100%
rename from SpaceVim.d/autoload/python-mode.vim
rename to SpaceVim.d/autoload/settings/python-mode.vim
diff --git a/SpaceVim.d/autoload/python.vim b/SpaceVim.d/autoload/settings/python.vim
similarity index 100%
rename from SpaceVim.d/autoload/python.vim
rename to SpaceVim.d/autoload/settings/python.vim
diff --git a/SpaceVim.d/autoload/quickfix-search.vim b/SpaceVim.d/autoload/settings/quickfix-search.vim
similarity index 100%
rename from SpaceVim.d/autoload/quickfix-search.vim
rename to SpaceVim.d/autoload/settings/quickfix-search.vim
diff --git a/SpaceVim.d/autoload/rails.vim b/SpaceVim.d/autoload/settings/rails.vim
similarity index 100%
rename from SpaceVim.d/autoload/rails.vim
rename to SpaceVim.d/autoload/settings/rails.vim
diff --git a/SpaceVim.d/autoload/ripgrep.vim b/SpaceVim.d/autoload/settings/ripgrep.vim
similarity index 100%
rename from SpaceVim.d/autoload/ripgrep.vim
rename to SpaceVim.d/autoload/settings/ripgrep.vim
diff --git a/SpaceVim.d/autoload/rspec.vim b/SpaceVim.d/autoload/settings/rspec.vim
similarity index 100%
rename from SpaceVim.d/autoload/rspec.vim
rename to SpaceVim.d/autoload/settings/rspec.vim
diff --git a/SpaceVim.d/autoload/search.vim b/SpaceVim.d/autoload/settings/search.vim
similarity index 100%
rename from SpaceVim.d/autoload/search.vim
rename to SpaceVim.d/autoload/settings/search.vim
diff --git a/vim/settings.vim b/SpaceVim.d/autoload/settings/settings.vim
similarity index 100%
rename from vim/settings.vim
rename to SpaceVim.d/autoload/settings/settings.vim
diff --git a/SpaceVim.d/autoload/showmarks.vim b/SpaceVim.d/autoload/settings/showmarks.vim
similarity index 100%
rename from SpaceVim.d/autoload/showmarks.vim
rename to SpaceVim.d/autoload/settings/showmarks.vim
diff --git a/SpaceVim.d/autoload/smart_jump_to_tag.vim b/SpaceVim.d/autoload/settings/smart_jump_to_tag.vim
similarity index 100%
rename from SpaceVim.d/autoload/smart_jump_to_tag.vim
rename to SpaceVim.d/autoload/settings/smart_jump_to_tag.vim
diff --git a/SpaceVim.d/autoload/sneak.vim b/SpaceVim.d/autoload/settings/sneak.vim
similarity index 100%
rename from SpaceVim.d/autoload/sneak.vim
rename to SpaceVim.d/autoload/settings/sneak.vim
diff --git a/SpaceVim.d/autoload/surround.vim b/SpaceVim.d/autoload/settings/surround.vim
similarity index 100%
rename from SpaceVim.d/autoload/surround.vim
rename to SpaceVim.d/autoload/settings/surround.vim
diff --git a/SpaceVim.d/autoload/syntastic.vim b/SpaceVim.d/autoload/settings/syntastic.vim
similarity index 100%
rename from SpaceVim.d/autoload/syntastic.vim
rename to SpaceVim.d/autoload/settings/syntastic.vim
diff --git a/SpaceVim.d/autoload/tComment.vim b/SpaceVim.d/autoload/settings/tComment.vim
similarity index 100%
rename from SpaceVim.d/autoload/tComment.vim
rename to SpaceVim.d/autoload/settings/tComment.vim
diff --git a/SpaceVim.d/autoload/tagbar.vim b/SpaceVim.d/autoload/settings/tagbar.vim
similarity index 100%
rename from SpaceVim.d/autoload/tagbar.vim
rename to SpaceVim.d/autoload/settings/tagbar.vim
diff --git a/SpaceVim.d/autoload/tidy.vim b/SpaceVim.d/autoload/settings/tidy.vim
similarity index 100%
rename from SpaceVim.d/autoload/tidy.vim
rename to SpaceVim.d/autoload/settings/tidy.vim
diff --git a/SpaceVim.d/autoload/ultisnips.vim b/SpaceVim.d/autoload/settings/ultisnips.vim
similarity index 100%
rename from SpaceVim.d/autoload/ultisnips.vim
rename to SpaceVim.d/autoload/settings/ultisnips.vim
diff --git a/SpaceVim.d/autoload/unimpaired.vim b/SpaceVim.d/autoload/settings/unimpaired.vim
similarity index 100%
rename from SpaceVim.d/autoload/unimpaired.vim
rename to SpaceVim.d/autoload/settings/unimpaired.vim
diff --git a/SpaceVim.d/autoload/vim-fugitive.vim b/SpaceVim.d/autoload/settings/vim-fugitive.vim
similarity index 100%
rename from SpaceVim.d/autoload/vim-fugitive.vim
rename to SpaceVim.d/autoload/settings/vim-fugitive.vim
diff --git a/SpaceVim.d/autoload/vim-gitgutter.vim b/SpaceVim.d/autoload/settings/vim-gitgutter.vim
similarity index 100%
rename from SpaceVim.d/autoload/vim-gitgutter.vim
rename to SpaceVim.d/autoload/settings/vim-gitgutter.vim
diff --git a/SpaceVim.d/autoload/vim-indent-guides.vim b/SpaceVim.d/autoload/settings/vim-indent-guides.vim
similarity index 100%
rename from SpaceVim.d/autoload/vim-indent-guides.vim
rename to SpaceVim.d/autoload/settings/vim-indent-guides.vim
diff --git a/SpaceVim.d/autoload/vim-multiple-cursors.vim b/SpaceVim.d/autoload/settings/vim-multiple-cursors.vim
similarity index 100%
rename from SpaceVim.d/autoload/vim-multiple-cursors.vim
rename to SpaceVim.d/autoload/settings/vim-multiple-cursors.vim
diff --git a/SpaceVim.d/autoload/vim-session.vim b/SpaceVim.d/autoload/settings/vim-session.vim
similarity index 100%
rename from SpaceVim.d/autoload/vim-session.vim
rename to SpaceVim.d/autoload/settings/vim-session.vim
diff --git a/SpaceVim.d/autoload/vim-tmux-navigator.vim b/SpaceVim.d/autoload/settings/vim-tmux-navigator.vim
similarity index 100%
rename from SpaceVim.d/autoload/vim-tmux-navigator.vim
rename to SpaceVim.d/autoload/settings/vim-tmux-navigator.vim
diff --git a/SpaceVim.d/autoload/yadr-appearance.vim b/SpaceVim.d/autoload/settings/yadr-appearance.vim
similarity index 100%
rename from SpaceVim.d/autoload/yadr-appearance.vim
rename to SpaceVim.d/autoload/settings/yadr-appearance.vim
diff --git a/SpaceVim.d/autoload/yadr-guioptions.vim b/SpaceVim.d/autoload/settings/yadr-guioptions.vim
similarity index 100%
rename from SpaceVim.d/autoload/yadr-guioptions.vim
rename to SpaceVim.d/autoload/settings/yadr-guioptions.vim
diff --git a/SpaceVim.d/autoload/yadr-keymap-linux.vim b/SpaceVim.d/autoload/settings/yadr-keymap-linux.vim
similarity index 100%
rename from SpaceVim.d/autoload/yadr-keymap-linux.vim
rename to SpaceVim.d/autoload/settings/yadr-keymap-linux.vim
diff --git a/SpaceVim.d/autoload/yadr-keymap-mac.vim b/SpaceVim.d/autoload/settings/yadr-keymap-mac.vim
similarity index 100%
rename from SpaceVim.d/autoload/yadr-keymap-mac.vim
rename to SpaceVim.d/autoload/settings/yadr-keymap-mac.vim
diff --git a/SpaceVim.d/autoload/yadr-keymap.vim b/SpaceVim.d/autoload/settings/yadr-keymap.vim
similarity index 99%
rename from SpaceVim.d/autoload/yadr-keymap.vim
rename to SpaceVim.d/autoload/settings/yadr-keymap.vim
index 9be1dfb..b91ff3e 100644
--- a/SpaceVim.d/autoload/yadr-keymap.vim
+++ b/SpaceVim.d/autoload/settings/yadr-keymap.vim
@@ -1,3 +1,4 @@
+echom 'shit'
 " ========================================
 " General vim sanity improvements
 " ========================================
diff --git a/SpaceVim.d/autoload/yadr-sudo-write.vim b/SpaceVim.d/autoload/settings/yadr-sudo-write.vim
similarity index 100%
rename from SpaceVim.d/autoload/yadr-sudo-write.vim
rename to SpaceVim.d/autoload/settings/yadr-sudo-write.vim
diff --git a/SpaceVim.d/autoload/yadr-whitespace-killer.vim b/SpaceVim.d/autoload/settings/yadr-whitespace-killer.vim
similarity index 100%
rename from SpaceVim.d/autoload/yadr-whitespace-killer.vim
rename to SpaceVim.d/autoload/settings/yadr-whitespace-killer.vim
diff --git a/SpaceVim.d/autoload/yadr-window-killer.vim b/SpaceVim.d/autoload/settings/yadr-window-killer.vim
similarity index 100%
rename from SpaceVim.d/autoload/yadr-window-killer.vim
rename to SpaceVim.d/autoload/settings/yadr-window-killer.vim
diff --git a/SpaceVim.d/autoload/yadr-wrapping.vim b/SpaceVim.d/autoload/settings/yadr-wrapping.vim
similarity index 100%
rename from SpaceVim.d/autoload/yadr-wrapping.vim
rename to SpaceVim.d/autoload/settings/yadr-wrapping.vim
diff --git a/SpaceVim.d/autoload/yankstack.vim b/SpaceVim.d/autoload/settings/yankstack.vim
similarity index 100%
rename from SpaceVim.d/autoload/yankstack.vim
rename to SpaceVim.d/autoload/settings/yankstack.vim
diff --git a/SpaceVim.d/autoload/yapf.vim b/SpaceVim.d/autoload/settings/yapf.vim
similarity index 100%
rename from SpaceVim.d/autoload/yapf.vim
rename to SpaceVim.d/autoload/settings/yapf.vim
diff --git a/vim/.gitignore b/vim/.gitignore
deleted file mode 100644
index d174999..0000000
--- a/vim/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-tags
-*~
-*.swp
-.VimballRecord
-view
diff --git a/vim/vundles.vim b/vim/vundles.vim
deleted file mode 100644
index 7c2880c..0000000
--- a/vim/vundles.vim
+++ /dev/null
@@ -1,30 +0,0 @@
-" ========================================
-" Vim plugin configuration
-" ========================================
-"
-" This file contains the list of plugin installed using vundle plugin manager.
-" Once you've updated the list of plugin, you can run vundle update by issuing
-" the command :BundleInstall from within vim or directly invoking it from the
-" command line with the following syntax:
-" vim --noplugin -u vim/vundles.vim -N "+set hidden" "+syntax on" +BundleClean! +BundleInstall +qall
-" Filetype off is required by vundle
-filetype off
-
-set rtp+=~/.vim/bundle/vundle/
-set rtp+=~/.vim/vundles/ "Submodules
-call vundle#rc()
-
-" let Vundle manage Vundle (required)
-Bundle "gmarik/vundle"
-
-" YADR's vundles are split up by category into smaller files
-" This reduces churn and makes it easier to fork. See
-" ~/.vim/vundles/ to edit them:
-" The plugins listed in ~/.vim/.vundles.local will be added here to
-" allow the user to add vim plugins to yadr without the need for a fork.
-if filereadable(expand("~/.yadr/vim/.vundles.local"))
-  source ~/.yadr/vim/.vundles.local
-endif
-
-"Filetype plugin indent on is required by vundle
-filetype plugin indent on
diff --git a/zsh/prezto b/zsh/prezto
index 0a40549..8914274 160000
--- a/zsh/prezto
+++ b/zsh/prezto
@@ -1 +1 @@
-Subproject commit 0a405494cae54e208ff550c1ba83380ed115410a
+Subproject commit 8914274ca9f7b997d4a1663e0f290c691772db7f