diff --git a/Makefile b/Makefile
index 3983aac..1b350d5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,21 @@
 SUBMODULES = bundle/*
 
+CO_INFO  = \e[1;34m
+CO_CLEAR = \e[0m
+
 .PHONY: $(SUBMODULES)
 
-all: $(SUBMODULES)
+all: $(SUBMODULES) youcompleteme
+
+youcompleteme: bundle/youcompleteme
+	@echo -e "$(CO_INFO)building submodule $@$(CO_CLEAR)"
+	@cd $< && \
+	    git submodule update --init --recursive && \
+	    bash ./install.sh --clang-completer --system-libclang
 
 $(SUBMODULES):
-	$(info updating submodule $@)
-	@cd $@
-	@git pull origin master 1>/dev/null 2>/dev/null
+	@echo -e "$(CO_INFO)updating submodule $@$(CO_CLEAR)"
+	@cd $@ && \
+	    git pull origin master
+
 
-bundle/youcompleteme:	
-	$(info updating submodule $@)
-	@cd $@
-	@git pull origin master 1>/dev/null 2>/dev/null
-	@git submodule update --init --recursive
-	@bash ./install.sh --clang-completer
diff --git a/config/autocommands.vim b/config/autocommands.vim
deleted file mode 100644
index 25b5784..0000000
--- a/config/autocommands.vim
+++ /dev/null
@@ -1,24 +0,0 @@
-"aug LineNumbers
-    "au!
-    "au VimEnter,WinEnter,InsertLeave * setlocal relativenumber
-    "au WinLeave,InsertEnter * setlocal norelativenumber
-"aug END
-
-aug CursorLineColumn
-    au!
-    au VimEnter,WinEnter,BufWinEnter * setlocal cursorline cursorcolumn
-    "au VimEnter,WinEnter,BufWinEnter * setlocal cursorcolumn
-    "au VimEnter,WinEnter,BufWinEnter * setlocal colorcolumn=80
-    au WinLeave * setlocal nocursorline nocursorcolumn colorcolumn=0
-aug END
-
-aug FastEscape
-    au!
-    au InsertEnter * set timeoutlen=0
-    au InsertLeave * set timeoutlen=1000
-aug END
-
-aug ReadonlyFiles
-    au BufNewFile,BufRead /var/log/* set readonly
-    au BufNewFile,BufRead /var/log/* set nomodifiable
-aug END
diff --git a/config/bundle/crypto.vim b/config/bundle/crypto.vim
new file mode 100644
index 0000000..467616c
--- /dev/null
+++ b/config/bundle/crypto.vim
@@ -0,0 +1,5 @@
+if v:version >= 704
+    set cryptmethod=blowfish
+
+    au BufReadPost * if &key != "" | set noswapfile nowritebackup viminfo= nobackup noshelltemp history=0 secure | endif
+endif
diff --git a/config/ctrlp/variables.vim b/config/bundle/ctrlp.vim
similarity index 100%
rename from config/ctrlp/variables.vim
rename to config/bundle/ctrlp.vim
diff --git a/config/gundo/keymaps.vim b/config/bundle/gundo.vim
similarity index 63%
rename from config/gundo/keymaps.vim
rename to config/bundle/gundo.vim
index c4c866b..7ac3953 100644
--- a/config/gundo/keymaps.vim
+++ b/config/bundle/gundo.vim
@@ -1,3 +1,7 @@
+let g:gundo_width = 60
+let g:gundo_preview_height = 30
+let g:gundo_right = 1
+
 nnoremap <silent> <F11> :GundoToggle<CR>
 inoremap <silent> <F11> <C-O>:GundoToggle<CR>
 vnoremap <silent> <F11> <ESC>:GundoToggle<CR>
diff --git a/config/latexsuite/variables.vim b/config/bundle/latexsuite.vim
similarity index 61%
rename from config/latexsuite/variables.vim
rename to config/bundle/latexsuite.vim
index 8e789b4..ad49b06 100644
--- a/config/latexsuite/variables.vim
+++ b/config/bundle/latexsuite.vim
@@ -1,14 +1,18 @@
+set grepprg=grep\ -nH\ $*
+
 let g:tex_flavor               = "latex"
 let g:tex_fold_enabled         = 1
-
 let g:Imap_UsePlaceHolders     = 0
-
 let g:Tex_ViewRule_dvi         = ""
 let g:Tex_ViewRule_ps          = ""
 let g:Tex_ViewRule_pdf         = ""
-
 let g:Tex_ViewRuleComplete_dvi = "pgrep okular.*$* || xdg-open &"
 let g:Tex_ViewRuleComplete_ps  = ""
 let g:Tex_ViewRuleComplete_pdf = "pgrep okular.*$* || xdg-open &"
-
 let g:Tex_DefaultTargetFormat  = "pdf"
+
+nnoremap <SID> <Plug>Tex_Help
+inoremap <SID> <Plug>Tex_Help
+nnoremap <SID> <Plug>IMAP_JumpForward
+vnoremap <SID> <Plug>IMAP_JumpForward
+"noremap <buffer> <F5> :w<CR> :!pdflatex -shell-escape "%" && { pgrep ".*%:p || xdg-open %:p:r.pdf }<CR>
diff --git a/config/molokai/variables.vim b/config/bundle/molokai.vim
similarity index 53%
rename from config/molokai/variables.vim
rename to config/bundle/molokai.vim
index f526805..92ed0a9 100644
--- a/config/molokai/variables.vim
+++ b/config/bundle/molokai.vim
@@ -1,2 +1,6 @@
+colorscheme molokai 
+
+set background=dark
+
 "let g:molokai_original = 1
 "let g:rehash256 = 1
diff --git a/config/nerdtree/keymaps.vim b/config/bundle/nerdtree.vim
similarity index 56%
rename from config/nerdtree/keymaps.vim
rename to config/bundle/nerdtree.vim
index 2a55eee..72a339a 100644
--- a/config/nerdtree/keymaps.vim
+++ b/config/bundle/nerdtree.vim
@@ -1,3 +1,5 @@
+au bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif
+
 noremap  <silent> <F3> :NERDTreeToggle<CR>
 inoremap <silent> <F3> <C-O>:NERDTreeToggle<CR>
 vnoremap <silent> <F3> <ESC>:NERDTreeToggle<CR>
diff --git a/config/powerline/variables.vim b/config/bundle/powerline.vim
similarity index 68%
rename from config/powerline/variables.vim
rename to config/bundle/powerline.vim
index f485f27..0749b63 100644
--- a/config/powerline/variables.vim
+++ b/config/bundle/powerline.vim
@@ -1,3 +1,7 @@
+set laststatus=2
+set noshowmode
+"set showtabline=2
+
 "if $TERM != "linux"
     "if executable("powerline")
         "if executable("python3")
@@ -8,4 +12,5 @@
     "endif
 "endif
 
-"let g:powerline_pycmd = "py3"
+let g:powerline_pycmd  = "py3"
+let g:powerline_pyeval = g:powerline_pycmd . "eval"
diff --git a/config/sudo/commands.vim b/config/bundle/sudo.vim
similarity index 100%
rename from config/sudo/commands.vim
rename to config/bundle/sudo.vim
diff --git a/config/syntastic/variables.vim b/config/bundle/syntastic.vim
similarity index 99%
rename from config/syntastic/variables.vim
rename to config/bundle/syntastic.vim
index eaf637e..ccf94f6 100644
--- a/config/syntastic/variables.vim
+++ b/config/bundle/syntastic.vim
@@ -2,11 +2,8 @@ let g:syntastic_enable_signs = 1
 let g:syntastic_check_on_open = 1
 let g:syntastic_enable_highlighting = 1
 let g:syntastic_auto_loc_list = 1
-
 "let g:syntastic_c_check_header = 1
-
 "let g:syntastic_cpp_remove_include_errors = 1
 "let g:syntastic_cpp_check_header = 1
 "let g:syntastic_cpp_auto_refresh_includes = 1
-
 let g:syntastic_tex_checkers = ["false"]
diff --git a/config/tagbar/keymaps.vim b/config/bundle/tagbar.vim
similarity index 100%
rename from config/tagbar/keymaps.vim
rename to config/bundle/tagbar.vim
diff --git a/config/tmux/keymaps.vim b/config/bundle/tmux.vim
similarity index 100%
rename from config/tmux/keymaps.vim
rename to config/bundle/tmux.vim
diff --git a/config/ycm/variables.vim b/config/bundle/youcompleteme.vim
similarity index 70%
rename from config/ycm/variables.vim
rename to config/bundle/youcompleteme.vim
index ef5ba3c..cba8dbb 100644
--- a/config/ycm/variables.vim
+++ b/config/bundle/youcompleteme.vim
@@ -1,3 +1,4 @@
-let g:ycm_global_ycm_extra_conf = $XDG_CONFIG_HOME . "/vim/config/ycm/ycm_extra_conf.py"
+let g:ycm_global_ycm_extra_conf = $XDG_CONFIG_HOME . "/vim/config/youcompleteme/ycm_extra_conf.py"
 let g:ycm_autoclose_preview_window_after_completion = 1
 let g:ycm_register_as_syntastic_checker = 1
+let g:ycm_server_keep_logfile = 1
diff --git a/config/ycm/ycm_extra_conf.py b/config/bundle/youcompleteme/ycm_extra_conf.py
similarity index 85%
rename from config/ycm/ycm_extra_conf.py
rename to config/bundle/youcompleteme/ycm_extra_conf.py
index cd55590..6547894 100644
--- a/config/ycm/ycm_extra_conf.py
+++ b/config/bundle/youcompleteme/ycm_extra_conf.py
@@ -1,22 +1,22 @@
 import os
 import ycm_core
 
-flags = [ '-Wall', '-Werror', '-std=c99' ]
-
 # Set this to the absolute path to the folder (NOT the file!) containing the
-# compile_commands.json file to use that instead of 'flags'. See here for
+# compile_commands.json file to use that instead of "flags". See here for
 # more details: http://clang.llvm.org/docs/JSONCompilationDatabase.html
 #
 # Most projects will NOT need to set this to anything; you can just change the
-# 'flags' list of compilation flags. Notice that YCM itself uses that approach.
-compilation_database_folder = ''
+# "flags" list of compilation flags. Notice that YCM itself uses that approach.
+compilation_database_folder = ""
+
+flags = [ "-Wall", "-Werror", "-std=c99" ]
 
 if os.path.exists( compilation_database_folder ):
     database = ycm_core.CompilationDatabase( compilation_database_folder )
 else:
     database = None
 
-SOURCE_EXTENSIONS = [ '.cpp', '.cxx', '.cc', '.c', '.m', '.mm' ]
+#SOURCE_EXTENSIONS = [ ".cpp", ".cxx", ".cc", ".c", ".m", ".mm" ]
 
 def DirectoryOfThisScript():
   return os.path.dirname( os.path.abspath( __file__ ) )
@@ -26,13 +26,13 @@ def MakeRelativePathsInFlagsAbsolute( flags, working_directory ):
         return list( flags )
     new_flags = []
     make_next_absolute = False
-    path_flags = [ '-isystem', '-I', '-iquote', '--sysroot=' ]
+    path_flags = [ "-isystem", "-I", "-iquote", "--sysroot=" ]
     for flag in flags:
         new_flag = flag
 
     if make_next_absolute:
         make_next_absolute = False
-        if not flag.startswith( '/' ):
+        if not flag.startswith( "/" ):
             new_flag = os.path.join( working_directory, flag )
 
     for path_flag in path_flags:
@@ -51,7 +51,7 @@ def MakeRelativePathsInFlagsAbsolute( flags, working_directory ):
 
 def IsHeaderFile( filename ):
     extension = os.path.splitext( filename )[ 1 ]
-    return extension in [ '.h', '.hxx', '.hpp', '.hh' ]
+    return extension in [ ".h", ".hxx", ".hpp", ".hh" ]
 
 def GetCompilationInfoForFile( filename ):
     # The compilation_commands.json file generated by CMake does not have entries
@@ -87,6 +87,6 @@ def FlagsForFile( filename, **kwargs ):
         final_flags = MakeRelativePathsInFlagsAbsolute( flags, relative_to )
 
     return {
-        'flags': final_flags,
-        'do_cache': True
+        "flags": final_flags,
+        "do_cache": True
     }
diff --git a/config/core/cursor_line_column.vim b/config/core/cursor_line_column.vim
new file mode 100644
index 0000000..df3ed21
--- /dev/null
+++ b/config/core/cursor_line_column.vim
@@ -0,0 +1,7 @@
+aug CursorLineColumn
+    au!
+    au VimEnter,WinEnter,BufWinEnter * setlocal cursorline cursorcolumn
+    "au VimEnter,WinEnter,BufWinEnter * setlocal cursorcolumn
+    "au VimEnter,WinEnter,BufWinEnter * setlocal colorcolumn=80
+    au WinLeave * setlocal nocursorline nocursorcolumn colorcolumn=0
+aug END
diff --git a/config/core/escape.vim b/config/core/escape.vim
new file mode 100644
index 0000000..b9852f5
--- /dev/null
+++ b/config/core/escape.vim
@@ -0,0 +1,7 @@
+imap jk <ESC>
+
+"aug FastEscape
+    "au!
+    "au InsertEnter * set timeoutlen=0
+    "au InsertLeave * set timeoutlen=1000
+"aug END
diff --git a/config/folding.vim b/config/core/folding.vim
similarity index 91%
rename from config/folding.vim
rename to config/core/folding.vim
index 3c51daf..be91dd7 100644
--- a/config/folding.vim
+++ b/config/core/folding.vim
@@ -1,6 +1,11 @@
 if has("folding")
+    set foldcolumn=0
+    set foldlevel=1
+    set foldmethod=syntax
     set foldtext=MyFoldText()
 
+    let g:sh_fold_enabled=1
+
     function! MyFoldText()
         " get actual numberwidth of the current document
         let nw_add = (len(line('$')) - (&numberwidth - 1))
diff --git a/config/core/help.vim b/config/core/help.vim
new file mode 100644
index 0000000..1518993
--- /dev/null
+++ b/config/core/help.vim
@@ -0,0 +1,2 @@
+nnoremap <F1> <NOP>
+inoremap <F1> <NOP>
diff --git a/config/core/ident.vim b/config/core/ident.vim
new file mode 100644
index 0000000..b34623a
--- /dev/null
+++ b/config/core/ident.vim
@@ -0,0 +1,2 @@
+vnoremap < <gv
+vnoremap > >gv
diff --git a/config/core/invlist.vim b/config/core/invlist.vim
new file mode 100644
index 0000000..603e7cc
--- /dev/null
+++ b/config/core/invlist.vim
@@ -0,0 +1,5 @@
+set listchars=tab:»\ ,trail:◆,extends:▹,precedes:◃,eol:↲,nbsp:·
+
+nnoremap <silent> <F4> :set invlist<CR>
+inoremap <silent> <F4> <C-O>:set invlist<CR>
+vnoremap <silent> <F4> :<C-W>set invlist<CR>
diff --git a/config/core/leaderkey.vim b/config/core/leaderkey.vim
new file mode 100644
index 0000000..e4d82c9
--- /dev/null
+++ b/config/core/leaderkey.vim
@@ -0,0 +1,7 @@
+let g:mapleader = ","
+
+noremap <silent> <Leader><CR> :noh<CR>
+nnoremap <Leader>vl :setlocal cursorline!<CR>
+nnoremap <Leader>vc :setlocal cursorcolumn!<CR>
+nnoremap <Leader>ve :setlocal colorcolumn=80<CR>
+nnoremap <Leader>vn :setlocal colorcolumn=0<CR>
diff --git a/config/core/line_numbers.vim b/config/core/line_numbers.vim
new file mode 100644
index 0000000..ff70fb0
--- /dev/null
+++ b/config/core/line_numbers.vim
@@ -0,0 +1,7 @@
+if v:version >= 704
+    aug LineNumbers
+        au!
+        au VimEnter,WinEnter,InsertLeave * setlocal relativenumber
+        au WinLeave,InsertEnter * setlocal norelativenumber
+    aug END
+endif
diff --git a/config/core/movement.vim b/config/core/movement.vim
new file mode 100644
index 0000000..5bb11dd
--- /dev/null
+++ b/config/core/movement.vim
@@ -0,0 +1,3 @@
+nnoremap Y y$
+nnoremap j gj
+nnoremap k gk
diff --git a/config/my_vim.vim b/config/core/my_vim.vim
similarity index 98%
rename from config/my_vim.vim
rename to config/core/my_vim.vim
index 3627696..513d5c8 100644
--- a/config/my_vim.vim
+++ b/config/core/my_vim.vim
@@ -1,3 +1,7 @@
+"
+" this only gets executed if not using the own vim installation
+"
+
 function! CheckXDGVars()
     if empty($XDG_CONFIG_HOME)
         let $vim_config_home=expand("$HOME/.config/vim")
diff --git a/config/core/options.vim b/config/core/options.vim
new file mode 100644
index 0000000..e47b855
--- /dev/null
+++ b/config/core/options.vim
@@ -0,0 +1,12 @@
+set autowrite
+set shortmess=aoOtTI
+set clipboard=unnamed,unnamedplus,autoselect
+
+set autochdir
+
+set report=0
+set updatetime=1500
+set switchbuf=useopen,usetab
+set pumheight=10
+set diffopt+=context:3
+set matchtime=2
diff --git a/config/core/quit.vim b/config/core/quit.vim
new file mode 100644
index 0000000..86dddcf
--- /dev/null
+++ b/config/core/quit.vim
@@ -0,0 +1 @@
+set confirm
diff --git a/config/core/readonly_files.vim b/config/core/readonly_files.vim
new file mode 100644
index 0000000..46c2f3c
--- /dev/null
+++ b/config/core/readonly_files.vim
@@ -0,0 +1,4 @@
+aug ReadonlyFiles
+    au BufNewFile,BufRead /var/log/* set readonly
+    au BufNewFile,BufRead /var/log/* set nomodifiable
+aug END
diff --git a/config/core/replace.vim b/config/core/replace.vim
new file mode 100644
index 0000000..740ca7e
--- /dev/null
+++ b/config/core/replace.vim
@@ -0,0 +1,4 @@
+" local replace
+nnoremap gr gd[{V%::s/<C-R>///g<left><left>
+
+nnoremap gR gD:%s/<C-R>///g<left><left>
diff --git a/config/core/search.vim b/config/core/search.vim
new file mode 100644
index 0000000..8a1edb1
--- /dev/null
+++ b/config/core/search.vim
@@ -0,0 +1,2 @@
+set ignorecase
+set smartcase
diff --git a/config/core/tabs.vim b/config/core/tabs.vim
new file mode 100644
index 0000000..df59157
--- /dev/null
+++ b/config/core/tabs.vim
@@ -0,0 +1,6 @@
+nnoremap th :tabfirst<CR>
+nnoremap tj :tabnext<CR>
+nnoremap tk :tabprev<CR>
+nnoremap tl :tablast<CR>
+nnoremap tn :tabnew<CR>
+nnoremap tq :tabclose<CR>
diff --git a/config/core/tabstops.vim b/config/core/tabstops.vim
new file mode 100644
index 0000000..32f5509
--- /dev/null
+++ b/config/core/tabstops.vim
@@ -0,0 +1,4 @@
+set softtabstop=4
+set shiftwidth=4
+set smartindent
+set expandtab 
diff --git a/config/core/undo.vim b/config/core/undo.vim
new file mode 100644
index 0000000..72835ed
--- /dev/null
+++ b/config/core/undo.vim
@@ -0,0 +1,7 @@
+nnoremap U :redo<CR>
+nnoremap <C-R> <NOP>
+
+if v:version >= 704
+    set undofile
+    set undolevels=1000
+endif
diff --git a/config/core/wildmenu.vim b/config/core/wildmenu.vim
new file mode 100644
index 0000000..3d2a01c
--- /dev/null
+++ b/config/core/wildmenu.vim
@@ -0,0 +1,2 @@
+set wildmode=longest:full,list
+set wildignore=.bak,.old,.swp,~
diff --git a/config/commands.vim b/config/core/write_and_quit.vim
similarity index 100%
rename from config/commands.vim
rename to config/core/write_and_quit.vim
diff --git a/config/crypto/autocommands.vim b/config/crypto/autocommands.vim
deleted file mode 100644
index 9e85386..0000000
--- a/config/crypto/autocommands.vim
+++ /dev/null
@@ -1 +0,0 @@
-au BufReadPost * if &key != "" | set noswapfile nowritebackup viminfo= nobackup noshelltemp history=0 secure | endif
diff --git a/config/crypto/options.vim b/config/crypto/options.vim
deleted file mode 100644
index ef6d060..0000000
--- a/config/crypto/options.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-if v:version >= 704
-    set cryptmethod=blowfish
-endif
diff --git a/config/gundo/variables.vim b/config/gundo/variables.vim
deleted file mode 100644
index 5ade36c..0000000
--- a/config/gundo/variables.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-let g:gundo_width = 60
-let g:gundo_preview_height = 30
-let g:gundo_right = 1
diff --git a/config/keymaps.vim b/config/keymaps.vim
deleted file mode 100644
index 925bd1b..0000000
--- a/config/keymaps.vim
+++ /dev/null
@@ -1,28 +0,0 @@
-nnoremap <F1> <NOP>
-inoremap <F1> <NOP>
-
-nnoremap <silent> <F4> :set invlist<CR>
-inoremap <silent> <F4> <C-O>:set invlist<CR>
-vnoremap <silent> <F4> :<C-W>set invlist<CR>
-
-nnoremap Q <NOP>
-nnoremap K <NOP>
-nnoremap Y y$
-nnoremap j gj
-nnoremap k gk
-vnoremap < <gv
-vnoremap > >gv
-
-nnoremap th :tabfirst<CR>
-nnoremap tj :tabnext<CR>
-nnoremap tk :tabprev<CR>
-nnoremap tl :tablast<CR>
-nnoremap tn :tabnew<CR>
-nnoremap tq :tabclose<CR>
-
-noremap <silent> <Leader><CR> :noh<CR>
-
-nnoremap <Leader>vl :setlocal cursorline!<CR>
-nnoremap <Leader>vc :setlocal cursorcolumn!<CR>
-nnoremap <Leader>ve :setlocal colorcolumn=80<CR>
-nnoremap <Leader>vn :setlocal colorcolumn=0<CR>
diff --git a/config/latexsuite/keymaps.vim b/config/latexsuite/keymaps.vim
deleted file mode 100644
index b112bb8..0000000
--- a/config/latexsuite/keymaps.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-nnoremap <SID> <Plug>Tex_Help
-inoremap <SID> <Plug>Tex_Help
-nnoremap <SID> <Plug>IMAP_JumpForward
-vnoremap <SID> <Plug>IMAP_JumpForward
-"noremap <buffer> <F5> :w<CR> :!pdflatex -shell-escape "%" && { pgrep ".*%:p || xdg-open %:p:r.pdf }<CR>
diff --git a/config/latexsuite/options.vim b/config/latexsuite/options.vim
deleted file mode 100644
index c0953c7..0000000
--- a/config/latexsuite/options.vim
+++ /dev/null
@@ -1 +0,0 @@
-set grepprg=grep\ -nH\ $*
diff --git a/config/molokai/colorscheme.vim b/config/molokai/colorscheme.vim
deleted file mode 100644
index 5709b2e..0000000
--- a/config/molokai/colorscheme.vim
+++ /dev/null
@@ -1 +0,0 @@
-colorscheme molokai 
diff --git a/config/molokai/options.vim b/config/molokai/options.vim
deleted file mode 100644
index 18a3210..0000000
--- a/config/molokai/options.vim
+++ /dev/null
@@ -1 +0,0 @@
-set background=dark
diff --git a/config/nerdtree/autocommands.vim b/config/nerdtree/autocommands.vim
deleted file mode 100644
index 1934365..0000000
--- a/config/nerdtree/autocommands.vim
+++ /dev/null
@@ -1 +0,0 @@
-au bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif
diff --git a/config/options.vim b/config/options.vim
deleted file mode 100644
index 22a0261..0000000
--- a/config/options.vim
+++ /dev/null
@@ -1,36 +0,0 @@
-set listchars=tab:»\ ,trail:◆,extends:▹,precedes:◃,eol:↲,nbsp:·
-set ignorecase
-set smartcase
-set confirm
-set autowrite
-set shortmess=aoOtTI
-set clipboard=unnamed,unnamedplus,autoselect
-
-set softtabstop=4
-set shiftwidth=4
-set smartindent
-set expandtab 
-
-set wildmode=longest:full,list
-set wildignore=.bak,.old,.swp,~
-set autochdir
-
-if v:version >= 704
-    set undofile
-    set undolevels=1000
-endif
-
-set report=0
-set updatetime=1500
-set switchbuf=useopen,usetab
-set pumheight=10
-set diffopt+=context:3
-set matchtime=2
-
-set foldcolumn=0
-set foldlevel=1
-set foldmethod=syntax
-
-set nowrap
-
-set t_Co=256
diff --git a/config/powerline/options.vim b/config/powerline/options.vim
deleted file mode 100644
index 7ff6af1..0000000
--- a/config/powerline/options.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-set laststatus=2
-set noshowmode
-"set showtabline=2
diff --git a/config/quickrun/variables.vim b/config/quickrun/variables.vim
deleted file mode 100644
index 6972e79..0000000
--- a/config/quickrun/variables.vim
+++ /dev/null
@@ -1 +0,0 @@
-let g:quickrun_config = {}
diff --git a/config/solarized/colorscheme.vim b/config/solarized/colorscheme.vim
deleted file mode 100644
index 5fcac08..0000000
--- a/config/solarized/colorscheme.vim
+++ /dev/null
@@ -1 +0,0 @@
-"colorscheme solarized
diff --git a/config/solarized/options.vim b/config/solarized/options.vim
deleted file mode 100644
index 2df6879..0000000
--- a/config/solarized/options.vim
+++ /dev/null
@@ -1 +0,0 @@
-"set background=dark
diff --git a/config/solarized/variables.vim b/config/solarized/variables.vim
deleted file mode 100644
index 7bde1ba..0000000
--- a/config/solarized/variables.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-let g:solarized_termtrans  = 1
-let g:solarized_termcolors = 256
diff --git a/config/ultisnips/keymaps.vim b/config/ultisnips/keymaps.vim
deleted file mode 100644
index 971d3ca..0000000
--- a/config/ultisnips/keymaps.vim
+++ /dev/null
@@ -1 +0,0 @@
-inoremap <C-@> <C-Space>
diff --git a/config/ultisnips/variables.vim b/config/ultisnips/variables.vim
deleted file mode 100644
index bba7725..0000000
--- a/config/ultisnips/variables.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-let g:UltiSnipsUsePythonVersion    = 3
-let g:UltiSnipsExpandTrigger       = '<C-Space>'
-let g:UltiSnipsJumpForwardTrigger  = '<C-l>'
-let g:UltiSnipsJumpBackwardTrigger = '<C-h>'
-let g:UltiSnipsSnippetDirectories  = ['UltiSnips', 'snippets']
diff --git a/config/variables.vim b/config/variables.vim
deleted file mode 100644
index bac596b..0000000
--- a/config/variables.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-let g:mapleader = ","
-let g:sh_fold_enabled=1
diff --git a/vimrc b/vimrc
index bbc07e4..01a4f63 100644
--- a/vimrc
+++ b/vimrc
@@ -5,8 +5,10 @@
 "                                                                             "
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
-runtime! config/*.vim
-runtime bundle/unbundle/unbundle.vim
-runtime! config/**/*.vim
+"runtime bundle/unbundle/unbundle.vim
+runtime bundle/pathogen/autoload/pathogen.vim
 
-colorscheme molokai
+execute pathogen#infect()
+
+runtime! config/core/**/*.vim
+runtime! config/bundle/**/*.vim