diff --git a/.gitignore b/.gitignore index 6524f395..fbc24677 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ temp_dirs/undodir* -sources_non_forked/ack.vim/.netrwhist +bundle/ack.vim/.netrwhist temp_dirs/yankring_history_v2.txt sources_forked/yankring/doc/tags -sources_non_forked/tlib/doc/tags -my_configs.vim +bundle/tlib/doc/tags tags diff --git a/README.md b/README.md index 0fdb7bcf..6286df77 100644 --- a/README.md +++ b/README.md @@ -113,7 +113,7 @@ After you have installed the setup you can create **~/.vim_runtime/my_configs.vi You can also install your own plugins, for instance, via pathogen we can install [vim-rails](https://github.com/tpope/vim-rails): cd ~/.vim_runtime - git clone git://github.com/tpope/vim-rails.git sources_non_forked/vim-rails + git clone git://github.com/tpope/vim-rails.git bundle/vim-rails Now you have vim-rails installed ;-) diff --git a/sources_non_forked/ack.vim/.gitignore b/bundle/ack.vim/.gitignore similarity index 100% rename from sources_non_forked/ack.vim/.gitignore rename to bundle/ack.vim/.gitignore diff --git a/sources_non_forked/ack.vim/README.md b/bundle/ack.vim/README.md similarity index 100% rename from sources_non_forked/ack.vim/README.md rename to bundle/ack.vim/README.md diff --git a/sources_non_forked/ack.vim/Rakefile b/bundle/ack.vim/Rakefile similarity index 100% rename from sources_non_forked/ack.vim/Rakefile rename to bundle/ack.vim/Rakefile diff --git a/sources_non_forked/ack.vim/doc/ack.txt b/bundle/ack.vim/doc/ack.txt similarity index 100% rename from sources_non_forked/ack.vim/doc/ack.txt rename to bundle/ack.vim/doc/ack.txt diff --git a/sources_non_forked/ack.vim/plugin/ack.vim b/bundle/ack.vim/plugin/ack.vim similarity index 100% rename from sources_non_forked/ack.vim/plugin/ack.vim rename to bundle/ack.vim/plugin/ack.vim diff --git a/sources_non_forked/bufexplorer/README.md b/bundle/bufexplorer/README.md similarity index 100% rename from sources_non_forked/bufexplorer/README.md rename to bundle/bufexplorer/README.md diff --git a/sources_non_forked/bufexplorer/doc/bufexplorer.txt b/bundle/bufexplorer/doc/bufexplorer.txt similarity index 100% rename from sources_non_forked/bufexplorer/doc/bufexplorer.txt rename to bundle/bufexplorer/doc/bufexplorer.txt diff --git a/sources_non_forked/bufexplorer/plugin/bufexplorer.vim b/bundle/bufexplorer/plugin/bufexplorer.vim similarity index 100% rename from sources_non_forked/bufexplorer/plugin/bufexplorer.vim rename to bundle/bufexplorer/plugin/bufexplorer.vim diff --git a/sources_non_forked/ctrlp.vim/.gitignore b/bundle/ctrlp.vim/.gitignore similarity index 100% rename from sources_non_forked/ctrlp.vim/.gitignore rename to bundle/ctrlp.vim/.gitignore diff --git a/sources_non_forked/ctrlp.vim/autoload/ctrlp.vim b/bundle/ctrlp.vim/autoload/ctrlp.vim similarity index 100% rename from sources_non_forked/ctrlp.vim/autoload/ctrlp.vim rename to bundle/ctrlp.vim/autoload/ctrlp.vim diff --git a/sources_non_forked/ctrlp.vim/autoload/ctrlp/bookmarkdir.vim b/bundle/ctrlp.vim/autoload/ctrlp/bookmarkdir.vim similarity index 100% rename from sources_non_forked/ctrlp.vim/autoload/ctrlp/bookmarkdir.vim rename to bundle/ctrlp.vim/autoload/ctrlp/bookmarkdir.vim diff --git a/sources_non_forked/ctrlp.vim/autoload/ctrlp/buffertag.vim b/bundle/ctrlp.vim/autoload/ctrlp/buffertag.vim similarity index 100% rename from sources_non_forked/ctrlp.vim/autoload/ctrlp/buffertag.vim rename to bundle/ctrlp.vim/autoload/ctrlp/buffertag.vim diff --git a/sources_non_forked/ctrlp.vim/autoload/ctrlp/changes.vim b/bundle/ctrlp.vim/autoload/ctrlp/changes.vim similarity index 100% rename from sources_non_forked/ctrlp.vim/autoload/ctrlp/changes.vim rename to bundle/ctrlp.vim/autoload/ctrlp/changes.vim diff --git a/sources_non_forked/ctrlp.vim/autoload/ctrlp/dir.vim b/bundle/ctrlp.vim/autoload/ctrlp/dir.vim similarity index 100% rename from sources_non_forked/ctrlp.vim/autoload/ctrlp/dir.vim rename to bundle/ctrlp.vim/autoload/ctrlp/dir.vim diff --git a/sources_non_forked/ctrlp.vim/autoload/ctrlp/line.vim b/bundle/ctrlp.vim/autoload/ctrlp/line.vim similarity index 100% rename from sources_non_forked/ctrlp.vim/autoload/ctrlp/line.vim rename to bundle/ctrlp.vim/autoload/ctrlp/line.vim diff --git a/sources_non_forked/ctrlp.vim/autoload/ctrlp/mixed.vim b/bundle/ctrlp.vim/autoload/ctrlp/mixed.vim similarity index 100% rename from sources_non_forked/ctrlp.vim/autoload/ctrlp/mixed.vim rename to bundle/ctrlp.vim/autoload/ctrlp/mixed.vim diff --git a/sources_non_forked/ctrlp.vim/autoload/ctrlp/mrufiles.vim b/bundle/ctrlp.vim/autoload/ctrlp/mrufiles.vim similarity index 100% rename from sources_non_forked/ctrlp.vim/autoload/ctrlp/mrufiles.vim rename to bundle/ctrlp.vim/autoload/ctrlp/mrufiles.vim diff --git a/sources_non_forked/ctrlp.vim/autoload/ctrlp/quickfix.vim b/bundle/ctrlp.vim/autoload/ctrlp/quickfix.vim similarity index 100% rename from sources_non_forked/ctrlp.vim/autoload/ctrlp/quickfix.vim rename to bundle/ctrlp.vim/autoload/ctrlp/quickfix.vim diff --git a/sources_non_forked/ctrlp.vim/autoload/ctrlp/rtscript.vim b/bundle/ctrlp.vim/autoload/ctrlp/rtscript.vim similarity index 100% rename from sources_non_forked/ctrlp.vim/autoload/ctrlp/rtscript.vim rename to bundle/ctrlp.vim/autoload/ctrlp/rtscript.vim diff --git a/sources_non_forked/ctrlp.vim/autoload/ctrlp/tag.vim b/bundle/ctrlp.vim/autoload/ctrlp/tag.vim similarity index 100% rename from sources_non_forked/ctrlp.vim/autoload/ctrlp/tag.vim rename to bundle/ctrlp.vim/autoload/ctrlp/tag.vim diff --git a/sources_non_forked/ctrlp.vim/autoload/ctrlp/undo.vim b/bundle/ctrlp.vim/autoload/ctrlp/undo.vim similarity index 100% rename from sources_non_forked/ctrlp.vim/autoload/ctrlp/undo.vim rename to bundle/ctrlp.vim/autoload/ctrlp/undo.vim diff --git a/sources_non_forked/ctrlp.vim/autoload/ctrlp/utils.vim b/bundle/ctrlp.vim/autoload/ctrlp/utils.vim similarity index 100% rename from sources_non_forked/ctrlp.vim/autoload/ctrlp/utils.vim rename to bundle/ctrlp.vim/autoload/ctrlp/utils.vim diff --git a/sources_non_forked/ctrlp.vim/doc/ctrlp.txt b/bundle/ctrlp.vim/doc/ctrlp.txt similarity index 100% rename from sources_non_forked/ctrlp.vim/doc/ctrlp.txt rename to bundle/ctrlp.vim/doc/ctrlp.txt diff --git a/sources_non_forked/ctrlp.vim/plugin/ctrlp.vim b/bundle/ctrlp.vim/plugin/ctrlp.vim similarity index 100% rename from sources_non_forked/ctrlp.vim/plugin/ctrlp.vim rename to bundle/ctrlp.vim/plugin/ctrlp.vim diff --git a/sources_non_forked/ctrlp.vim/readme.md b/bundle/ctrlp.vim/readme.md similarity index 100% rename from sources_non_forked/ctrlp.vim/readme.md rename to bundle/ctrlp.vim/readme.md diff --git a/sources_non_forked/goyo.vim/plugin/goyo.vim b/bundle/goyo.vim/plugin/goyo.vim similarity index 100% rename from sources_non_forked/goyo.vim/plugin/goyo.vim rename to bundle/goyo.vim/plugin/goyo.vim diff --git a/sources_non_forked/mayansmoke/README b/bundle/mayansmoke/README similarity index 100% rename from sources_non_forked/mayansmoke/README rename to bundle/mayansmoke/README diff --git a/sources_non_forked/mayansmoke/colors/mayansmoke.vim b/bundle/mayansmoke/colors/mayansmoke.vim similarity index 100% rename from sources_non_forked/mayansmoke/colors/mayansmoke.vim rename to bundle/mayansmoke/colors/mayansmoke.vim diff --git a/sources_non_forked/nerdtree/.gitignore b/bundle/nerdtree/.gitignore similarity index 100% rename from sources_non_forked/nerdtree/.gitignore rename to bundle/nerdtree/.gitignore diff --git a/sources_non_forked/nerdtree/README.markdown b/bundle/nerdtree/README.markdown similarity index 100% rename from sources_non_forked/nerdtree/README.markdown rename to bundle/nerdtree/README.markdown diff --git a/sources_non_forked/nerdtree/autoload/nerdtree.vim b/bundle/nerdtree/autoload/nerdtree.vim similarity index 100% rename from sources_non_forked/nerdtree/autoload/nerdtree.vim rename to bundle/nerdtree/autoload/nerdtree.vim diff --git a/sources_non_forked/nerdtree/doc/NERD_tree.txt b/bundle/nerdtree/doc/NERD_tree.txt similarity index 100% rename from sources_non_forked/nerdtree/doc/NERD_tree.txt rename to bundle/nerdtree/doc/NERD_tree.txt diff --git a/sources_non_forked/nerdtree/lib/nerdtree/bookmark.vim b/bundle/nerdtree/lib/nerdtree/bookmark.vim similarity index 100% rename from sources_non_forked/nerdtree/lib/nerdtree/bookmark.vim rename to bundle/nerdtree/lib/nerdtree/bookmark.vim diff --git a/sources_non_forked/nerdtree/lib/nerdtree/creator.vim b/bundle/nerdtree/lib/nerdtree/creator.vim similarity index 100% rename from sources_non_forked/nerdtree/lib/nerdtree/creator.vim rename to bundle/nerdtree/lib/nerdtree/creator.vim diff --git a/sources_non_forked/nerdtree/lib/nerdtree/key_map.vim b/bundle/nerdtree/lib/nerdtree/key_map.vim similarity index 100% rename from sources_non_forked/nerdtree/lib/nerdtree/key_map.vim rename to bundle/nerdtree/lib/nerdtree/key_map.vim diff --git a/sources_non_forked/nerdtree/lib/nerdtree/menu_controller.vim b/bundle/nerdtree/lib/nerdtree/menu_controller.vim similarity index 100% rename from sources_non_forked/nerdtree/lib/nerdtree/menu_controller.vim rename to bundle/nerdtree/lib/nerdtree/menu_controller.vim diff --git a/sources_non_forked/nerdtree/lib/nerdtree/menu_item.vim b/bundle/nerdtree/lib/nerdtree/menu_item.vim similarity index 100% rename from sources_non_forked/nerdtree/lib/nerdtree/menu_item.vim rename to bundle/nerdtree/lib/nerdtree/menu_item.vim diff --git a/sources_non_forked/nerdtree/lib/nerdtree/opener.vim b/bundle/nerdtree/lib/nerdtree/opener.vim similarity index 100% rename from sources_non_forked/nerdtree/lib/nerdtree/opener.vim rename to bundle/nerdtree/lib/nerdtree/opener.vim diff --git a/sources_non_forked/nerdtree/lib/nerdtree/path.vim b/bundle/nerdtree/lib/nerdtree/path.vim similarity index 100% rename from sources_non_forked/nerdtree/lib/nerdtree/path.vim rename to bundle/nerdtree/lib/nerdtree/path.vim diff --git a/sources_non_forked/nerdtree/lib/nerdtree/tree_dir_node.vim b/bundle/nerdtree/lib/nerdtree/tree_dir_node.vim similarity index 100% rename from sources_non_forked/nerdtree/lib/nerdtree/tree_dir_node.vim rename to bundle/nerdtree/lib/nerdtree/tree_dir_node.vim diff --git a/sources_non_forked/nerdtree/lib/nerdtree/tree_file_node.vim b/bundle/nerdtree/lib/nerdtree/tree_file_node.vim similarity index 100% rename from sources_non_forked/nerdtree/lib/nerdtree/tree_file_node.vim rename to bundle/nerdtree/lib/nerdtree/tree_file_node.vim diff --git a/sources_non_forked/nerdtree/nerdtree_plugin/exec_menuitem.vim b/bundle/nerdtree/nerdtree_plugin/exec_menuitem.vim similarity index 100% rename from sources_non_forked/nerdtree/nerdtree_plugin/exec_menuitem.vim rename to bundle/nerdtree/nerdtree_plugin/exec_menuitem.vim diff --git a/sources_non_forked/nerdtree/nerdtree_plugin/fs_menu.vim b/bundle/nerdtree/nerdtree_plugin/fs_menu.vim similarity index 100% rename from sources_non_forked/nerdtree/nerdtree_plugin/fs_menu.vim rename to bundle/nerdtree/nerdtree_plugin/fs_menu.vim diff --git a/sources_non_forked/nerdtree/plugin/NERD_tree.vim b/bundle/nerdtree/plugin/NERD_tree.vim similarity index 100% rename from sources_non_forked/nerdtree/plugin/NERD_tree.vim rename to bundle/nerdtree/plugin/NERD_tree.vim diff --git a/sources_non_forked/nerdtree/syntax/nerdtree.vim b/bundle/nerdtree/syntax/nerdtree.vim similarity index 100% rename from sources_non_forked/nerdtree/syntax/nerdtree.vim rename to bundle/nerdtree/syntax/nerdtree.vim diff --git a/sources_non_forked/nginx-vim/README.md b/bundle/nginx-vim/README.md similarity index 100% rename from sources_non_forked/nginx-vim/README.md rename to bundle/nginx-vim/README.md diff --git a/sources_non_forked/nginx-vim/ftdetect/nginx.vim b/bundle/nginx-vim/ftdetect/nginx.vim similarity index 100% rename from sources_non_forked/nginx-vim/ftdetect/nginx.vim rename to bundle/nginx-vim/ftdetect/nginx.vim diff --git a/sources_non_forked/nginx-vim/indent/nginx.vim b/bundle/nginx-vim/indent/nginx.vim similarity index 100% rename from sources_non_forked/nginx-vim/indent/nginx.vim rename to bundle/nginx-vim/indent/nginx.vim diff --git a/sources_non_forked/nginx-vim/syntax/nginx.vim b/bundle/nginx-vim/syntax/nginx.vim similarity index 100% rename from sources_non_forked/nginx-vim/syntax/nginx.vim rename to bundle/nginx-vim/syntax/nginx.vim diff --git a/sources_non_forked/nginx.vim/README b/bundle/nginx.vim/README similarity index 100% rename from sources_non_forked/nginx.vim/README rename to bundle/nginx.vim/README diff --git a/sources_non_forked/nginx.vim/syntax/nginx.vim b/bundle/nginx.vim/syntax/nginx.vim similarity index 100% rename from sources_non_forked/nginx.vim/syntax/nginx.vim rename to bundle/nginx.vim/syntax/nginx.vim diff --git a/sources_non_forked/open_file_under_cursor.vim/plugin/open_file_under_cursor.vim b/bundle/open_file_under_cursor.vim/plugin/open_file_under_cursor.vim similarity index 100% rename from sources_non_forked/open_file_under_cursor.vim/plugin/open_file_under_cursor.vim rename to bundle/open_file_under_cursor.vim/plugin/open_file_under_cursor.vim diff --git a/sources_non_forked/snipmate-snippets/.gitignore b/bundle/snipmate-snippets/.gitignore similarity index 100% rename from sources_non_forked/snipmate-snippets/.gitignore rename to bundle/snipmate-snippets/.gitignore diff --git a/sources_non_forked/snipmate-snippets/Rakefile b/bundle/snipmate-snippets/Rakefile similarity index 100% rename from sources_non_forked/snipmate-snippets/Rakefile rename to bundle/snipmate-snippets/Rakefile diff --git a/sources_non_forked/snipmate-snippets/_/date/date + time.snippet b/bundle/snipmate-snippets/_/date/date + time.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/_/date/date + time.snippet rename to bundle/snipmate-snippets/_/date/date + time.snippet diff --git a/sources_non_forked/snipmate-snippets/_/date/date.snippet b/bundle/snipmate-snippets/_/date/date.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/_/date/date.snippet rename to bundle/snipmate-snippets/_/date/date.snippet diff --git a/sources_non_forked/snipmate-snippets/_/lorem.snippet b/bundle/snipmate-snippets/_/lorem.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/_/lorem.snippet rename to bundle/snipmate-snippets/_/lorem.snippet diff --git a/sources_non_forked/snipmate-snippets/_/modeline.snippet b/bundle/snipmate-snippets/_/modeline.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/_/modeline.snippet rename to bundle/snipmate-snippets/_/modeline.snippet diff --git a/sources_non_forked/snipmate-snippets/ant/skel/basic.snippet b/bundle/snipmate-snippets/ant/skel/basic.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ant/skel/basic.snippet rename to bundle/snipmate-snippets/ant/skel/basic.snippet diff --git a/sources_non_forked/snipmate-snippets/c/cl.snippet b/bundle/snipmate-snippets/c/cl.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/c/cl.snippet rename to bundle/snipmate-snippets/c/cl.snippet diff --git a/sources_non_forked/snipmate-snippets/c/def.snippet b/bundle/snipmate-snippets/c/def.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/c/def.snippet rename to bundle/snipmate-snippets/c/def.snippet diff --git a/sources_non_forked/snipmate-snippets/c/do.snippet b/bundle/snipmate-snippets/c/do.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/c/do.snippet rename to bundle/snipmate-snippets/c/do.snippet diff --git a/sources_non_forked/snipmate-snippets/c/el.snippet b/bundle/snipmate-snippets/c/el.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/c/el.snippet rename to bundle/snipmate-snippets/c/el.snippet diff --git a/sources_non_forked/snipmate-snippets/c/for.snippet b/bundle/snipmate-snippets/c/for.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/c/for.snippet rename to bundle/snipmate-snippets/c/for.snippet diff --git a/sources_non_forked/snipmate-snippets/c/forr.snippet b/bundle/snipmate-snippets/c/forr.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/c/forr.snippet rename to bundle/snipmate-snippets/c/forr.snippet diff --git a/sources_non_forked/snipmate-snippets/c/fpf.snippet b/bundle/snipmate-snippets/c/fpf.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/c/fpf.snippet rename to bundle/snipmate-snippets/c/fpf.snippet diff --git a/sources_non_forked/snipmate-snippets/c/fun.snippet b/bundle/snipmate-snippets/c/fun.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/c/fun.snippet rename to bundle/snipmate-snippets/c/fun.snippet diff --git a/sources_non_forked/snipmate-snippets/c/if.snippet b/bundle/snipmate-snippets/c/if.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/c/if.snippet rename to bundle/snipmate-snippets/c/if.snippet diff --git a/sources_non_forked/snipmate-snippets/c/inc/inc.snippet b/bundle/snipmate-snippets/c/inc/inc.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/c/inc/inc.snippet rename to bundle/snipmate-snippets/c/inc/inc.snippet diff --git a/sources_non_forked/snipmate-snippets/c/inc/inc_global.snippet b/bundle/snipmate-snippets/c/inc/inc_global.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/c/inc/inc_global.snippet rename to bundle/snipmate-snippets/c/inc/inc_global.snippet diff --git a/sources_non_forked/snipmate-snippets/c/main.snippet b/bundle/snipmate-snippets/c/main.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/c/main.snippet rename to bundle/snipmate-snippets/c/main.snippet diff --git a/sources_non_forked/snipmate-snippets/c/map.snippet b/bundle/snipmate-snippets/c/map.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/c/map.snippet rename to bundle/snipmate-snippets/c/map.snippet diff --git a/sources_non_forked/snipmate-snippets/c/ns.snippet b/bundle/snipmate-snippets/c/ns.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/c/ns.snippet rename to bundle/snipmate-snippets/c/ns.snippet diff --git a/sources_non_forked/snipmate-snippets/c/once.snippet b/bundle/snipmate-snippets/c/once.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/c/once.snippet rename to bundle/snipmate-snippets/c/once.snippet diff --git a/sources_non_forked/snipmate-snippets/c/pr.snippet b/bundle/snipmate-snippets/c/pr.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/c/pr.snippet rename to bundle/snipmate-snippets/c/pr.snippet diff --git a/sources_non_forked/snipmate-snippets/c/readfile.snippet b/bundle/snipmate-snippets/c/readfile.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/c/readfile.snippet rename to bundle/snipmate-snippets/c/readfile.snippet diff --git a/sources_non_forked/snipmate-snippets/c/st.snippet b/bundle/snipmate-snippets/c/st.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/c/st.snippet rename to bundle/snipmate-snippets/c/st.snippet diff --git a/sources_non_forked/snipmate-snippets/c/t.snippet b/bundle/snipmate-snippets/c/t.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/c/t.snippet rename to bundle/snipmate-snippets/c/t.snippet diff --git a/sources_non_forked/snipmate-snippets/c/td.snippet b/bundle/snipmate-snippets/c/td.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/c/td.snippet rename to bundle/snipmate-snippets/c/td.snippet diff --git a/sources_non_forked/snipmate-snippets/c/tds.snippet b/bundle/snipmate-snippets/c/tds.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/c/tds.snippet rename to bundle/snipmate-snippets/c/tds.snippet diff --git a/sources_non_forked/snipmate-snippets/c/vector.snippet b/bundle/snipmate-snippets/c/vector.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/c/vector.snippet rename to bundle/snipmate-snippets/c/vector.snippet diff --git a/sources_non_forked/snipmate-snippets/c/wh.snippet b/bundle/snipmate-snippets/c/wh.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/c/wh.snippet rename to bundle/snipmate-snippets/c/wh.snippet diff --git a/sources_non_forked/snipmate-snippets/css/#.snippet b/bundle/snipmate-snippets/css/#.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/#.snippet rename to bundle/snipmate-snippets/css/#.snippet diff --git a/sources_non_forked/snipmate-snippets/css/background/all.snippet b/bundle/snipmate-snippets/css/background/all.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/background/all.snippet rename to bundle/snipmate-snippets/css/background/all.snippet diff --git a/sources_non_forked/snipmate-snippets/css/background/attachment.snippet b/bundle/snipmate-snippets/css/background/attachment.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/background/attachment.snippet rename to bundle/snipmate-snippets/css/background/attachment.snippet diff --git a/sources_non_forked/snipmate-snippets/css/background/color.snippet b/bundle/snipmate-snippets/css/background/color.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/background/color.snippet rename to bundle/snipmate-snippets/css/background/color.snippet diff --git a/sources_non_forked/snipmate-snippets/css/background/color_name.snippet b/bundle/snipmate-snippets/css/background/color_name.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/background/color_name.snippet rename to bundle/snipmate-snippets/css/background/color_name.snippet diff --git a/sources_non_forked/snipmate-snippets/css/background/color_rgb.snippet b/bundle/snipmate-snippets/css/background/color_rgb.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/background/color_rgb.snippet rename to bundle/snipmate-snippets/css/background/color_rgb.snippet diff --git a/sources_non_forked/snipmate-snippets/css/background/color_transparent.snippet b/bundle/snipmate-snippets/css/background/color_transparent.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/background/color_transparent.snippet rename to bundle/snipmate-snippets/css/background/color_transparent.snippet diff --git a/sources_non_forked/snipmate-snippets/css/background/image_none.snippet b/bundle/snipmate-snippets/css/background/image_none.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/background/image_none.snippet rename to bundle/snipmate-snippets/css/background/image_none.snippet diff --git a/sources_non_forked/snipmate-snippets/css/background/image_url.snippet b/bundle/snipmate-snippets/css/background/image_url.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/background/image_url.snippet rename to bundle/snipmate-snippets/css/background/image_url.snippet diff --git a/sources_non_forked/snipmate-snippets/css/background/position.snippet b/bundle/snipmate-snippets/css/background/position.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/background/position.snippet rename to bundle/snipmate-snippets/css/background/position.snippet diff --git a/sources_non_forked/snipmate-snippets/css/background/repeat.snippet b/bundle/snipmate-snippets/css/background/repeat.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/background/repeat.snippet rename to bundle/snipmate-snippets/css/background/repeat.snippet diff --git a/sources_non_forked/snipmate-snippets/css/border/basic.snippet b/bundle/snipmate-snippets/css/border/basic.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/border/basic.snippet rename to bundle/snipmate-snippets/css/border/basic.snippet diff --git a/sources_non_forked/snipmate-snippets/css/border/color.snippet b/bundle/snipmate-snippets/css/border/color.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/border/color.snippet rename to bundle/snipmate-snippets/css/border/color.snippet diff --git a/sources_non_forked/snipmate-snippets/css/border/style.snippet b/bundle/snipmate-snippets/css/border/style.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/border/style.snippet rename to bundle/snipmate-snippets/css/border/style.snippet diff --git a/sources_non_forked/snipmate-snippets/css/border/width.snippet b/bundle/snipmate-snippets/css/border/width.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/border/width.snippet rename to bundle/snipmate-snippets/css/border/width.snippet diff --git a/sources_non_forked/snipmate-snippets/css/borderb/basic.snippet b/bundle/snipmate-snippets/css/borderb/basic.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/borderb/basic.snippet rename to bundle/snipmate-snippets/css/borderb/basic.snippet diff --git a/sources_non_forked/snipmate-snippets/css/borderb/color.snippet b/bundle/snipmate-snippets/css/borderb/color.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/borderb/color.snippet rename to bundle/snipmate-snippets/css/borderb/color.snippet diff --git a/sources_non_forked/snipmate-snippets/css/borderb/style.snippet b/bundle/snipmate-snippets/css/borderb/style.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/borderb/style.snippet rename to bundle/snipmate-snippets/css/borderb/style.snippet diff --git a/sources_non_forked/snipmate-snippets/css/borderb/width.snippet b/bundle/snipmate-snippets/css/borderb/width.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/borderb/width.snippet rename to bundle/snipmate-snippets/css/borderb/width.snippet diff --git a/sources_non_forked/snipmate-snippets/css/borderl/basic.snippet b/bundle/snipmate-snippets/css/borderl/basic.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/borderl/basic.snippet rename to bundle/snipmate-snippets/css/borderl/basic.snippet diff --git a/sources_non_forked/snipmate-snippets/css/borderl/color.snippet b/bundle/snipmate-snippets/css/borderl/color.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/borderl/color.snippet rename to bundle/snipmate-snippets/css/borderl/color.snippet diff --git a/sources_non_forked/snipmate-snippets/css/borderl/style.snippet b/bundle/snipmate-snippets/css/borderl/style.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/borderl/style.snippet rename to bundle/snipmate-snippets/css/borderl/style.snippet diff --git a/sources_non_forked/snipmate-snippets/css/borderl/width.snippet b/bundle/snipmate-snippets/css/borderl/width.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/borderl/width.snippet rename to bundle/snipmate-snippets/css/borderl/width.snippet diff --git a/sources_non_forked/snipmate-snippets/css/borderr/basic.snippet b/bundle/snipmate-snippets/css/borderr/basic.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/borderr/basic.snippet rename to bundle/snipmate-snippets/css/borderr/basic.snippet diff --git a/sources_non_forked/snipmate-snippets/css/borderr/color.snippet b/bundle/snipmate-snippets/css/borderr/color.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/borderr/color.snippet rename to bundle/snipmate-snippets/css/borderr/color.snippet diff --git a/sources_non_forked/snipmate-snippets/css/borderr/style.snippet b/bundle/snipmate-snippets/css/borderr/style.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/borderr/style.snippet rename to bundle/snipmate-snippets/css/borderr/style.snippet diff --git a/sources_non_forked/snipmate-snippets/css/borderr/width.snippet b/bundle/snipmate-snippets/css/borderr/width.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/borderr/width.snippet rename to bundle/snipmate-snippets/css/borderr/width.snippet diff --git a/sources_non_forked/snipmate-snippets/css/bordert/basic.snippet b/bundle/snipmate-snippets/css/bordert/basic.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/bordert/basic.snippet rename to bundle/snipmate-snippets/css/bordert/basic.snippet diff --git a/sources_non_forked/snipmate-snippets/css/bordert/color.snippet b/bundle/snipmate-snippets/css/bordert/color.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/bordert/color.snippet rename to bundle/snipmate-snippets/css/bordert/color.snippet diff --git a/sources_non_forked/snipmate-snippets/css/bordert/style.snippet b/bundle/snipmate-snippets/css/bordert/style.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/bordert/style.snippet rename to bundle/snipmate-snippets/css/bordert/style.snippet diff --git a/sources_non_forked/snipmate-snippets/css/bordert/width.snippet b/bundle/snipmate-snippets/css/bordert/width.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/bordert/width.snippet rename to bundle/snipmate-snippets/css/bordert/width.snippet diff --git a/sources_non_forked/snipmate-snippets/css/cl.snippet b/bundle/snipmate-snippets/css/cl.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/cl.snippet rename to bundle/snipmate-snippets/css/cl.snippet diff --git a/sources_non_forked/snipmate-snippets/css/clear.snippet b/bundle/snipmate-snippets/css/clear.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/clear.snippet rename to bundle/snipmate-snippets/css/clear.snippet diff --git a/sources_non_forked/snipmate-snippets/css/color.snippet b/bundle/snipmate-snippets/css/color.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/color.snippet rename to bundle/snipmate-snippets/css/color.snippet diff --git a/sources_non_forked/snipmate-snippets/css/colorn.snippet b/bundle/snipmate-snippets/css/colorn.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/colorn.snippet rename to bundle/snipmate-snippets/css/colorn.snippet diff --git a/sources_non_forked/snipmate-snippets/css/colorr.snippet b/bundle/snipmate-snippets/css/colorr.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/colorr.snippet rename to bundle/snipmate-snippets/css/colorr.snippet diff --git a/sources_non_forked/snipmate-snippets/css/cursor.snippet b/bundle/snipmate-snippets/css/cursor.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/cursor.snippet rename to bundle/snipmate-snippets/css/cursor.snippet diff --git a/sources_non_forked/snipmate-snippets/css/cursuru.snippet b/bundle/snipmate-snippets/css/cursuru.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/cursuru.snippet rename to bundle/snipmate-snippets/css/cursuru.snippet diff --git a/sources_non_forked/snipmate-snippets/css/direction.snippet b/bundle/snipmate-snippets/css/direction.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/direction.snippet rename to bundle/snipmate-snippets/css/direction.snippet diff --git a/sources_non_forked/snipmate-snippets/css/display/block.snippet b/bundle/snipmate-snippets/css/display/block.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/display/block.snippet rename to bundle/snipmate-snippets/css/display/block.snippet diff --git a/sources_non_forked/snipmate-snippets/css/display/common.snippet b/bundle/snipmate-snippets/css/display/common.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/display/common.snippet rename to bundle/snipmate-snippets/css/display/common.snippet diff --git a/sources_non_forked/snipmate-snippets/css/display/inline.snippet b/bundle/snipmate-snippets/css/display/inline.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/display/inline.snippet rename to bundle/snipmate-snippets/css/display/inline.snippet diff --git a/sources_non_forked/snipmate-snippets/css/display/table.snippet b/bundle/snipmate-snippets/css/display/table.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/display/table.snippet rename to bundle/snipmate-snippets/css/display/table.snippet diff --git a/sources_non_forked/snipmate-snippets/css/float.snippet b/bundle/snipmate-snippets/css/float.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/float.snippet rename to bundle/snipmate-snippets/css/float.snippet diff --git a/sources_non_forked/snipmate-snippets/css/font/all.snippet b/bundle/snipmate-snippets/css/font/all.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/font/all.snippet rename to bundle/snipmate-snippets/css/font/all.snippet diff --git a/sources_non_forked/snipmate-snippets/css/font/family.snippet b/bundle/snipmate-snippets/css/font/family.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/font/family.snippet rename to bundle/snipmate-snippets/css/font/family.snippet diff --git a/sources_non_forked/snipmate-snippets/css/font/size.snippet b/bundle/snipmate-snippets/css/font/size.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/font/size.snippet rename to bundle/snipmate-snippets/css/font/size.snippet diff --git a/sources_non_forked/snipmate-snippets/css/font/size_font.snippet b/bundle/snipmate-snippets/css/font/size_font.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/font/size_font.snippet rename to bundle/snipmate-snippets/css/font/size_font.snippet diff --git a/sources_non_forked/snipmate-snippets/css/font/style.snippet b/bundle/snipmate-snippets/css/font/style.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/font/style.snippet rename to bundle/snipmate-snippets/css/font/style.snippet diff --git a/sources_non_forked/snipmate-snippets/css/font/variant.snippet b/bundle/snipmate-snippets/css/font/variant.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/font/variant.snippet rename to bundle/snipmate-snippets/css/font/variant.snippet diff --git a/sources_non_forked/snipmate-snippets/css/font/weight.snippet b/bundle/snipmate-snippets/css/font/weight.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/font/weight.snippet rename to bundle/snipmate-snippets/css/font/weight.snippet diff --git a/sources_non_forked/snipmate-snippets/css/i.snippet b/bundle/snipmate-snippets/css/i.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/i.snippet rename to bundle/snipmate-snippets/css/i.snippet diff --git a/sources_non_forked/snipmate-snippets/css/letter.snippet b/bundle/snipmate-snippets/css/letter.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/letter.snippet rename to bundle/snipmate-snippets/css/letter.snippet diff --git a/sources_non_forked/snipmate-snippets/css/letterem.snippet b/bundle/snipmate-snippets/css/letterem.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/letterem.snippet rename to bundle/snipmate-snippets/css/letterem.snippet diff --git a/sources_non_forked/snipmate-snippets/css/letterpx.snippet b/bundle/snipmate-snippets/css/letterpx.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/letterpx.snippet rename to bundle/snipmate-snippets/css/letterpx.snippet diff --git a/sources_non_forked/snipmate-snippets/css/list-style/image.snippet b/bundle/snipmate-snippets/css/list-style/image.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/list-style/image.snippet rename to bundle/snipmate-snippets/css/list-style/image.snippet diff --git a/sources_non_forked/snipmate-snippets/css/list-style/position.snippet b/bundle/snipmate-snippets/css/list-style/position.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/list-style/position.snippet rename to bundle/snipmate-snippets/css/list-style/position.snippet diff --git a/sources_non_forked/snipmate-snippets/css/list-style/type_asian.snippet b/bundle/snipmate-snippets/css/list-style/type_asian.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/list-style/type_asian.snippet rename to bundle/snipmate-snippets/css/list-style/type_asian.snippet diff --git a/sources_non_forked/snipmate-snippets/css/list-style/type_marker.snippet b/bundle/snipmate-snippets/css/list-style/type_marker.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/list-style/type_marker.snippet rename to bundle/snipmate-snippets/css/list-style/type_marker.snippet diff --git a/sources_non_forked/snipmate-snippets/css/list-style/type_numeric.snippet b/bundle/snipmate-snippets/css/list-style/type_numeric.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/list-style/type_numeric.snippet rename to bundle/snipmate-snippets/css/list-style/type_numeric.snippet diff --git a/sources_non_forked/snipmate-snippets/css/list-style/type_other.snippet b/bundle/snipmate-snippets/css/list-style/type_other.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/list-style/type_other.snippet rename to bundle/snipmate-snippets/css/list-style/type_other.snippet diff --git a/sources_non_forked/snipmate-snippets/css/list-style/type_position_image.snippet b/bundle/snipmate-snippets/css/list-style/type_position_image.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/list-style/type_position_image.snippet rename to bundle/snipmate-snippets/css/list-style/type_position_image.snippet diff --git a/sources_non_forked/snipmate-snippets/css/list-style/type_roman_alpha_greek.snippet b/bundle/snipmate-snippets/css/list-style/type_roman_alpha_greek.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/list-style/type_roman_alpha_greek.snippet rename to bundle/snipmate-snippets/css/list-style/type_roman_alpha_greek.snippet diff --git a/sources_non_forked/snipmate-snippets/css/margin.snippet b/bundle/snipmate-snippets/css/margin.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/margin.snippet rename to bundle/snipmate-snippets/css/margin.snippet diff --git a/sources_non_forked/snipmate-snippets/css/marginb.snippet b/bundle/snipmate-snippets/css/marginb.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/marginb.snippet rename to bundle/snipmate-snippets/css/marginb.snippet diff --git a/sources_non_forked/snipmate-snippets/css/marginl.snippet b/bundle/snipmate-snippets/css/marginl.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/marginl.snippet rename to bundle/snipmate-snippets/css/marginl.snippet diff --git a/sources_non_forked/snipmate-snippets/css/margino/T_R_B_L.snippet b/bundle/snipmate-snippets/css/margino/T_R_B_L.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/margino/T_R_B_L.snippet rename to bundle/snipmate-snippets/css/margino/T_R_B_L.snippet diff --git a/sources_non_forked/snipmate-snippets/css/margino/V_H.snippet b/bundle/snipmate-snippets/css/margino/V_H.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/margino/V_H.snippet rename to bundle/snipmate-snippets/css/margino/V_H.snippet diff --git a/sources_non_forked/snipmate-snippets/css/margino/all.snippet b/bundle/snipmate-snippets/css/margino/all.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/margino/all.snippet rename to bundle/snipmate-snippets/css/margino/all.snippet diff --git a/sources_non_forked/snipmate-snippets/css/margino/bottom.snippet b/bundle/snipmate-snippets/css/margino/bottom.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/margino/bottom.snippet rename to bundle/snipmate-snippets/css/margino/bottom.snippet diff --git a/sources_non_forked/snipmate-snippets/css/margino/left.snippet b/bundle/snipmate-snippets/css/margino/left.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/margino/left.snippet rename to bundle/snipmate-snippets/css/margino/left.snippet diff --git a/sources_non_forked/snipmate-snippets/css/margino/right.snippet b/bundle/snipmate-snippets/css/margino/right.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/margino/right.snippet rename to bundle/snipmate-snippets/css/margino/right.snippet diff --git a/sources_non_forked/snipmate-snippets/css/margino/top.snippet b/bundle/snipmate-snippets/css/margino/top.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/margino/top.snippet rename to bundle/snipmate-snippets/css/margino/top.snippet diff --git a/sources_non_forked/snipmate-snippets/css/marginr.snippet b/bundle/snipmate-snippets/css/marginr.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/marginr.snippet rename to bundle/snipmate-snippets/css/marginr.snippet diff --git a/sources_non_forked/snipmate-snippets/css/margint.snippet b/bundle/snipmate-snippets/css/margint.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/margint.snippet rename to bundle/snipmate-snippets/css/margint.snippet diff --git a/sources_non_forked/snipmate-snippets/css/marker/offset_auto.snippet b/bundle/snipmate-snippets/css/marker/offset_auto.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/marker/offset_auto.snippet rename to bundle/snipmate-snippets/css/marker/offset_auto.snippet diff --git a/sources_non_forked/snipmate-snippets/css/marker/offset_length.snippet b/bundle/snipmate-snippets/css/marker/offset_length.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/marker/offset_length.snippet rename to bundle/snipmate-snippets/css/marker/offset_length.snippet diff --git a/sources_non_forked/snipmate-snippets/css/opacity.snippet b/bundle/snipmate-snippets/css/opacity.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/opacity.snippet rename to bundle/snipmate-snippets/css/opacity.snippet diff --git a/sources_non_forked/snipmate-snippets/css/overflow.snippet b/bundle/snipmate-snippets/css/overflow.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/overflow.snippet rename to bundle/snipmate-snippets/css/overflow.snippet diff --git a/sources_non_forked/snipmate-snippets/css/padding.snippet b/bundle/snipmate-snippets/css/padding.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/padding.snippet rename to bundle/snipmate-snippets/css/padding.snippet diff --git a/sources_non_forked/snipmate-snippets/css/paddingb.snippet b/bundle/snipmate-snippets/css/paddingb.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/paddingb.snippet rename to bundle/snipmate-snippets/css/paddingb.snippet diff --git a/sources_non_forked/snipmate-snippets/css/paddingl.snippet b/bundle/snipmate-snippets/css/paddingl.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/paddingl.snippet rename to bundle/snipmate-snippets/css/paddingl.snippet diff --git a/sources_non_forked/snipmate-snippets/css/paddingo/T_R_B_L.snippet b/bundle/snipmate-snippets/css/paddingo/T_R_B_L.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/paddingo/T_R_B_L.snippet rename to bundle/snipmate-snippets/css/paddingo/T_R_B_L.snippet diff --git a/sources_non_forked/snipmate-snippets/css/paddingo/V_H.snippet b/bundle/snipmate-snippets/css/paddingo/V_H.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/paddingo/V_H.snippet rename to bundle/snipmate-snippets/css/paddingo/V_H.snippet diff --git a/sources_non_forked/snipmate-snippets/css/paddingo/all.snippet b/bundle/snipmate-snippets/css/paddingo/all.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/paddingo/all.snippet rename to bundle/snipmate-snippets/css/paddingo/all.snippet diff --git a/sources_non_forked/snipmate-snippets/css/paddingo/bottom.snippet b/bundle/snipmate-snippets/css/paddingo/bottom.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/paddingo/bottom.snippet rename to bundle/snipmate-snippets/css/paddingo/bottom.snippet diff --git a/sources_non_forked/snipmate-snippets/css/paddingo/left.snippet b/bundle/snipmate-snippets/css/paddingo/left.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/paddingo/left.snippet rename to bundle/snipmate-snippets/css/paddingo/left.snippet diff --git a/sources_non_forked/snipmate-snippets/css/paddingo/right.snippet b/bundle/snipmate-snippets/css/paddingo/right.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/paddingo/right.snippet rename to bundle/snipmate-snippets/css/paddingo/right.snippet diff --git a/sources_non_forked/snipmate-snippets/css/paddingo/top.snippet b/bundle/snipmate-snippets/css/paddingo/top.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/paddingo/top.snippet rename to bundle/snipmate-snippets/css/paddingo/top.snippet diff --git a/sources_non_forked/snipmate-snippets/css/paddingr.snippet b/bundle/snipmate-snippets/css/paddingr.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/paddingr.snippet rename to bundle/snipmate-snippets/css/paddingr.snippet diff --git a/sources_non_forked/snipmate-snippets/css/paddingt.snippet b/bundle/snipmate-snippets/css/paddingt.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/paddingt.snippet rename to bundle/snipmate-snippets/css/paddingt.snippet diff --git a/sources_non_forked/snipmate-snippets/css/position.snippet b/bundle/snipmate-snippets/css/position.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/position.snippet rename to bundle/snipmate-snippets/css/position.snippet diff --git a/sources_non_forked/snipmate-snippets/css/scrollbar.snippet b/bundle/snipmate-snippets/css/scrollbar.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/scrollbar.snippet rename to bundle/snipmate-snippets/css/scrollbar.snippet diff --git a/sources_non_forked/snipmate-snippets/css/tag.snippet b/bundle/snipmate-snippets/css/tag.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/tag.snippet rename to bundle/snipmate-snippets/css/tag.snippet diff --git a/sources_non_forked/snipmate-snippets/css/text/align.snippet b/bundle/snipmate-snippets/css/text/align.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/text/align.snippet rename to bundle/snipmate-snippets/css/text/align.snippet diff --git a/sources_non_forked/snipmate-snippets/css/text/decoration.snippet b/bundle/snipmate-snippets/css/text/decoration.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/text/decoration.snippet rename to bundle/snipmate-snippets/css/text/decoration.snippet diff --git a/sources_non_forked/snipmate-snippets/css/text/indent.snippet b/bundle/snipmate-snippets/css/text/indent.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/text/indent.snippet rename to bundle/snipmate-snippets/css/text/indent.snippet diff --git a/sources_non_forked/snipmate-snippets/css/text/shadow_hex.snippet b/bundle/snipmate-snippets/css/text/shadow_hex.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/text/shadow_hex.snippet rename to bundle/snipmate-snippets/css/text/shadow_hex.snippet diff --git a/sources_non_forked/snipmate-snippets/css/text/shadow_none.snippet b/bundle/snipmate-snippets/css/text/shadow_none.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/text/shadow_none.snippet rename to bundle/snipmate-snippets/css/text/shadow_none.snippet diff --git a/sources_non_forked/snipmate-snippets/css/text/shadow_rgb.snippet b/bundle/snipmate-snippets/css/text/shadow_rgb.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/text/shadow_rgb.snippet rename to bundle/snipmate-snippets/css/text/shadow_rgb.snippet diff --git a/sources_non_forked/snipmate-snippets/css/text/transform.snippet b/bundle/snipmate-snippets/css/text/transform.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/text/transform.snippet rename to bundle/snipmate-snippets/css/text/transform.snippet diff --git a/sources_non_forked/snipmate-snippets/css/text/transform_none.snippet b/bundle/snipmate-snippets/css/text/transform_none.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/text/transform_none.snippet rename to bundle/snipmate-snippets/css/text/transform_none.snippet diff --git a/sources_non_forked/snipmate-snippets/css/vertical.snippet b/bundle/snipmate-snippets/css/vertical.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/vertical.snippet rename to bundle/snipmate-snippets/css/vertical.snippet diff --git a/sources_non_forked/snipmate-snippets/css/visibility.snippet b/bundle/snipmate-snippets/css/visibility.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/visibility.snippet rename to bundle/snipmate-snippets/css/visibility.snippet diff --git a/sources_non_forked/snipmate-snippets/css/white.snippet b/bundle/snipmate-snippets/css/white.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/white.snippet rename to bundle/snipmate-snippets/css/white.snippet diff --git a/sources_non_forked/snipmate-snippets/css/word/spacing_length.snippet b/bundle/snipmate-snippets/css/word/spacing_length.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/word/spacing_length.snippet rename to bundle/snipmate-snippets/css/word/spacing_length.snippet diff --git a/sources_non_forked/snipmate-snippets/css/word/spacing_normal.snippet b/bundle/snipmate-snippets/css/word/spacing_normal.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/word/spacing_normal.snippet rename to bundle/snipmate-snippets/css/word/spacing_normal.snippet diff --git a/sources_non_forked/snipmate-snippets/css/z.snippet b/bundle/snipmate-snippets/css/z.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/css/z.snippet rename to bundle/snipmate-snippets/css/z.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/conf.snippet b/bundle/snipmate-snippets/eruby-rails/conf.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/conf.snippet rename to bundle/snipmate-snippets/eruby-rails/conf.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/cs.snippet b/bundle/snipmate-snippets/eruby-rails/cs.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/cs.snippet rename to bundle/snipmate-snippets/eruby-rails/cs.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/ct.snippet b/bundle/snipmate-snippets/eruby-rails/ct.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/ct.snippet rename to bundle/snipmate-snippets/eruby-rails/ct.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/end.snippet b/bundle/snipmate-snippets/eruby-rails/end.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/end.snippet rename to bundle/snipmate-snippets/eruby-rails/end.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/ff.snippet b/bundle/snipmate-snippets/eruby-rails/ff.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/ff.snippet rename to bundle/snipmate-snippets/eruby-rails/ff.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/ffcb.snippet b/bundle/snipmate-snippets/eruby-rails/ffcb.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/ffcb.snippet rename to bundle/snipmate-snippets/eruby-rails/ffcb.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/ffe.snippet b/bundle/snipmate-snippets/eruby-rails/ffe.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/ffe.snippet rename to bundle/snipmate-snippets/eruby-rails/ffe.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/ffff.snippet b/bundle/snipmate-snippets/eruby-rails/ffff.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/ffff.snippet rename to bundle/snipmate-snippets/eruby-rails/ffff.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/ffhf.snippet b/bundle/snipmate-snippets/eruby-rails/ffhf.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/ffhf.snippet rename to bundle/snipmate-snippets/eruby-rails/ffhf.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/ffl.snippet b/bundle/snipmate-snippets/eruby-rails/ffl.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/ffl.snippet rename to bundle/snipmate-snippets/eruby-rails/ffl.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/ffpf.snippet b/bundle/snipmate-snippets/eruby-rails/ffpf.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/ffpf.snippet rename to bundle/snipmate-snippets/eruby-rails/ffpf.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/ffrb.snippet b/bundle/snipmate-snippets/eruby-rails/ffrb.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/ffrb.snippet rename to bundle/snipmate-snippets/eruby-rails/ffrb.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/ffs.snippet b/bundle/snipmate-snippets/eruby-rails/ffs.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/ffs.snippet rename to bundle/snipmate-snippets/eruby-rails/ffs.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/ffta.snippet b/bundle/snipmate-snippets/eruby-rails/ffta.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/ffta.snippet rename to bundle/snipmate-snippets/eruby-rails/ffta.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/fftf.snippet b/bundle/snipmate-snippets/eruby-rails/fftf.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/fftf.snippet rename to bundle/snipmate-snippets/eruby-rails/fftf.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/fields.snippet b/bundle/snipmate-snippets/eruby-rails/fields.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/fields.snippet rename to bundle/snipmate-snippets/eruby-rails/fields.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/for.snippet b/bundle/snipmate-snippets/eruby-rails/for.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/for.snippet rename to bundle/snipmate-snippets/eruby-rails/for.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/ft.snippet b/bundle/snipmate-snippets/eruby-rails/ft.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/ft.snippet rename to bundle/snipmate-snippets/eruby-rails/ft.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/i18.snippet b/bundle/snipmate-snippets/eruby-rails/i18.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/i18.snippet rename to bundle/snipmate-snippets/eruby-rails/i18.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/it.snippet b/bundle/snipmate-snippets/eruby-rails/it.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/it.snippet rename to bundle/snipmate-snippets/eruby-rails/it.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/jit.snippet b/bundle/snipmate-snippets/eruby-rails/jit.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/jit.snippet rename to bundle/snipmate-snippets/eruby-rails/jit.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/jsit.snippet b/bundle/snipmate-snippets/eruby-rails/jsit.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/jsit.snippet rename to bundle/snipmate-snippets/eruby-rails/jsit.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/lia.snippet b/bundle/snipmate-snippets/eruby-rails/lia.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/lia.snippet rename to bundle/snipmate-snippets/eruby-rails/lia.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/liai.snippet b/bundle/snipmate-snippets/eruby-rails/liai.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/liai.snippet rename to bundle/snipmate-snippets/eruby-rails/liai.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/lic.snippet b/bundle/snipmate-snippets/eruby-rails/lic.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/lic.snippet rename to bundle/snipmate-snippets/eruby-rails/lic.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/lica.snippet b/bundle/snipmate-snippets/eruby-rails/lica.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/lica.snippet rename to bundle/snipmate-snippets/eruby-rails/lica.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/licai.snippet b/bundle/snipmate-snippets/eruby-rails/licai.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/licai.snippet rename to bundle/snipmate-snippets/eruby-rails/licai.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/lim.snippet b/bundle/snipmate-snippets/eruby-rails/lim.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/lim.snippet rename to bundle/snipmate-snippets/eruby-rails/lim.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/linp.snippet b/bundle/snipmate-snippets/eruby-rails/linp.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/linp.snippet rename to bundle/snipmate-snippets/eruby-rails/linp.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/linpp.snippet b/bundle/snipmate-snippets/eruby-rails/linpp.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/linpp.snippet rename to bundle/snipmate-snippets/eruby-rails/linpp.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/lip.snippet b/bundle/snipmate-snippets/eruby-rails/lip.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/lip.snippet rename to bundle/snipmate-snippets/eruby-rails/lip.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/lipp.snippet b/bundle/snipmate-snippets/eruby-rails/lipp.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/lipp.snippet rename to bundle/snipmate-snippets/eruby-rails/lipp.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/lt.snippet b/bundle/snipmate-snippets/eruby-rails/lt.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/lt.snippet rename to bundle/snipmate-snippets/eruby-rails/lt.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/ofcfs.snippet b/bundle/snipmate-snippets/eruby-rails/ofcfs.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/ofcfs.snippet rename to bundle/snipmate-snippets/eruby-rails/ofcfs.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/rf.snippet b/bundle/snipmate-snippets/eruby-rails/rf.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/rf.snippet rename to bundle/snipmate-snippets/eruby-rails/rf.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/rp.snippet b/bundle/snipmate-snippets/eruby-rails/rp.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/rp.snippet rename to bundle/snipmate-snippets/eruby-rails/rp.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/rt.snippet b/bundle/snipmate-snippets/eruby-rails/rt.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/rt.snippet rename to bundle/snipmate-snippets/eruby-rails/rt.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/slt.snippet b/bundle/snipmate-snippets/eruby-rails/slt.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/slt.snippet rename to bundle/snipmate-snippets/eruby-rails/slt.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/sslt.snippet b/bundle/snipmate-snippets/eruby-rails/sslt.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/sslt.snippet rename to bundle/snipmate-snippets/eruby-rails/sslt.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby-rails/st.snippet b/bundle/snipmate-snippets/eruby-rails/st.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby-rails/st.snippet rename to bundle/snipmate-snippets/eruby-rails/st.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby/if.snippet b/bundle/snipmate-snippets/eruby/if.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby/if.snippet rename to bundle/snipmate-snippets/eruby/if.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby/ife.snippet b/bundle/snipmate-snippets/eruby/ife.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby/ife.snippet rename to bundle/snipmate-snippets/eruby/ife.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby/unless.snippet b/bundle/snipmate-snippets/eruby/unless.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby/unless.snippet rename to bundle/snipmate-snippets/eruby/unless.snippet diff --git a/sources_non_forked/snipmate-snippets/eruby/unlesse.snippet b/bundle/snipmate-snippets/eruby/unlesse.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/eruby/unlesse.snippet rename to bundle/snipmate-snippets/eruby/unlesse.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/conf.snippet b/bundle/snipmate-snippets/haml/conf.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/conf.snippet rename to bundle/snipmate-snippets/haml/conf.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/cs.snippet b/bundle/snipmate-snippets/haml/cs.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/cs.snippet rename to bundle/snipmate-snippets/haml/cs.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/ff.snippet b/bundle/snipmate-snippets/haml/ff.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/ff.snippet rename to bundle/snipmate-snippets/haml/ff.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/ffcb.snippet b/bundle/snipmate-snippets/haml/ffcb.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/ffcb.snippet rename to bundle/snipmate-snippets/haml/ffcb.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/ffe.snippet b/bundle/snipmate-snippets/haml/ffe.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/ffe.snippet rename to bundle/snipmate-snippets/haml/ffe.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/ffff.snippet b/bundle/snipmate-snippets/haml/ffff.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/ffff.snippet rename to bundle/snipmate-snippets/haml/ffff.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/ffhf.snippet b/bundle/snipmate-snippets/haml/ffhf.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/ffhf.snippet rename to bundle/snipmate-snippets/haml/ffhf.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/ffl.snippet b/bundle/snipmate-snippets/haml/ffl.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/ffl.snippet rename to bundle/snipmate-snippets/haml/ffl.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/ffpf.snippet b/bundle/snipmate-snippets/haml/ffpf.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/ffpf.snippet rename to bundle/snipmate-snippets/haml/ffpf.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/ffrb.snippet b/bundle/snipmate-snippets/haml/ffrb.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/ffrb.snippet rename to bundle/snipmate-snippets/haml/ffrb.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/ffs.snippet b/bundle/snipmate-snippets/haml/ffs.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/ffs.snippet rename to bundle/snipmate-snippets/haml/ffs.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/ffta.snippet b/bundle/snipmate-snippets/haml/ffta.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/ffta.snippet rename to bundle/snipmate-snippets/haml/ffta.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/fftf.snippet b/bundle/snipmate-snippets/haml/fftf.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/fftf.snippet rename to bundle/snipmate-snippets/haml/fftf.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/fields.snippet b/bundle/snipmate-snippets/haml/fields.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/fields.snippet rename to bundle/snipmate-snippets/haml/fields.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/for.snippet b/bundle/snipmate-snippets/haml/for.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/for.snippet rename to bundle/snipmate-snippets/haml/for.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/ft.snippet b/bundle/snipmate-snippets/haml/ft.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/ft.snippet rename to bundle/snipmate-snippets/haml/ft.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/if.snippet b/bundle/snipmate-snippets/haml/if.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/if.snippet rename to bundle/snipmate-snippets/haml/if.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/ife.snippet b/bundle/snipmate-snippets/haml/ife.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/ife.snippet rename to bundle/snipmate-snippets/haml/ife.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/it.snippet b/bundle/snipmate-snippets/haml/it.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/it.snippet rename to bundle/snipmate-snippets/haml/it.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/jit.snippet b/bundle/snipmate-snippets/haml/jit.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/jit.snippet rename to bundle/snipmate-snippets/haml/jit.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/jsit.snippet b/bundle/snipmate-snippets/haml/jsit.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/jsit.snippet rename to bundle/snipmate-snippets/haml/jsit.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/lia.snippet b/bundle/snipmate-snippets/haml/lia.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/lia.snippet rename to bundle/snipmate-snippets/haml/lia.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/liai.snippet b/bundle/snipmate-snippets/haml/liai.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/liai.snippet rename to bundle/snipmate-snippets/haml/liai.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/lic.snippet b/bundle/snipmate-snippets/haml/lic.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/lic.snippet rename to bundle/snipmate-snippets/haml/lic.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/lica.snippet b/bundle/snipmate-snippets/haml/lica.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/lica.snippet rename to bundle/snipmate-snippets/haml/lica.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/licai.snippet b/bundle/snipmate-snippets/haml/licai.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/licai.snippet rename to bundle/snipmate-snippets/haml/licai.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/lim.snippet b/bundle/snipmate-snippets/haml/lim.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/lim.snippet rename to bundle/snipmate-snippets/haml/lim.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/linp.snippet b/bundle/snipmate-snippets/haml/linp.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/linp.snippet rename to bundle/snipmate-snippets/haml/linp.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/linpp.snippet b/bundle/snipmate-snippets/haml/linpp.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/linpp.snippet rename to bundle/snipmate-snippets/haml/linpp.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/lip.snippet b/bundle/snipmate-snippets/haml/lip.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/lip.snippet rename to bundle/snipmate-snippets/haml/lip.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/lipp.snippet b/bundle/snipmate-snippets/haml/lipp.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/lipp.snippet rename to bundle/snipmate-snippets/haml/lipp.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/lt.snippet b/bundle/snipmate-snippets/haml/lt.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/lt.snippet rename to bundle/snipmate-snippets/haml/lt.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/ofcfs.snippet b/bundle/snipmate-snippets/haml/ofcfs.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/ofcfs.snippet rename to bundle/snipmate-snippets/haml/ofcfs.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/rf.snippet b/bundle/snipmate-snippets/haml/rf.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/rf.snippet rename to bundle/snipmate-snippets/haml/rf.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/rp.snippet b/bundle/snipmate-snippets/haml/rp.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/rp.snippet rename to bundle/snipmate-snippets/haml/rp.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/rt.snippet b/bundle/snipmate-snippets/haml/rt.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/rt.snippet rename to bundle/snipmate-snippets/haml/rt.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/slt.snippet b/bundle/snipmate-snippets/haml/slt.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/slt.snippet rename to bundle/snipmate-snippets/haml/slt.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/sslt.snippet b/bundle/snipmate-snippets/haml/sslt.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/sslt.snippet rename to bundle/snipmate-snippets/haml/sslt.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/st.snippet b/bundle/snipmate-snippets/haml/st.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/st.snippet rename to bundle/snipmate-snippets/haml/st.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/unless.snippet b/bundle/snipmate-snippets/haml/unless.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/unless.snippet rename to bundle/snipmate-snippets/haml/unless.snippet diff --git a/sources_non_forked/snipmate-snippets/haml/unlesse.snippet b/bundle/snipmate-snippets/haml/unlesse.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/haml/unlesse.snippet rename to bundle/snipmate-snippets/haml/unlesse.snippet diff --git a/sources_non_forked/snipmate-snippets/html/base.snippet b/bundle/snipmate-snippets/html/base.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/html/base.snippet rename to bundle/snipmate-snippets/html/base.snippet diff --git a/sources_non_forked/snipmate-snippets/html/body.snippet b/bundle/snipmate-snippets/html/body.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/html/body.snippet rename to bundle/snipmate-snippets/html/body.snippet diff --git a/sources_non_forked/snipmate-snippets/html/div.snippet b/bundle/snipmate-snippets/html/div.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/html/div.snippet rename to bundle/snipmate-snippets/html/div.snippet diff --git a/sources_non_forked/snipmate-snippets/html/doctype.snippet b/bundle/snipmate-snippets/html/doctype.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/html/doctype.snippet rename to bundle/snipmate-snippets/html/doctype.snippet diff --git a/sources_non_forked/snipmate-snippets/html/form.snippet b/bundle/snipmate-snippets/html/form.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/html/form.snippet rename to bundle/snipmate-snippets/html/form.snippet diff --git a/sources_non_forked/snipmate-snippets/html/h1.snippet b/bundle/snipmate-snippets/html/h1.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/html/h1.snippet rename to bundle/snipmate-snippets/html/h1.snippet diff --git a/sources_non_forked/snipmate-snippets/html/head.snippet b/bundle/snipmate-snippets/html/head.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/html/head.snippet rename to bundle/snipmate-snippets/html/head.snippet diff --git a/sources_non_forked/snipmate-snippets/html/href.snippet b/bundle/snipmate-snippets/html/href.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/html/href.snippet rename to bundle/snipmate-snippets/html/href.snippet diff --git a/sources_non_forked/snipmate-snippets/html/ifie.snippet b/bundle/snipmate-snippets/html/ifie.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/html/ifie.snippet rename to bundle/snipmate-snippets/html/ifie.snippet diff --git a/sources_non_forked/snipmate-snippets/html/img.snippet b/bundle/snipmate-snippets/html/img.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/html/img.snippet rename to bundle/snipmate-snippets/html/img.snippet diff --git a/sources_non_forked/snipmate-snippets/html/input.snippet b/bundle/snipmate-snippets/html/input.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/html/input.snippet rename to bundle/snipmate-snippets/html/input.snippet diff --git a/sources_non_forked/snipmate-snippets/html/inputl.snippet b/bundle/snipmate-snippets/html/inputl.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/html/inputl.snippet rename to bundle/snipmate-snippets/html/inputl.snippet diff --git a/sources_non_forked/snipmate-snippets/html/label.snippet b/bundle/snipmate-snippets/html/label.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/html/label.snippet rename to bundle/snipmate-snippets/html/label.snippet diff --git a/sources_non_forked/snipmate-snippets/html/link.snippet b/bundle/snipmate-snippets/html/link.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/html/link.snippet rename to bundle/snipmate-snippets/html/link.snippet diff --git a/sources_non_forked/snipmate-snippets/html/mailto.snippet b/bundle/snipmate-snippets/html/mailto.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/html/mailto.snippet rename to bundle/snipmate-snippets/html/mailto.snippet diff --git a/sources_non_forked/snipmate-snippets/html/meta.snippet b/bundle/snipmate-snippets/html/meta.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/html/meta.snippet rename to bundle/snipmate-snippets/html/meta.snippet diff --git a/sources_non_forked/snipmate-snippets/html/option.snippet b/bundle/snipmate-snippets/html/option.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/html/option.snippet rename to bundle/snipmate-snippets/html/option.snippet diff --git a/sources_non_forked/snipmate-snippets/html/script/include_script.snippet b/bundle/snipmate-snippets/html/script/include_script.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/html/script/include_script.snippet rename to bundle/snipmate-snippets/html/script/include_script.snippet diff --git a/sources_non_forked/snipmate-snippets/html/script/inline_script.snippet b/bundle/snipmate-snippets/html/script/inline_script.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/html/script/inline_script.snippet rename to bundle/snipmate-snippets/html/script/inline_script.snippet diff --git a/sources_non_forked/snipmate-snippets/html/select.snippet b/bundle/snipmate-snippets/html/select.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/html/select.snippet rename to bundle/snipmate-snippets/html/select.snippet diff --git a/sources_non_forked/snipmate-snippets/html/skel/basic.snippet b/bundle/snipmate-snippets/html/skel/basic.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/html/skel/basic.snippet rename to bundle/snipmate-snippets/html/skel/basic.snippet diff --git a/sources_non_forked/snipmate-snippets/html/skel/basic_with_meta.snippet b/bundle/snipmate-snippets/html/skel/basic_with_meta.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/html/skel/basic_with_meta.snippet rename to bundle/snipmate-snippets/html/skel/basic_with_meta.snippet diff --git a/sources_non_forked/snipmate-snippets/html/style.snippet b/bundle/snipmate-snippets/html/style.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/html/style.snippet rename to bundle/snipmate-snippets/html/style.snippet diff --git a/sources_non_forked/snipmate-snippets/html/t.snippet b/bundle/snipmate-snippets/html/t.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/html/t.snippet rename to bundle/snipmate-snippets/html/t.snippet diff --git a/sources_non_forked/snipmate-snippets/html/table/basic.snippet b/bundle/snipmate-snippets/html/table/basic.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/html/table/basic.snippet rename to bundle/snipmate-snippets/html/table/basic.snippet diff --git a/sources_non_forked/snipmate-snippets/html/table/hardcore.snippet b/bundle/snipmate-snippets/html/table/hardcore.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/html/table/hardcore.snippet rename to bundle/snipmate-snippets/html/table/hardcore.snippet diff --git a/sources_non_forked/snipmate-snippets/html/textarea.snippet b/bundle/snipmate-snippets/html/textarea.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/html/textarea.snippet rename to bundle/snipmate-snippets/html/textarea.snippet diff --git a/sources_non_forked/snipmate-snippets/java/class/basic+constructor+main.snippet b/bundle/snipmate-snippets/java/class/basic+constructor+main.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/java/class/basic+constructor+main.snippet rename to bundle/snipmate-snippets/java/class/basic+constructor+main.snippet diff --git a/sources_non_forked/snipmate-snippets/java/class/basic+constructor.snippet b/bundle/snipmate-snippets/java/class/basic+constructor.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/java/class/basic+constructor.snippet rename to bundle/snipmate-snippets/java/class/basic+constructor.snippet diff --git a/sources_non_forked/snipmate-snippets/java/class/basic.snippet b/bundle/snipmate-snippets/java/class/basic.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/java/class/basic.snippet rename to bundle/snipmate-snippets/java/class/basic.snippet diff --git a/sources_non_forked/snipmate-snippets/java/for.snippet b/bundle/snipmate-snippets/java/for.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/java/for.snippet rename to bundle/snipmate-snippets/java/for.snippet diff --git a/sources_non_forked/snipmate-snippets/java/gs.snippet b/bundle/snipmate-snippets/java/gs.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/java/gs.snippet rename to bundle/snipmate-snippets/java/gs.snippet diff --git a/sources_non_forked/snipmate-snippets/java/if.snippet b/bundle/snipmate-snippets/java/if.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/java/if.snippet rename to bundle/snipmate-snippets/java/if.snippet diff --git a/sources_non_forked/snipmate-snippets/java/ife.snippet b/bundle/snipmate-snippets/java/ife.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/java/ife.snippet rename to bundle/snipmate-snippets/java/ife.snippet diff --git a/sources_non_forked/snipmate-snippets/java/log.snippet b/bundle/snipmate-snippets/java/log.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/java/log.snippet rename to bundle/snipmate-snippets/java/log.snippet diff --git a/sources_non_forked/snipmate-snippets/java/m.snippet b/bundle/snipmate-snippets/java/m.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/java/m.snippet rename to bundle/snipmate-snippets/java/m.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/add.snippet b/bundle/snipmate-snippets/javascript-jquery/add.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/add.snippet rename to bundle/snipmate-snippets/javascript-jquery/add.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/addClass.snippet b/bundle/snipmate-snippets/javascript-jquery/addClass.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/addClass.snippet rename to bundle/snipmate-snippets/javascript-jquery/addClass.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/after.snippet b/bundle/snipmate-snippets/javascript-jquery/after.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/after.snippet rename to bundle/snipmate-snippets/javascript-jquery/after.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/ajax.snippet b/bundle/snipmate-snippets/javascript-jquery/ajax.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/ajax.snippet rename to bundle/snipmate-snippets/javascript-jquery/ajax.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxerror.snippet b/bundle/snipmate-snippets/javascript-jquery/ajaxerror.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/ajaxerror.snippet rename to bundle/snipmate-snippets/javascript-jquery/ajaxerror.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxget.snippet b/bundle/snipmate-snippets/javascript-jquery/ajaxget.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/ajaxget.snippet rename to bundle/snipmate-snippets/javascript-jquery/ajaxget.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxgetif.snippet b/bundle/snipmate-snippets/javascript-jquery/ajaxgetif.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/ajaxgetif.snippet rename to bundle/snipmate-snippets/javascript-jquery/ajaxgetif.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxpost.snippet b/bundle/snipmate-snippets/javascript-jquery/ajaxpost.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/ajaxpost.snippet rename to bundle/snipmate-snippets/javascript-jquery/ajaxpost.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxsend.snippet b/bundle/snipmate-snippets/javascript-jquery/ajaxsend.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/ajaxsend.snippet rename to bundle/snipmate-snippets/javascript-jquery/ajaxsend.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxsetup.snippet b/bundle/snipmate-snippets/javascript-jquery/ajaxsetup.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/ajaxsetup.snippet rename to bundle/snipmate-snippets/javascript-jquery/ajaxsetup.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxstart.snippet b/bundle/snipmate-snippets/javascript-jquery/ajaxstart.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/ajaxstart.snippet rename to bundle/snipmate-snippets/javascript-jquery/ajaxstart.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxstop.snippet b/bundle/snipmate-snippets/javascript-jquery/ajaxstop.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/ajaxstop.snippet rename to bundle/snipmate-snippets/javascript-jquery/ajaxstop.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/ajaxsuccess.snippet b/bundle/snipmate-snippets/javascript-jquery/ajaxsuccess.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/ajaxsuccess.snippet rename to bundle/snipmate-snippets/javascript-jquery/ajaxsuccess.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/animate.snippet b/bundle/snipmate-snippets/javascript-jquery/animate.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/animate.snippet rename to bundle/snipmate-snippets/javascript-jquery/animate.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/append.snippet b/bundle/snipmate-snippets/javascript-jquery/append.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/append.snippet rename to bundle/snipmate-snippets/javascript-jquery/append.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/appendTo.snippet b/bundle/snipmate-snippets/javascript-jquery/appendTo.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/appendTo.snippet rename to bundle/snipmate-snippets/javascript-jquery/appendTo.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/attr.snippet b/bundle/snipmate-snippets/javascript-jquery/attr.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/attr.snippet rename to bundle/snipmate-snippets/javascript-jquery/attr.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/attrm.snippet b/bundle/snipmate-snippets/javascript-jquery/attrm.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/attrm.snippet rename to bundle/snipmate-snippets/javascript-jquery/attrm.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/before.snippet b/bundle/snipmate-snippets/javascript-jquery/before.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/before.snippet rename to bundle/snipmate-snippets/javascript-jquery/before.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/bind.snippet b/bundle/snipmate-snippets/javascript-jquery/bind.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/bind.snippet rename to bundle/snipmate-snippets/javascript-jquery/bind.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/blur.snippet b/bundle/snipmate-snippets/javascript-jquery/blur.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/blur.snippet rename to bundle/snipmate-snippets/javascript-jquery/blur.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/change.snippet b/bundle/snipmate-snippets/javascript-jquery/change.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/change.snippet rename to bundle/snipmate-snippets/javascript-jquery/change.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/children.snippet b/bundle/snipmate-snippets/javascript-jquery/children.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/children.snippet rename to bundle/snipmate-snippets/javascript-jquery/children.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/click.snippet b/bundle/snipmate-snippets/javascript-jquery/click.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/click.snippet rename to bundle/snipmate-snippets/javascript-jquery/click.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/clone.snippet b/bundle/snipmate-snippets/javascript-jquery/clone.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/clone.snippet rename to bundle/snipmate-snippets/javascript-jquery/clone.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/contains.snippet b/bundle/snipmate-snippets/javascript-jquery/contains.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/contains.snippet rename to bundle/snipmate-snippets/javascript-jquery/contains.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/css.snippet b/bundle/snipmate-snippets/javascript-jquery/css.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/css.snippet rename to bundle/snipmate-snippets/javascript-jquery/css.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/cssm.snippet b/bundle/snipmate-snippets/javascript-jquery/cssm.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/cssm.snippet rename to bundle/snipmate-snippets/javascript-jquery/cssm.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/dblclick.snippet b/bundle/snipmate-snippets/javascript-jquery/dblclick.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/dblclick.snippet rename to bundle/snipmate-snippets/javascript-jquery/dblclick.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/each.snippet b/bundle/snipmate-snippets/javascript-jquery/each.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/each.snippet rename to bundle/snipmate-snippets/javascript-jquery/each.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/el.snippet b/bundle/snipmate-snippets/javascript-jquery/el.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/el.snippet rename to bundle/snipmate-snippets/javascript-jquery/el.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/eltrim.snippet b/bundle/snipmate-snippets/javascript-jquery/eltrim.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/eltrim.snippet rename to bundle/snipmate-snippets/javascript-jquery/eltrim.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/end.snippet b/bundle/snipmate-snippets/javascript-jquery/end.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/end.snippet rename to bundle/snipmate-snippets/javascript-jquery/end.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/error.snippet b/bundle/snipmate-snippets/javascript-jquery/error.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/error.snippet rename to bundle/snipmate-snippets/javascript-jquery/error.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/fadein.snippet b/bundle/snipmate-snippets/javascript-jquery/fadein.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/fadein.snippet rename to bundle/snipmate-snippets/javascript-jquery/fadein.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/fadeinc.snippet b/bundle/snipmate-snippets/javascript-jquery/fadeinc.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/fadeinc.snippet rename to bundle/snipmate-snippets/javascript-jquery/fadeinc.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/fadeout.snippet b/bundle/snipmate-snippets/javascript-jquery/fadeout.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/fadeout.snippet rename to bundle/snipmate-snippets/javascript-jquery/fadeout.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/fadeoutc.snippet b/bundle/snipmate-snippets/javascript-jquery/fadeoutc.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/fadeoutc.snippet rename to bundle/snipmate-snippets/javascript-jquery/fadeoutc.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/fadeto.snippet b/bundle/snipmate-snippets/javascript-jquery/fadeto.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/fadeto.snippet rename to bundle/snipmate-snippets/javascript-jquery/fadeto.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/fadetoc.snippet b/bundle/snipmate-snippets/javascript-jquery/fadetoc.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/fadetoc.snippet rename to bundle/snipmate-snippets/javascript-jquery/fadetoc.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/filter.snippet b/bundle/snipmate-snippets/javascript-jquery/filter.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/filter.snippet rename to bundle/snipmate-snippets/javascript-jquery/filter.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/find.snippet b/bundle/snipmate-snippets/javascript-jquery/find.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/find.snippet rename to bundle/snipmate-snippets/javascript-jquery/find.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/focus.snippet b/bundle/snipmate-snippets/javascript-jquery/focus.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/focus.snippet rename to bundle/snipmate-snippets/javascript-jquery/focus.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/get.snippet b/bundle/snipmate-snippets/javascript-jquery/get.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/get.snippet rename to bundle/snipmate-snippets/javascript-jquery/get.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/getjson.snippet b/bundle/snipmate-snippets/javascript-jquery/getjson.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/getjson.snippet rename to bundle/snipmate-snippets/javascript-jquery/getjson.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/getscript.snippet b/bundle/snipmate-snippets/javascript-jquery/getscript.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/getscript.snippet rename to bundle/snipmate-snippets/javascript-jquery/getscript.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/height.snippet b/bundle/snipmate-snippets/javascript-jquery/height.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/height.snippet rename to bundle/snipmate-snippets/javascript-jquery/height.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/hide.snippet b/bundle/snipmate-snippets/javascript-jquery/hide.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/hide.snippet rename to bundle/snipmate-snippets/javascript-jquery/hide.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/hidec.snippet b/bundle/snipmate-snippets/javascript-jquery/hidec.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/hidec.snippet rename to bundle/snipmate-snippets/javascript-jquery/hidec.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/hover.snippet b/bundle/snipmate-snippets/javascript-jquery/hover.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/hover.snippet rename to bundle/snipmate-snippets/javascript-jquery/hover.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/html.snippet b/bundle/snipmate-snippets/javascript-jquery/html.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/html.snippet rename to bundle/snipmate-snippets/javascript-jquery/html.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/insertAfter.snippet b/bundle/snipmate-snippets/javascript-jquery/insertAfter.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/insertAfter.snippet rename to bundle/snipmate-snippets/javascript-jquery/insertAfter.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/insertBefore.snippet b/bundle/snipmate-snippets/javascript-jquery/insertBefore.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/insertBefore.snippet rename to bundle/snipmate-snippets/javascript-jquery/insertBefore.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/is.snippet b/bundle/snipmate-snippets/javascript-jquery/is.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/is.snippet rename to bundle/snipmate-snippets/javascript-jquery/is.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/load.snippet b/bundle/snipmate-snippets/javascript-jquery/load.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/load.snippet rename to bundle/snipmate-snippets/javascript-jquery/load.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/loadf.snippet b/bundle/snipmate-snippets/javascript-jquery/loadf.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/loadf.snippet rename to bundle/snipmate-snippets/javascript-jquery/loadf.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/loadif.snippet b/bundle/snipmate-snippets/javascript-jquery/loadif.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/loadif.snippet rename to bundle/snipmate-snippets/javascript-jquery/loadif.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/mdown.snippet b/bundle/snipmate-snippets/javascript-jquery/mdown.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/mdown.snippet rename to bundle/snipmate-snippets/javascript-jquery/mdown.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/mmove.snippet b/bundle/snipmate-snippets/javascript-jquery/mmove.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/mmove.snippet rename to bundle/snipmate-snippets/javascript-jquery/mmove.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/mout.snippet b/bundle/snipmate-snippets/javascript-jquery/mout.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/mout.snippet rename to bundle/snipmate-snippets/javascript-jquery/mout.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/mover.snippet b/bundle/snipmate-snippets/javascript-jquery/mover.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/mover.snippet rename to bundle/snipmate-snippets/javascript-jquery/mover.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/mup.snippet b/bundle/snipmate-snippets/javascript-jquery/mup.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/mup.snippet rename to bundle/snipmate-snippets/javascript-jquery/mup.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/next.snippet b/bundle/snipmate-snippets/javascript-jquery/next.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/next.snippet rename to bundle/snipmate-snippets/javascript-jquery/next.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/not.snippet b/bundle/snipmate-snippets/javascript-jquery/not.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/not.snippet rename to bundle/snipmate-snippets/javascript-jquery/not.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/one.snippet b/bundle/snipmate-snippets/javascript-jquery/one.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/one.snippet rename to bundle/snipmate-snippets/javascript-jquery/one.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/parent.snippet b/bundle/snipmate-snippets/javascript-jquery/parent.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/parent.snippet rename to bundle/snipmate-snippets/javascript-jquery/parent.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/parents.snippet b/bundle/snipmate-snippets/javascript-jquery/parents.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/parents.snippet rename to bundle/snipmate-snippets/javascript-jquery/parents.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/prepend.snippet b/bundle/snipmate-snippets/javascript-jquery/prepend.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/prepend.snippet rename to bundle/snipmate-snippets/javascript-jquery/prepend.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/prependto.snippet b/bundle/snipmate-snippets/javascript-jquery/prependto.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/prependto.snippet rename to bundle/snipmate-snippets/javascript-jquery/prependto.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/prev.snippet b/bundle/snipmate-snippets/javascript-jquery/prev.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/prev.snippet rename to bundle/snipmate-snippets/javascript-jquery/prev.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/ready.snippet b/bundle/snipmate-snippets/javascript-jquery/ready.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/ready.snippet rename to bundle/snipmate-snippets/javascript-jquery/ready.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/remove.snippet b/bundle/snipmate-snippets/javascript-jquery/remove.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/remove.snippet rename to bundle/snipmate-snippets/javascript-jquery/remove.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/removeattr.snippet b/bundle/snipmate-snippets/javascript-jquery/removeattr.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/removeattr.snippet rename to bundle/snipmate-snippets/javascript-jquery/removeattr.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/removeclass.snippet b/bundle/snipmate-snippets/javascript-jquery/removeclass.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/removeclass.snippet rename to bundle/snipmate-snippets/javascript-jquery/removeclass.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/reset.snippet b/bundle/snipmate-snippets/javascript-jquery/reset.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/reset.snippet rename to bundle/snipmate-snippets/javascript-jquery/reset.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/resize.snippet b/bundle/snipmate-snippets/javascript-jquery/resize.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/resize.snippet rename to bundle/snipmate-snippets/javascript-jquery/resize.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/scroll.snippet b/bundle/snipmate-snippets/javascript-jquery/scroll.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/scroll.snippet rename to bundle/snipmate-snippets/javascript-jquery/scroll.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/sdown.snippet b/bundle/snipmate-snippets/javascript-jquery/sdown.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/sdown.snippet rename to bundle/snipmate-snippets/javascript-jquery/sdown.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/sdownc.snippet b/bundle/snipmate-snippets/javascript-jquery/sdownc.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/sdownc.snippet rename to bundle/snipmate-snippets/javascript-jquery/sdownc.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/sdupc.snippet b/bundle/snipmate-snippets/javascript-jquery/sdupc.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/sdupc.snippet rename to bundle/snipmate-snippets/javascript-jquery/sdupc.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/select.snippet b/bundle/snipmate-snippets/javascript-jquery/select.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/select.snippet rename to bundle/snipmate-snippets/javascript-jquery/select.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/show.snippet b/bundle/snipmate-snippets/javascript-jquery/show.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/show.snippet rename to bundle/snipmate-snippets/javascript-jquery/show.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/showc.snippet b/bundle/snipmate-snippets/javascript-jquery/showc.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/showc.snippet rename to bundle/snipmate-snippets/javascript-jquery/showc.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/sib.snippet b/bundle/snipmate-snippets/javascript-jquery/sib.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/sib.snippet rename to bundle/snipmate-snippets/javascript-jquery/sib.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/size.snippet b/bundle/snipmate-snippets/javascript-jquery/size.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/size.snippet rename to bundle/snipmate-snippets/javascript-jquery/size.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/stoggle.snippet b/bundle/snipmate-snippets/javascript-jquery/stoggle.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/stoggle.snippet rename to bundle/snipmate-snippets/javascript-jquery/stoggle.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/submit.snippet b/bundle/snipmate-snippets/javascript-jquery/submit.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/submit.snippet rename to bundle/snipmate-snippets/javascript-jquery/submit.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/sup.snippet b/bundle/snipmate-snippets/javascript-jquery/sup.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/sup.snippet rename to bundle/snipmate-snippets/javascript-jquery/sup.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/text.snippet b/bundle/snipmate-snippets/javascript-jquery/text.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/text.snippet rename to bundle/snipmate-snippets/javascript-jquery/text.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/this.snippet b/bundle/snipmate-snippets/javascript-jquery/this.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/this.snippet rename to bundle/snipmate-snippets/javascript-jquery/this.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/tog.snippet b/bundle/snipmate-snippets/javascript-jquery/tog.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/tog.snippet rename to bundle/snipmate-snippets/javascript-jquery/tog.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/togclass.snippet b/bundle/snipmate-snippets/javascript-jquery/togclass.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/togclass.snippet rename to bundle/snipmate-snippets/javascript-jquery/togclass.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/togsh.snippet b/bundle/snipmate-snippets/javascript-jquery/togsh.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/togsh.snippet rename to bundle/snipmate-snippets/javascript-jquery/togsh.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/trig.snippet b/bundle/snipmate-snippets/javascript-jquery/trig.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/trig.snippet rename to bundle/snipmate-snippets/javascript-jquery/trig.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/unbind.snippet b/bundle/snipmate-snippets/javascript-jquery/unbind.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/unbind.snippet rename to bundle/snipmate-snippets/javascript-jquery/unbind.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/val.snippet b/bundle/snipmate-snippets/javascript-jquery/val.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/val.snippet rename to bundle/snipmate-snippets/javascript-jquery/val.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/width.snippet b/bundle/snipmate-snippets/javascript-jquery/width.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/width.snippet rename to bundle/snipmate-snippets/javascript-jquery/width.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript-jquery/wrap.snippet b/bundle/snipmate-snippets/javascript-jquery/wrap.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript-jquery/wrap.snippet rename to bundle/snipmate-snippets/javascript-jquery/wrap.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript/anon.snippet b/bundle/snipmate-snippets/javascript/anon.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript/anon.snippet rename to bundle/snipmate-snippets/javascript/anon.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript/for.snippet b/bundle/snipmate-snippets/javascript/for.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript/for.snippet rename to bundle/snipmate-snippets/javascript/for.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript/fun.snippet b/bundle/snipmate-snippets/javascript/fun.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript/fun.snippet rename to bundle/snipmate-snippets/javascript/fun.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript/if.snippet b/bundle/snipmate-snippets/javascript/if.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript/if.snippet rename to bundle/snipmate-snippets/javascript/if.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript/ife.snippet b/bundle/snipmate-snippets/javascript/ife.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript/ife.snippet rename to bundle/snipmate-snippets/javascript/ife.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript/log.snippet b/bundle/snipmate-snippets/javascript/log.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript/log.snippet rename to bundle/snipmate-snippets/javascript/log.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript/met.snippet b/bundle/snipmate-snippets/javascript/met.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript/met.snippet rename to bundle/snipmate-snippets/javascript/met.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript/proto.snippet b/bundle/snipmate-snippets/javascript/proto.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript/proto.snippet rename to bundle/snipmate-snippets/javascript/proto.snippet diff --git a/sources_non_forked/snipmate-snippets/javascript/timeout.snippet b/bundle/snipmate-snippets/javascript/timeout.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/javascript/timeout.snippet rename to bundle/snipmate-snippets/javascript/timeout.snippet diff --git a/sources_non_forked/snipmate-snippets/objc/I.snippet b/bundle/snipmate-snippets/objc/I.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/objc/I.snippet rename to bundle/snipmate-snippets/objc/I.snippet diff --git a/sources_non_forked/snipmate-snippets/objc/Imp.snippet b/bundle/snipmate-snippets/objc/Imp.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/objc/Imp.snippet rename to bundle/snipmate-snippets/objc/Imp.snippet diff --git a/sources_non_forked/snipmate-snippets/objc/alloc.snippet b/bundle/snipmate-snippets/objc/alloc.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/objc/alloc.snippet rename to bundle/snipmate-snippets/objc/alloc.snippet diff --git a/sources_non_forked/snipmate-snippets/objc/array.snippet b/bundle/snipmate-snippets/objc/array.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/objc/array.snippet rename to bundle/snipmate-snippets/objc/array.snippet diff --git a/sources_non_forked/snipmate-snippets/objc/bez.snippet b/bundle/snipmate-snippets/objc/bez.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/objc/bez.snippet rename to bundle/snipmate-snippets/objc/bez.snippet diff --git a/sources_non_forked/snipmate-snippets/objc/cat.snippet b/bundle/snipmate-snippets/objc/cat.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/objc/cat.snippet rename to bundle/snipmate-snippets/objc/cat.snippet diff --git a/sources_non_forked/snipmate-snippets/objc/cati.snippet b/bundle/snipmate-snippets/objc/cati.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/objc/cati.snippet rename to bundle/snipmate-snippets/objc/cati.snippet diff --git a/sources_non_forked/snipmate-snippets/objc/cli.snippet b/bundle/snipmate-snippets/objc/cli.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/objc/cli.snippet rename to bundle/snipmate-snippets/objc/cli.snippet diff --git a/sources_non_forked/snipmate-snippets/objc/dict.snippet b/bundle/snipmate-snippets/objc/dict.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/objc/dict.snippet rename to bundle/snipmate-snippets/objc/dict.snippet diff --git a/sources_non_forked/snipmate-snippets/objc/forarray.snippet b/bundle/snipmate-snippets/objc/forarray.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/objc/forarray.snippet rename to bundle/snipmate-snippets/objc/forarray.snippet diff --git a/sources_non_forked/snipmate-snippets/objc/log.snippet b/bundle/snipmate-snippets/objc/log.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/objc/log.snippet rename to bundle/snipmate-snippets/objc/log.snippet diff --git a/sources_non_forked/snipmate-snippets/objc/m/class method.snippet b/bundle/snipmate-snippets/objc/m/class method.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/objc/m/class method.snippet rename to bundle/snipmate-snippets/objc/m/class method.snippet diff --git a/sources_non_forked/snipmate-snippets/objc/m/method.snippet b/bundle/snipmate-snippets/objc/m/method.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/objc/m/method.snippet rename to bundle/snipmate-snippets/objc/m/method.snippet diff --git a/sources_non_forked/snipmate-snippets/objc/objacc.snippet b/bundle/snipmate-snippets/objc/objacc.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/objc/objacc.snippet rename to bundle/snipmate-snippets/objc/objacc.snippet diff --git a/sources_non_forked/snipmate-snippets/objc/objc.snippet b/bundle/snipmate-snippets/objc/objc.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/objc/objc.snippet rename to bundle/snipmate-snippets/objc/objc.snippet diff --git a/sources_non_forked/snipmate-snippets/objc/prop.snippet b/bundle/snipmate-snippets/objc/prop.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/objc/prop.snippet rename to bundle/snipmate-snippets/objc/prop.snippet diff --git a/sources_non_forked/snipmate-snippets/objc/rel.snippet b/bundle/snipmate-snippets/objc/rel.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/objc/rel.snippet rename to bundle/snipmate-snippets/objc/rel.snippet diff --git a/sources_non_forked/snipmate-snippets/objc/ret.snippet b/bundle/snipmate-snippets/objc/ret.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/objc/ret.snippet rename to bundle/snipmate-snippets/objc/ret.snippet diff --git a/sources_non_forked/snipmate-snippets/objc/sel.snippet b/bundle/snipmate-snippets/objc/sel.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/objc/sel.snippet rename to bundle/snipmate-snippets/objc/sel.snippet diff --git a/sources_non_forked/snipmate-snippets/objc/sm.snippet b/bundle/snipmate-snippets/objc/sm.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/objc/sm.snippet rename to bundle/snipmate-snippets/objc/sm.snippet diff --git a/sources_non_forked/snipmate-snippets/objc/syn.snippet b/bundle/snipmate-snippets/objc/syn.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/objc/syn.snippet rename to bundle/snipmate-snippets/objc/syn.snippet diff --git a/sources_non_forked/snipmate-snippets/php/array.snippet b/bundle/snipmate-snippets/php/array.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/array.snippet rename to bundle/snipmate-snippets/php/array.snippet diff --git a/sources_non_forked/snipmate-snippets/php/case.snippet b/bundle/snipmate-snippets/php/case.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/case.snippet rename to bundle/snipmate-snippets/php/case.snippet diff --git a/sources_non_forked/snipmate-snippets/php/class.snippet b/bundle/snipmate-snippets/php/class.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/class.snippet rename to bundle/snipmate-snippets/php/class.snippet diff --git a/sources_non_forked/snipmate-snippets/php/classe.snippet b/bundle/snipmate-snippets/php/classe.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/classe.snippet rename to bundle/snipmate-snippets/php/classe.snippet diff --git a/sources_non_forked/snipmate-snippets/php/def.snippet b/bundle/snipmate-snippets/php/def.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/def.snippet rename to bundle/snipmate-snippets/php/def.snippet diff --git a/sources_non_forked/snipmate-snippets/php/defd.snippet b/bundle/snipmate-snippets/php/defd.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/defd.snippet rename to bundle/snipmate-snippets/php/defd.snippet diff --git a/sources_non_forked/snipmate-snippets/php/do.snippet b/bundle/snipmate-snippets/php/do.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/do.snippet rename to bundle/snipmate-snippets/php/do.snippet diff --git a/sources_non_forked/snipmate-snippets/php/doc_cp.snippet b/bundle/snipmate-snippets/php/doc_cp.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/doc_cp.snippet rename to bundle/snipmate-snippets/php/doc_cp.snippet diff --git a/sources_non_forked/snipmate-snippets/php/doc_f.snippet b/bundle/snipmate-snippets/php/doc_f.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/doc_f.snippet rename to bundle/snipmate-snippets/php/doc_f.snippet diff --git a/sources_non_forked/snipmate-snippets/php/doc_h.snippet b/bundle/snipmate-snippets/php/doc_h.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/doc_h.snippet rename to bundle/snipmate-snippets/php/doc_h.snippet diff --git a/sources_non_forked/snipmate-snippets/php/doc_i.snippet b/bundle/snipmate-snippets/php/doc_i.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/doc_i.snippet rename to bundle/snipmate-snippets/php/doc_i.snippet diff --git a/sources_non_forked/snipmate-snippets/php/ec.snippet b/bundle/snipmate-snippets/php/ec.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/ec.snippet rename to bundle/snipmate-snippets/php/ec.snippet diff --git a/sources_non_forked/snipmate-snippets/php/else.snippet b/bundle/snipmate-snippets/php/else.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/else.snippet rename to bundle/snipmate-snippets/php/else.snippet diff --git a/sources_non_forked/snipmate-snippets/php/elseif.snippet b/bundle/snipmate-snippets/php/elseif.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/elseif.snippet rename to bundle/snipmate-snippets/php/elseif.snippet diff --git a/sources_non_forked/snipmate-snippets/php/for.snippet b/bundle/snipmate-snippets/php/for.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/for.snippet rename to bundle/snipmate-snippets/php/for.snippet diff --git a/sources_non_forked/snipmate-snippets/php/foreach.snippet b/bundle/snipmate-snippets/php/foreach.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/foreach.snippet rename to bundle/snipmate-snippets/php/foreach.snippet diff --git a/sources_non_forked/snipmate-snippets/php/foreachk.snippet b/bundle/snipmate-snippets/php/foreachk.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/foreachk.snippet rename to bundle/snipmate-snippets/php/foreachk.snippet diff --git a/sources_non_forked/snipmate-snippets/php/fun.snippet b/bundle/snipmate-snippets/php/fun.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/fun.snippet rename to bundle/snipmate-snippets/php/fun.snippet diff --git a/sources_non_forked/snipmate-snippets/php/get.snippet b/bundle/snipmate-snippets/php/get.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/get.snippet rename to bundle/snipmate-snippets/php/get.snippet diff --git a/sources_non_forked/snipmate-snippets/php/globals.snippet b/bundle/snipmate-snippets/php/globals.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/globals.snippet rename to bundle/snipmate-snippets/php/globals.snippet diff --git a/sources_non_forked/snipmate-snippets/php/if.snippet b/bundle/snipmate-snippets/php/if.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/if.snippet rename to bundle/snipmate-snippets/php/if.snippet diff --git a/sources_non_forked/snipmate-snippets/php/ife.snippet b/bundle/snipmate-snippets/php/ife.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/ife.snippet rename to bundle/snipmate-snippets/php/ife.snippet diff --git a/sources_non_forked/snipmate-snippets/php/inc.snippet b/bundle/snipmate-snippets/php/inc.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/inc.snippet rename to bundle/snipmate-snippets/php/inc.snippet diff --git a/sources_non_forked/snipmate-snippets/php/inc1.snippet b/bundle/snipmate-snippets/php/inc1.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/inc1.snippet rename to bundle/snipmate-snippets/php/inc1.snippet diff --git a/sources_non_forked/snipmate-snippets/php/log.snippet b/bundle/snipmate-snippets/php/log.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/log.snippet rename to bundle/snipmate-snippets/php/log.snippet diff --git a/sources_non_forked/snipmate-snippets/php/php.snippet b/bundle/snipmate-snippets/php/php.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/php.snippet rename to bundle/snipmate-snippets/php/php.snippet diff --git a/sources_non_forked/snipmate-snippets/php/post.snippet b/bundle/snipmate-snippets/php/post.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/post.snippet rename to bundle/snipmate-snippets/php/post.snippet diff --git a/sources_non_forked/snipmate-snippets/php/req.snippet b/bundle/snipmate-snippets/php/req.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/req.snippet rename to bundle/snipmate-snippets/php/req.snippet diff --git a/sources_non_forked/snipmate-snippets/php/req1.snippet b/bundle/snipmate-snippets/php/req1.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/req1.snippet rename to bundle/snipmate-snippets/php/req1.snippet diff --git a/sources_non_forked/snipmate-snippets/php/request.snippet b/bundle/snipmate-snippets/php/request.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/request.snippet rename to bundle/snipmate-snippets/php/request.snippet diff --git a/sources_non_forked/snipmate-snippets/php/session.snippet b/bundle/snipmate-snippets/php/session.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/session.snippet rename to bundle/snipmate-snippets/php/session.snippet diff --git a/sources_non_forked/snipmate-snippets/php/switch.snippet b/bundle/snipmate-snippets/php/switch.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/switch.snippet rename to bundle/snipmate-snippets/php/switch.snippet diff --git a/sources_non_forked/snipmate-snippets/php/t.snippet b/bundle/snipmate-snippets/php/t.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/t.snippet rename to bundle/snipmate-snippets/php/t.snippet diff --git a/sources_non_forked/snipmate-snippets/php/try.snippet b/bundle/snipmate-snippets/php/try.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/try.snippet rename to bundle/snipmate-snippets/php/try.snippet diff --git a/sources_non_forked/snipmate-snippets/php/var.snippet b/bundle/snipmate-snippets/php/var.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/var.snippet rename to bundle/snipmate-snippets/php/var.snippet diff --git a/sources_non_forked/snipmate-snippets/php/wh.snippet b/bundle/snipmate-snippets/php/wh.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/php/wh.snippet rename to bundle/snipmate-snippets/php/wh.snippet diff --git a/sources_non_forked/snipmate-snippets/po/msg.snippet b/bundle/snipmate-snippets/po/msg.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/po/msg.snippet rename to bundle/snipmate-snippets/po/msg.snippet diff --git a/sources_non_forked/snipmate-snippets/python/class.snippet b/bundle/snipmate-snippets/python/class.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/python/class.snippet rename to bundle/snipmate-snippets/python/class.snippet diff --git a/sources_non_forked/snipmate-snippets/python/def.snippet b/bundle/snipmate-snippets/python/def.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/python/def.snippet rename to bundle/snipmate-snippets/python/def.snippet diff --git a/sources_non_forked/snipmate-snippets/python/for.snippet b/bundle/snipmate-snippets/python/for.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/python/for.snippet rename to bundle/snipmate-snippets/python/for.snippet diff --git a/sources_non_forked/snipmate-snippets/python/from.snippet b/bundle/snipmate-snippets/python/from.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/python/from.snippet rename to bundle/snipmate-snippets/python/from.snippet diff --git a/sources_non_forked/snipmate-snippets/python/get.snippet b/bundle/snipmate-snippets/python/get.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/python/get.snippet rename to bundle/snipmate-snippets/python/get.snippet diff --git a/sources_non_forked/snipmate-snippets/python/ifmain.snippet b/bundle/snipmate-snippets/python/ifmain.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/python/ifmain.snippet rename to bundle/snipmate-snippets/python/ifmain.snippet diff --git a/sources_non_forked/snipmate-snippets/python/import.snippet b/bundle/snipmate-snippets/python/import.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/python/import.snippet rename to bundle/snipmate-snippets/python/import.snippet diff --git a/sources_non_forked/snipmate-snippets/python/init.snippet b/bundle/snipmate-snippets/python/init.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/python/init.snippet rename to bundle/snipmate-snippets/python/init.snippet diff --git a/sources_non_forked/snipmate-snippets/python/set.snippet b/bundle/snipmate-snippets/python/set.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/python/set.snippet rename to bundle/snipmate-snippets/python/set.snippet diff --git a/sources_non_forked/snipmate-snippets/python/try.snippet b/bundle/snipmate-snippets/python/try.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/python/try.snippet rename to bundle/snipmate-snippets/python/try.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-factorygirl/fac.snippet b/bundle/snipmate-snippets/ruby-factorygirl/fac.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-factorygirl/fac.snippet rename to bundle/snipmate-snippets/ruby-factorygirl/fac.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-factorygirl/facb.snippet b/bundle/snipmate-snippets/ruby-factorygirl/facb.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-factorygirl/facb.snippet rename to bundle/snipmate-snippets/ruby-factorygirl/facb.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-factorygirl/facd.snippet b/bundle/snipmate-snippets/ruby-factorygirl/facd.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-factorygirl/facd.snippet rename to bundle/snipmate-snippets/ruby-factorygirl/facd.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-factorygirl/facn.snippet b/bundle/snipmate-snippets/ruby-factorygirl/facn.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-factorygirl/facn.snippet rename to bundle/snipmate-snippets/ruby-factorygirl/facn.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-factorygirl/facs.snippet b/bundle/snipmate-snippets/ruby-factorygirl/facs.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-factorygirl/facs.snippet rename to bundle/snipmate-snippets/ruby-factorygirl/facs.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/art.snippet b/bundle/snipmate-snippets/ruby-rails/art.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/art.snippet rename to bundle/snipmate-snippets/ruby-rails/art.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/artnp.snippet b/bundle/snipmate-snippets/ruby-rails/artnp.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/artnp.snippet rename to bundle/snipmate-snippets/ruby-rails/artnp.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/artnpp.snippet b/bundle/snipmate-snippets/ruby-rails/artnpp.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/artnpp.snippet rename to bundle/snipmate-snippets/ruby-rails/artnpp.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/artp.snippet b/bundle/snipmate-snippets/ruby-rails/artp.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/artp.snippet rename to bundle/snipmate-snippets/ruby-rails/artp.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/artpp.snippet b/bundle/snipmate-snippets/ruby-rails/artpp.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/artpp.snippet rename to bundle/snipmate-snippets/ruby-rails/artpp.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/asd.snippet b/bundle/snipmate-snippets/ruby-rails/asd.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/asd.snippet rename to bundle/snipmate-snippets/ruby-rails/asd.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/asnd.snippet b/bundle/snipmate-snippets/ruby-rails/asnd.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/asnd.snippet rename to bundle/snipmate-snippets/ruby-rails/asnd.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/asre.snippet b/bundle/snipmate-snippets/ruby-rails/asre.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/asre.snippet rename to bundle/snipmate-snippets/ruby-rails/asre.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/asrj.snippet b/bundle/snipmate-snippets/ruby-rails/asrj.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/asrj.snippet rename to bundle/snipmate-snippets/ruby-rails/asrj.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/ass.snippet b/bundle/snipmate-snippets/ruby-rails/ass.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/ass.snippet rename to bundle/snipmate-snippets/ruby-rails/ass.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/bf.snippet b/bundle/snipmate-snippets/ruby-rails/bf.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/bf.snippet rename to bundle/snipmate-snippets/ruby-rails/bf.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/bt.snippet b/bundle/snipmate-snippets/ruby-rails/bt.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/bt.snippet rename to bundle/snipmate-snippets/ruby-rails/bt.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/crw.snippet b/bundle/snipmate-snippets/ruby-rails/crw.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/crw.snippet rename to bundle/snipmate-snippets/ruby-rails/crw.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/defcreate.snippet b/bundle/snipmate-snippets/ruby-rails/defcreate.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/defcreate.snippet rename to bundle/snipmate-snippets/ruby-rails/defcreate.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/defdestroy.snippet b/bundle/snipmate-snippets/ruby-rails/defdestroy.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/defdestroy.snippet rename to bundle/snipmate-snippets/ruby-rails/defdestroy.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/defedit.snippet b/bundle/snipmate-snippets/ruby-rails/defedit.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/defedit.snippet rename to bundle/snipmate-snippets/ruby-rails/defedit.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/defindex.snippet b/bundle/snipmate-snippets/ruby-rails/defindex.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/defindex.snippet rename to bundle/snipmate-snippets/ruby-rails/defindex.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/defnew.snippet b/bundle/snipmate-snippets/ruby-rails/defnew.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/defnew.snippet rename to bundle/snipmate-snippets/ruby-rails/defnew.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/defshow.snippet b/bundle/snipmate-snippets/ruby-rails/defshow.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/defshow.snippet rename to bundle/snipmate-snippets/ruby-rails/defshow.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/defupdate.snippet b/bundle/snipmate-snippets/ruby-rails/defupdate.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/defupdate.snippet rename to bundle/snipmate-snippets/ruby-rails/defupdate.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/fina.snippet b/bundle/snipmate-snippets/ruby-rails/fina.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/fina.snippet rename to bundle/snipmate-snippets/ruby-rails/fina.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/finf.snippet b/bundle/snipmate-snippets/ruby-rails/finf.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/finf.snippet rename to bundle/snipmate-snippets/ruby-rails/finf.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/fini.snippet b/bundle/snipmate-snippets/ruby-rails/fini.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/fini.snippet rename to bundle/snipmate-snippets/ruby-rails/fini.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/finl.snippet b/bundle/snipmate-snippets/ruby-rails/finl.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/finl.snippet rename to bundle/snipmate-snippets/ruby-rails/finl.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/flash.snippet b/bundle/snipmate-snippets/ruby-rails/flash.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/flash.snippet rename to bundle/snipmate-snippets/ruby-rails/flash.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/habtm.snippet b/bundle/snipmate-snippets/ruby-rails/habtm.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/habtm.snippet rename to bundle/snipmate-snippets/ruby-rails/habtm.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/hm.snippet b/bundle/snipmate-snippets/ruby-rails/hm.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/hm.snippet rename to bundle/snipmate-snippets/ruby-rails/hm.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/hmd.snippet b/bundle/snipmate-snippets/ruby-rails/hmd.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/hmd.snippet rename to bundle/snipmate-snippets/ruby-rails/hmd.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/hmt.snippet b/bundle/snipmate-snippets/ruby-rails/hmt.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/hmt.snippet rename to bundle/snipmate-snippets/ruby-rails/hmt.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/ho.snippet b/bundle/snipmate-snippets/ruby-rails/ho.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/ho.snippet rename to bundle/snipmate-snippets/ruby-rails/ho.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/i18.snippet b/bundle/snipmate-snippets/ruby-rails/i18.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/i18.snippet rename to bundle/snipmate-snippets/ruby-rails/i18.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/ist.snippet b/bundle/snipmate-snippets/ruby-rails/ist.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/ist.snippet rename to bundle/snipmate-snippets/ruby-rails/ist.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/log.snippet b/bundle/snipmate-snippets/ruby-rails/log.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/log.snippet rename to bundle/snipmate-snippets/ruby-rails/log.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/logd.snippet b/bundle/snipmate-snippets/ruby-rails/logd.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/logd.snippet rename to bundle/snipmate-snippets/ruby-rails/logd.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/loge.snippet b/bundle/snipmate-snippets/ruby-rails/loge.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/loge.snippet rename to bundle/snipmate-snippets/ruby-rails/loge.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/logf.snippet b/bundle/snipmate-snippets/ruby-rails/logf.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/logf.snippet rename to bundle/snipmate-snippets/ruby-rails/logf.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/logi.snippet b/bundle/snipmate-snippets/ruby-rails/logi.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/logi.snippet rename to bundle/snipmate-snippets/ruby-rails/logi.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/logw.snippet b/bundle/snipmate-snippets/ruby-rails/logw.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/logw.snippet rename to bundle/snipmate-snippets/ruby-rails/logw.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/mac.snippet b/bundle/snipmate-snippets/ruby-rails/mac.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/mac.snippet rename to bundle/snipmate-snippets/ruby-rails/mac.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/mapc.snippet b/bundle/snipmate-snippets/ruby-rails/mapc.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/mapc.snippet rename to bundle/snipmate-snippets/ruby-rails/mapc.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/mapca.snippet b/bundle/snipmate-snippets/ruby-rails/mapca.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/mapca.snippet rename to bundle/snipmate-snippets/ruby-rails/mapca.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/mapr.snippet b/bundle/snipmate-snippets/ruby-rails/mapr.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/mapr.snippet rename to bundle/snipmate-snippets/ruby-rails/mapr.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/maprs.snippet b/bundle/snipmate-snippets/ruby-rails/maprs.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/maprs.snippet rename to bundle/snipmate-snippets/ruby-rails/maprs.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/mapwo.snippet b/bundle/snipmate-snippets/ruby-rails/mapwo.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/mapwo.snippet rename to bundle/snipmate-snippets/ruby-rails/mapwo.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/mbs.snippet b/bundle/snipmate-snippets/ruby-rails/mbs.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/mbs.snippet rename to bundle/snipmate-snippets/ruby-rails/mbs.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/mcc.snippet b/bundle/snipmate-snippets/ruby-rails/mcc.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/mcc.snippet rename to bundle/snipmate-snippets/ruby-rails/mcc.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/mccc.snippet b/bundle/snipmate-snippets/ruby-rails/mccc.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/mccc.snippet rename to bundle/snipmate-snippets/ruby-rails/mccc.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/mcht.snippet b/bundle/snipmate-snippets/ruby-rails/mcht.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/mcht.snippet rename to bundle/snipmate-snippets/ruby-rails/mcht.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/mcol.snippet b/bundle/snipmate-snippets/ruby-rails/mcol.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/mcol.snippet rename to bundle/snipmate-snippets/ruby-rails/mcol.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/mct.snippet b/bundle/snipmate-snippets/ruby-rails/mct.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/mct.snippet rename to bundle/snipmate-snippets/ruby-rails/mct.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/migration.snippet b/bundle/snipmate-snippets/ruby-rails/migration.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/migration.snippet rename to bundle/snipmate-snippets/ruby-rails/migration.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/mp.snippet b/bundle/snipmate-snippets/ruby-rails/mp.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/mp.snippet rename to bundle/snipmate-snippets/ruby-rails/mp.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/mrc.snippet b/bundle/snipmate-snippets/ruby-rails/mrc.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/mrc.snippet rename to bundle/snipmate-snippets/ruby-rails/mrc.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/mrmc.snippet b/bundle/snipmate-snippets/ruby-rails/mrmc.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/mrmc.snippet rename to bundle/snipmate-snippets/ruby-rails/mrmc.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/mrnc.snippet b/bundle/snipmate-snippets/ruby-rails/mrnc.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/mrnc.snippet rename to bundle/snipmate-snippets/ruby-rails/mrnc.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/mrw.snippet b/bundle/snipmate-snippets/ruby-rails/mrw.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/mrw.snippet rename to bundle/snipmate-snippets/ruby-rails/mrw.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/nc.snippet b/bundle/snipmate-snippets/ruby-rails/nc.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/nc.snippet rename to bundle/snipmate-snippets/ruby-rails/nc.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/ncl.snippet b/bundle/snipmate-snippets/ruby-rails/ncl.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/ncl.snippet rename to bundle/snipmate-snippets/ruby-rails/ncl.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/pa.snippet b/bundle/snipmate-snippets/ruby-rails/pa.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/pa.snippet rename to bundle/snipmate-snippets/ruby-rails/pa.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/ra.snippet b/bundle/snipmate-snippets/ruby-rails/ra.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/ra.snippet rename to bundle/snipmate-snippets/ruby-rails/ra.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/ral.snippet b/bundle/snipmate-snippets/ruby-rails/ral.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/ral.snippet rename to bundle/snipmate-snippets/ruby-rails/ral.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rest.snippet b/bundle/snipmate-snippets/ruby-rails/rest.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/rest.snippet rename to bundle/snipmate-snippets/ruby-rails/rest.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rf.snippet b/bundle/snipmate-snippets/ruby-rails/rf.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/rf.snippet rename to bundle/snipmate-snippets/ruby-rails/rf.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rfu.snippet b/bundle/snipmate-snippets/ruby-rails/rfu.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/rfu.snippet rename to bundle/snipmate-snippets/ruby-rails/rfu.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/ri.snippet b/bundle/snipmate-snippets/ruby-rails/ri.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/ri.snippet rename to bundle/snipmate-snippets/ruby-rails/ri.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/ril.snippet b/bundle/snipmate-snippets/ruby-rails/ril.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/ril.snippet rename to bundle/snipmate-snippets/ruby-rails/ril.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rit.snippet b/bundle/snipmate-snippets/ruby-rails/rit.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/rit.snippet rename to bundle/snipmate-snippets/ruby-rails/rit.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rjson.snippet b/bundle/snipmate-snippets/ruby-rails/rjson.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/rjson.snippet rename to bundle/snipmate-snippets/ruby-rails/rjson.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rl.snippet b/bundle/snipmate-snippets/ruby-rails/rl.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/rl.snippet rename to bundle/snipmate-snippets/ruby-rails/rl.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rn.snippet b/bundle/snipmate-snippets/ruby-rails/rn.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/rn.snippet rename to bundle/snipmate-snippets/ruby-rails/rn.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rns.snippet b/bundle/snipmate-snippets/ruby-rails/rns.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/rns.snippet rename to bundle/snipmate-snippets/ruby-rails/rns.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rp.snippet b/bundle/snipmate-snippets/ruby-rails/rp.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/rp.snippet rename to bundle/snipmate-snippets/ruby-rails/rp.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rpc.snippet b/bundle/snipmate-snippets/ruby-rails/rpc.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/rpc.snippet rename to bundle/snipmate-snippets/ruby-rails/rpc.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rpl.snippet b/bundle/snipmate-snippets/ruby-rails/rpl.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/rpl.snippet rename to bundle/snipmate-snippets/ruby-rails/rpl.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rpo.snippet b/bundle/snipmate-snippets/ruby-rails/rpo.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/rpo.snippet rename to bundle/snipmate-snippets/ruby-rails/rpo.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rps.snippet b/bundle/snipmate-snippets/ruby-rails/rps.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/rps.snippet rename to bundle/snipmate-snippets/ruby-rails/rps.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rt.snippet b/bundle/snipmate-snippets/ruby-rails/rt.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/rt.snippet rename to bundle/snipmate-snippets/ruby-rails/rt.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rtl.snippet b/bundle/snipmate-snippets/ruby-rails/rtl.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/rtl.snippet rename to bundle/snipmate-snippets/ruby-rails/rtl.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rtlt.snippet b/bundle/snipmate-snippets/ruby-rails/rtlt.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/rtlt.snippet rename to bundle/snipmate-snippets/ruby-rails/rtlt.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rts.snippet b/bundle/snipmate-snippets/ruby-rails/rts.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/rts.snippet rename to bundle/snipmate-snippets/ruby-rails/rts.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/ru.snippet b/bundle/snipmate-snippets/ruby-rails/ru.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/ru.snippet rename to bundle/snipmate-snippets/ruby-rails/ru.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/rxml.snippet b/bundle/snipmate-snippets/ruby-rails/rxml.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/rxml.snippet rename to bundle/snipmate-snippets/ruby-rails/rxml.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/sha1.snippet b/bundle/snipmate-snippets/ruby-rails/sha1.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/sha1.snippet rename to bundle/snipmate-snippets/ruby-rails/sha1.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/sweeper.snippet b/bundle/snipmate-snippets/ruby-rails/sweeper.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/sweeper.snippet rename to bundle/snipmate-snippets/ruby-rails/sweeper.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tcb.snippet b/bundle/snipmate-snippets/ruby-rails/tcb.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/tcb.snippet rename to bundle/snipmate-snippets/ruby-rails/tcb.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tcbi.snippet b/bundle/snipmate-snippets/ruby-rails/tcbi.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/tcbi.snippet rename to bundle/snipmate-snippets/ruby-rails/tcbi.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tcd.snippet b/bundle/snipmate-snippets/ruby-rails/tcd.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/tcd.snippet rename to bundle/snipmate-snippets/ruby-rails/tcd.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tcda.snippet b/bundle/snipmate-snippets/ruby-rails/tcda.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/tcda.snippet rename to bundle/snipmate-snippets/ruby-rails/tcda.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tcdt.snippet b/bundle/snipmate-snippets/ruby-rails/tcdt.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/tcdt.snippet rename to bundle/snipmate-snippets/ruby-rails/tcdt.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tcf.snippet b/bundle/snipmate-snippets/ruby-rails/tcf.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/tcf.snippet rename to bundle/snipmate-snippets/ruby-rails/tcf.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tch.snippet b/bundle/snipmate-snippets/ruby-rails/tch.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/tch.snippet rename to bundle/snipmate-snippets/ruby-rails/tch.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tci.snippet b/bundle/snipmate-snippets/ruby-rails/tci.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/tci.snippet rename to bundle/snipmate-snippets/ruby-rails/tci.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tcl.snippet b/bundle/snipmate-snippets/ruby-rails/tcl.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/tcl.snippet rename to bundle/snipmate-snippets/ruby-rails/tcl.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tcr.snippet b/bundle/snipmate-snippets/ruby-rails/tcr.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/tcr.snippet rename to bundle/snipmate-snippets/ruby-rails/tcr.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tcs.snippet b/bundle/snipmate-snippets/ruby-rails/tcs.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/tcs.snippet rename to bundle/snipmate-snippets/ruby-rails/tcs.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tct.snippet b/bundle/snipmate-snippets/ruby-rails/tct.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/tct.snippet rename to bundle/snipmate-snippets/ruby-rails/tct.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tcti.snippet b/bundle/snipmate-snippets/ruby-rails/tcti.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/tcti.snippet rename to bundle/snipmate-snippets/ruby-rails/tcti.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tcts.snippet b/bundle/snipmate-snippets/ruby-rails/tcts.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/tcts.snippet rename to bundle/snipmate-snippets/ruby-rails/tcts.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tctss.snippet b/bundle/snipmate-snippets/ruby-rails/tctss.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/tctss.snippet rename to bundle/snipmate-snippets/ruby-rails/tctss.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/trc.snippet b/bundle/snipmate-snippets/ruby-rails/trc.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/trc.snippet rename to bundle/snipmate-snippets/ruby-rails/trc.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tre.snippet b/bundle/snipmate-snippets/ruby-rails/tre.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/tre.snippet rename to bundle/snipmate-snippets/ruby-rails/tre.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/tref.snippet b/bundle/snipmate-snippets/ruby-rails/tref.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/tref.snippet rename to bundle/snipmate-snippets/ruby-rails/tref.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/va.snippet b/bundle/snipmate-snippets/ruby-rails/va.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/va.snippet rename to bundle/snipmate-snippets/ruby-rails/va.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/vao.snippet b/bundle/snipmate-snippets/ruby-rails/vao.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/vao.snippet rename to bundle/snipmate-snippets/ruby-rails/vao.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/vc.snippet b/bundle/snipmate-snippets/ruby-rails/vc.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/vc.snippet rename to bundle/snipmate-snippets/ruby-rails/vc.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/ve.snippet b/bundle/snipmate-snippets/ruby-rails/ve.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/ve.snippet rename to bundle/snipmate-snippets/ruby-rails/ve.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/vf.snippet b/bundle/snipmate-snippets/ruby-rails/vf.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/vf.snippet rename to bundle/snipmate-snippets/ruby-rails/vf.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/vi.snippet b/bundle/snipmate-snippets/ruby-rails/vi.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/vi.snippet rename to bundle/snipmate-snippets/ruby-rails/vi.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/vl.snippet b/bundle/snipmate-snippets/ruby-rails/vl.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/vl.snippet rename to bundle/snipmate-snippets/ruby-rails/vl.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/vn.snippet b/bundle/snipmate-snippets/ruby-rails/vn.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/vn.snippet rename to bundle/snipmate-snippets/ruby-rails/vn.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/vpo.snippet b/bundle/snipmate-snippets/ruby-rails/vpo.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/vpo.snippet rename to bundle/snipmate-snippets/ruby-rails/vpo.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/vu.snippet b/bundle/snipmate-snippets/ruby-rails/vu.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/vu.snippet rename to bundle/snipmate-snippets/ruby-rails/vu.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/wants.snippet b/bundle/snipmate-snippets/ruby-rails/wants.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/wants.snippet rename to bundle/snipmate-snippets/ruby-rails/wants.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/xdelete.snippet b/bundle/snipmate-snippets/ruby-rails/xdelete.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/xdelete.snippet rename to bundle/snipmate-snippets/ruby-rails/xdelete.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/xget.snippet b/bundle/snipmate-snippets/ruby-rails/xget.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/xget.snippet rename to bundle/snipmate-snippets/ruby-rails/xget.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/xpost.snippet b/bundle/snipmate-snippets/ruby-rails/xpost.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/xpost.snippet rename to bundle/snipmate-snippets/ruby-rails/xpost.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rails/xput.snippet b/bundle/snipmate-snippets/ruby-rails/xput.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rails/xput.snippet rename to bundle/snipmate-snippets/ruby-rails/xput.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/aft.snippet b/bundle/snipmate-snippets/ruby-rspec/aft.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/aft.snippet rename to bundle/snipmate-snippets/ruby-rspec/aft.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/annot.snippet b/bundle/snipmate-snippets/ruby-rspec/annot.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/annot.snippet rename to bundle/snipmate-snippets/ruby-rspec/annot.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/anr.snippet b/bundle/snipmate-snippets/ruby-rspec/anr.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/anr.snippet rename to bundle/snipmate-snippets/ruby-rspec/anr.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/anra.snippet b/bundle/snipmate-snippets/ruby-rspec/anra.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/anra.snippet rename to bundle/snipmate-snippets/ruby-rspec/anra.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/anrb.snippet b/bundle/snipmate-snippets/ruby-rspec/anrb.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/anrb.snippet rename to bundle/snipmate-snippets/ruby-rspec/anrb.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/ant.snippet b/bundle/snipmate-snippets/ruby-rspec/ant.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/ant.snippet rename to bundle/snipmate-snippets/ruby-rspec/ant.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/any.snippet b/bundle/snipmate-snippets/ruby-rspec/any.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/any.snippet rename to bundle/snipmate-snippets/ruby-rspec/any.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/atl.snippet b/bundle/snipmate-snippets/ruby-rspec/atl.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/atl.snippet rename to bundle/snipmate-snippets/ruby-rspec/atl.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/atm.snippet b/bundle/snipmate-snippets/ruby-rspec/atm.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/atm.snippet rename to bundle/snipmate-snippets/ruby-rspec/atm.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/bef.snippet b/bundle/snipmate-snippets/ruby-rspec/bef.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/bef.snippet rename to bundle/snipmate-snippets/ruby-rspec/bef.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/conn.snippet b/bundle/snipmate-snippets/ruby-rspec/conn.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/conn.snippet rename to bundle/snipmate-snippets/ruby-rspec/conn.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/des.snippet b/bundle/snipmate-snippets/ruby-rspec/des.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/des.snippet rename to bundle/snipmate-snippets/ruby-rspec/des.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/desc.snippet b/bundle/snipmate-snippets/ruby-rspec/desc.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/desc.snippet rename to bundle/snipmate-snippets/ruby-rspec/desc.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/desrc.snippet b/bundle/snipmate-snippets/ruby-rspec/desrc.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/desrc.snippet rename to bundle/snipmate-snippets/ruby-rspec/desrc.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/dest.snippet b/bundle/snipmate-snippets/ruby-rspec/dest.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/dest.snippet rename to bundle/snipmate-snippets/ruby-rspec/dest.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/dests.snippet b/bundle/snipmate-snippets/ruby-rspec/dests.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/dests.snippet rename to bundle/snipmate-snippets/ruby-rspec/dests.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/ex.snippet b/bundle/snipmate-snippets/ruby-rspec/ex.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/ex.snippet rename to bundle/snipmate-snippets/ruby-rspec/ex.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/isbl.snippet b/bundle/snipmate-snippets/ruby-rspec/isbl.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/isbl.snippet rename to bundle/snipmate-snippets/ruby-rspec/isbl.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/it.snippet b/bundle/snipmate-snippets/ruby-rspec/it.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/it.snippet rename to bundle/snipmate-snippets/ruby-rspec/it.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/its.snippet b/bundle/snipmate-snippets/ruby-rspec/its.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/its.snippet rename to bundle/snipmate-snippets/ruby-rspec/its.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/mat.snippet b/bundle/snipmate-snippets/ruby-rspec/mat.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/mat.snippet rename to bundle/snipmate-snippets/ruby-rspec/mat.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/mm.snippet b/bundle/snipmate-snippets/ruby-rspec/mm.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/mm.snippet rename to bundle/snipmate-snippets/ruby-rspec/mm.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/moc.snippet b/bundle/snipmate-snippets/ruby-rspec/moc.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/moc.snippet rename to bundle/snipmate-snippets/ruby-rspec/moc.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/mocw.snippet b/bundle/snipmate-snippets/ruby-rspec/mocw.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/mocw.snippet rename to bundle/snipmate-snippets/ruby-rspec/mocw.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/on.snippet b/bundle/snipmate-snippets/ruby-rspec/on.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/on.snippet rename to bundle/snipmate-snippets/ruby-rspec/on.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/resh.snippet b/bundle/snipmate-snippets/ruby-rspec/resh.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/resh.snippet rename to bundle/snipmate-snippets/ruby-rspec/resh.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/sef.snippet b/bundle/snipmate-snippets/ruby-rspec/sef.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/sef.snippet rename to bundle/snipmate-snippets/ruby-rspec/sef.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/sh.snippet b/bundle/snipmate-snippets/ruby-rspec/sh.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/sh.snippet rename to bundle/snipmate-snippets/ruby-rspec/sh.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shb.snippet b/bundle/snipmate-snippets/ruby-rspec/shb.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shb.snippet rename to bundle/snipmate-snippets/ruby-rspec/shb.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shbc.snippet b/bundle/snipmate-snippets/ruby-rspec/shbc.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shbc.snippet rename to bundle/snipmate-snippets/ruby-rspec/shbc.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shbio.snippet b/bundle/snipmate-snippets/ruby-rspec/shbio.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shbio.snippet rename to bundle/snipmate-snippets/ruby-rspec/shbio.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shbko.snippet b/bundle/snipmate-snippets/ruby-rspec/shbko.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shbko.snippet rename to bundle/snipmate-snippets/ruby-rspec/shbko.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shbr.snippet b/bundle/snipmate-snippets/ruby-rspec/shbr.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shbr.snippet rename to bundle/snipmate-snippets/ruby-rspec/shbr.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shbs.snippet b/bundle/snipmate-snippets/ruby-rspec/shbs.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shbs.snippet rename to bundle/snipmate-snippets/ruby-rspec/shbs.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shc.snippet b/bundle/snipmate-snippets/ruby-rspec/shc.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shc.snippet rename to bundle/snipmate-snippets/ruby-rspec/shc.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shdm.snippet b/bundle/snipmate-snippets/ruby-rspec/shdm.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shdm.snippet rename to bundle/snipmate-snippets/ruby-rspec/shdm.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/she.snippet b/bundle/snipmate-snippets/ruby-rspec/she.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/she.snippet rename to bundle/snipmate-snippets/ruby-rspec/she.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/sheq.snippet b/bundle/snipmate-snippets/ruby-rspec/sheq.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/sheq.snippet rename to bundle/snipmate-snippets/ruby-rspec/sheq.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shh.snippet b/bundle/snipmate-snippets/ruby-rspec/shh.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shh.snippet rename to bundle/snipmate-snippets/ruby-rspec/shh.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shhal.snippet b/bundle/snipmate-snippets/ruby-rspec/shhal.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shhal.snippet rename to bundle/snipmate-snippets/ruby-rspec/shhal.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shham.snippet b/bundle/snipmate-snippets/ruby-rspec/shham.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shham.snippet rename to bundle/snipmate-snippets/ruby-rspec/shham.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shhr.snippet b/bundle/snipmate-snippets/ruby-rspec/shhr.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shhr.snippet rename to bundle/snipmate-snippets/ruby-rspec/shhr.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shn.snippet b/bundle/snipmate-snippets/ruby-rspec/shn.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shn.snippet rename to bundle/snipmate-snippets/ruby-rspec/shn.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shnb.snippet b/bundle/snipmate-snippets/ruby-rspec/shnb.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shnb.snippet rename to bundle/snipmate-snippets/ruby-rspec/shnb.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shnbc.snippet b/bundle/snipmate-snippets/ruby-rspec/shnbc.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shnbc.snippet rename to bundle/snipmate-snippets/ruby-rspec/shnbc.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shnbio.snippet b/bundle/snipmate-snippets/ruby-rspec/shnbio.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shnbio.snippet rename to bundle/snipmate-snippets/ruby-rspec/shnbio.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shnbko.snippet b/bundle/snipmate-snippets/ruby-rspec/shnbko.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shnbko.snippet rename to bundle/snipmate-snippets/ruby-rspec/shnbko.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shnbr.snippet b/bundle/snipmate-snippets/ruby-rspec/shnbr.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shnbr.snippet rename to bundle/snipmate-snippets/ruby-rspec/shnbr.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shnbs.snippet b/bundle/snipmate-snippets/ruby-rspec/shnbs.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shnbs.snippet rename to bundle/snipmate-snippets/ruby-rspec/shnbs.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shnc.snippet b/bundle/snipmate-snippets/ruby-rspec/shnc.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shnc.snippet rename to bundle/snipmate-snippets/ruby-rspec/shnc.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shne.snippet b/bundle/snipmate-snippets/ruby-rspec/shne.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shne.snippet rename to bundle/snipmate-snippets/ruby-rspec/shne.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shneq.snippet b/bundle/snipmate-snippets/ruby-rspec/shneq.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shneq.snippet rename to bundle/snipmate-snippets/ruby-rspec/shneq.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shnm.snippet b/bundle/snipmate-snippets/ruby-rspec/shnm.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shnm.snippet rename to bundle/snipmate-snippets/ruby-rspec/shnm.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shnp.snippet b/bundle/snipmate-snippets/ruby-rspec/shnp.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shnp.snippet rename to bundle/snipmate-snippets/ruby-rspec/shnp.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shnr.snippet b/bundle/snipmate-snippets/ruby-rspec/shnr.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shnr.snippet rename to bundle/snipmate-snippets/ruby-rspec/shnr.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shnre.snippet b/bundle/snipmate-snippets/ruby-rspec/shnre.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shnre.snippet rename to bundle/snipmate-snippets/ruby-rspec/shnre.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shnredt.snippet b/bundle/snipmate-snippets/ruby-rspec/shnredt.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shnredt.snippet rename to bundle/snipmate-snippets/ruby-rspec/shnredt.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shnrt.snippet b/bundle/snipmate-snippets/ruby-rspec/shnrt.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shnrt.snippet rename to bundle/snipmate-snippets/ruby-rspec/shnrt.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shns.snippet b/bundle/snipmate-snippets/ruby-rspec/shns.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shns.snippet rename to bundle/snipmate-snippets/ruby-rspec/shns.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shnt.snippet b/bundle/snipmate-snippets/ruby-rspec/shnt.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shnt.snippet rename to bundle/snipmate-snippets/ruby-rspec/shnt.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shp.snippet b/bundle/snipmate-snippets/ruby-rspec/shp.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shp.snippet rename to bundle/snipmate-snippets/ruby-rspec/shp.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shr.snippet b/bundle/snipmate-snippets/ruby-rspec/shr.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shr.snippet rename to bundle/snipmate-snippets/ruby-rspec/shr.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shre.snippet b/bundle/snipmate-snippets/ruby-rspec/shre.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shre.snippet rename to bundle/snipmate-snippets/ruby-rspec/shre.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shredt.snippet b/bundle/snipmate-snippets/ruby-rspec/shredt.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shredt.snippet rename to bundle/snipmate-snippets/ruby-rspec/shredt.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shrt.snippet b/bundle/snipmate-snippets/ruby-rspec/shrt.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shrt.snippet rename to bundle/snipmate-snippets/ruby-rspec/shrt.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shs.snippet b/bundle/snipmate-snippets/ruby-rspec/shs.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shs.snippet rename to bundle/snipmate-snippets/ruby-rspec/shs.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/sht.snippet b/bundle/snipmate-snippets/ruby-rspec/sht.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/sht.snippet rename to bundle/snipmate-snippets/ruby-rspec/sht.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/shtemp.snippet b/bundle/snipmate-snippets/ruby-rspec/shtemp.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/shtemp.snippet rename to bundle/snipmate-snippets/ruby-rspec/shtemp.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/tw.snippet b/bundle/snipmate-snippets/ruby-rspec/tw.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/tw.snippet rename to bundle/snipmate-snippets/ruby-rspec/tw.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-rspec/wia.snippet b/bundle/snipmate-snippets/ruby-rspec/wia.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-rspec/wia.snippet rename to bundle/snipmate-snippets/ruby-rspec/wia.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/context.snippet b/bundle/snipmate-snippets/ruby-shoulda/context.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-shoulda/context.snippet rename to bundle/snipmate-snippets/ruby-shoulda/context.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/samao.snippet b/bundle/snipmate-snippets/ruby-shoulda/samao.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-shoulda/samao.snippet rename to bundle/snipmate-snippets/ruby-shoulda/samao.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/savf.snippet b/bundle/snipmate-snippets/ruby-shoulda/savf.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-shoulda/savf.snippet rename to bundle/snipmate-snippets/ruby-shoulda/savf.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/sbt.snippet b/bundle/snipmate-snippets/ruby-shoulda/sbt.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-shoulda/sbt.snippet rename to bundle/snipmate-snippets/ruby-shoulda/sbt.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/selal.snippet b/bundle/snipmate-snippets/ruby-shoulda/selal.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-shoulda/selal.snippet rename to bundle/snipmate-snippets/ruby-shoulda/selal.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/seli.snippet b/bundle/snipmate-snippets/ruby-shoulda/seli.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-shoulda/seli.snippet rename to bundle/snipmate-snippets/ruby-shoulda/seli.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/selir.snippet b/bundle/snipmate-snippets/ruby-shoulda/selir.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-shoulda/selir.snippet rename to bundle/snipmate-snippets/ruby-shoulda/selir.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/setup.snippet b/bundle/snipmate-snippets/ruby-shoulda/setup.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-shoulda/setup.snippet rename to bundle/snipmate-snippets/ruby-shoulda/setup.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/sevir.snippet b/bundle/snipmate-snippets/ruby-shoulda/sevir.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-shoulda/sevir.snippet rename to bundle/snipmate-snippets/ruby-shoulda/sevir.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/shabtm.snippet b/bundle/snipmate-snippets/ruby-shoulda/shabtm.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-shoulda/shabtm.snippet rename to bundle/snipmate-snippets/ruby-shoulda/shabtm.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/shcm.snippet b/bundle/snipmate-snippets/ruby-shoulda/shcm.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-shoulda/shcm.snippet rename to bundle/snipmate-snippets/ruby-shoulda/shcm.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/shdc.snippet b/bundle/snipmate-snippets/ruby-shoulda/shdc.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-shoulda/shdc.snippet rename to bundle/snipmate-snippets/ruby-shoulda/shdc.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/shi.snippet b/bundle/snipmate-snippets/ruby-shoulda/shi.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-shoulda/shi.snippet rename to bundle/snipmate-snippets/ruby-shoulda/shi.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/shim.snippet b/bundle/snipmate-snippets/ruby-shoulda/shim.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-shoulda/shim.snippet rename to bundle/snipmate-snippets/ruby-shoulda/shim.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/shm.snippet b/bundle/snipmate-snippets/ruby-shoulda/shm.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-shoulda/shm.snippet rename to bundle/snipmate-snippets/ruby-shoulda/shm.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/sho.snippet b/bundle/snipmate-snippets/ruby-shoulda/sho.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-shoulda/sho.snippet rename to bundle/snipmate-snippets/ruby-shoulda/sho.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/shroa.snippet b/bundle/snipmate-snippets/ruby-shoulda/shroa.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-shoulda/shroa.snippet rename to bundle/snipmate-snippets/ruby-shoulda/shroa.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/snamao.snippet b/bundle/snipmate-snippets/ruby-shoulda/snamao.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-shoulda/snamao.snippet rename to bundle/snipmate-snippets/ruby-shoulda/snamao.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/snavf.snippet b/bundle/snipmate-snippets/ruby-shoulda/snavf.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-shoulda/snavf.snippet rename to bundle/snipmate-snippets/ruby-shoulda/snavf.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/svao.snippet b/bundle/snipmate-snippets/ruby-shoulda/svao.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-shoulda/svao.snippet rename to bundle/snipmate-snippets/ruby-shoulda/svao.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/svno.snippet b/bundle/snipmate-snippets/ruby-shoulda/svno.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-shoulda/svno.snippet rename to bundle/snipmate-snippets/ruby-shoulda/svno.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/svpo.snippet b/bundle/snipmate-snippets/ruby-shoulda/svpo.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-shoulda/svpo.snippet rename to bundle/snipmate-snippets/ruby-shoulda/svpo.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby-shoulda/svuo.snippet b/bundle/snipmate-snippets/ruby-shoulda/svuo.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby-shoulda/svuo.snippet rename to bundle/snipmate-snippets/ruby-shoulda/svuo.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/Md.snippet b/bundle/snipmate-snippets/ruby/Md.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/Md.snippet rename to bundle/snipmate-snippets/ruby/Md.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/Ml.snippet b/bundle/snipmate-snippets/ruby/Ml.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/Ml.snippet rename to bundle/snipmate-snippets/ruby/Ml.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/Pn.snippet b/bundle/snipmate-snippets/ruby/Pn.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/Pn.snippet rename to bundle/snipmate-snippets/ruby/Pn.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/Yd.snippet b/bundle/snipmate-snippets/ruby/Yd.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/Yd.snippet rename to bundle/snipmate-snippets/ruby/Yd.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/Yl.snippet b/bundle/snipmate-snippets/ruby/Yl.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/Yl.snippet rename to bundle/snipmate-snippets/ruby/Yl.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/am.snippet b/bundle/snipmate-snippets/ruby/am.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/am.snippet rename to bundle/snipmate-snippets/ruby/am.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/as.snippet b/bundle/snipmate-snippets/ruby/as.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/as.snippet rename to bundle/snipmate-snippets/ruby/as.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asam.snippet b/bundle/snipmate-snippets/ruby/asam.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asam.snippet rename to bundle/snipmate-snippets/ruby/asam.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asb.snippet b/bundle/snipmate-snippets/ruby/asb.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asb.snippet rename to bundle/snipmate-snippets/ruby/asb.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asc.snippet b/bundle/snipmate-snippets/ruby/asc.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asc.snippet rename to bundle/snipmate-snippets/ruby/asc.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/ascd.snippet b/bundle/snipmate-snippets/ruby/ascd.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/ascd.snippet rename to bundle/snipmate-snippets/ruby/ascd.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/ase.snippet b/bundle/snipmate-snippets/ruby/ase.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/ase.snippet rename to bundle/snipmate-snippets/ruby/ase.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asem.snippet b/bundle/snipmate-snippets/ruby/asem.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asem.snippet rename to bundle/snipmate-snippets/ruby/asem.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asf.snippet b/bundle/snipmate-snippets/ruby/asf.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asf.snippet rename to bundle/snipmate-snippets/ruby/asf.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asfa.snippet b/bundle/snipmate-snippets/ruby/asfa.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asfa.snippet rename to bundle/snipmate-snippets/ruby/asfa.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asi.snippet b/bundle/snipmate-snippets/ruby/asi.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asi.snippet rename to bundle/snipmate-snippets/ruby/asi.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asid.snippet b/bundle/snipmate-snippets/ruby/asid.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asid.snippet rename to bundle/snipmate-snippets/ruby/asid.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asie.snippet b/bundle/snipmate-snippets/ruby/asie.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asie.snippet rename to bundle/snipmate-snippets/ruby/asie.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asio.snippet b/bundle/snipmate-snippets/ruby/asio.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asio.snippet rename to bundle/snipmate-snippets/ruby/asio.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asko.snippet b/bundle/snipmate-snippets/ruby/asko.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asko.snippet rename to bundle/snipmate-snippets/ruby/asko.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asm.snippet b/bundle/snipmate-snippets/ruby/asm.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asm.snippet rename to bundle/snipmate-snippets/ruby/asm.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asn.snippet b/bundle/snipmate-snippets/ruby/asn.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asn.snippet rename to bundle/snipmate-snippets/ruby/asn.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asncd.snippet b/bundle/snipmate-snippets/ruby/asncd.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asncd.snippet rename to bundle/snipmate-snippets/ruby/asncd.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asne.snippet b/bundle/snipmate-snippets/ruby/asne.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asne.snippet rename to bundle/snipmate-snippets/ruby/asne.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asnem.snippet b/bundle/snipmate-snippets/ruby/asnem.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asnem.snippet rename to bundle/snipmate-snippets/ruby/asnem.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asni.snippet b/bundle/snipmate-snippets/ruby/asni.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asni.snippet rename to bundle/snipmate-snippets/ruby/asni.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asnid.snippet b/bundle/snipmate-snippets/ruby/asnid.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asnid.snippet rename to bundle/snipmate-snippets/ruby/asnid.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asnie.snippet b/bundle/snipmate-snippets/ruby/asnie.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asnie.snippet rename to bundle/snipmate-snippets/ruby/asnie.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asnm.snippet b/bundle/snipmate-snippets/ruby/asnm.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asnm.snippet rename to bundle/snipmate-snippets/ruby/asnm.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asnn.snippet b/bundle/snipmate-snippets/ruby/asnn.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asnn.snippet rename to bundle/snipmate-snippets/ruby/asnn.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asnp.snippet b/bundle/snipmate-snippets/ruby/asnp.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asnp.snippet rename to bundle/snipmate-snippets/ruby/asnp.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asnr.snippet b/bundle/snipmate-snippets/ruby/asnr.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asnr.snippet rename to bundle/snipmate-snippets/ruby/asnr.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asnrt.snippet b/bundle/snipmate-snippets/ruby/asnrt.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asnrt.snippet rename to bundle/snipmate-snippets/ruby/asnrt.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asns.snippet b/bundle/snipmate-snippets/ruby/asns.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asns.snippet rename to bundle/snipmate-snippets/ruby/asns.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asnse.snippet b/bundle/snipmate-snippets/ruby/asnse.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asnse.snippet rename to bundle/snipmate-snippets/ruby/asnse.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asnt.snippet b/bundle/snipmate-snippets/ruby/asnt.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asnt.snippet rename to bundle/snipmate-snippets/ruby/asnt.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/aso.snippet b/bundle/snipmate-snippets/ruby/aso.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/aso.snippet rename to bundle/snipmate-snippets/ruby/aso.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asp.snippet b/bundle/snipmate-snippets/ruby/asp.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asp.snippet rename to bundle/snipmate-snippets/ruby/asp.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/aspe.snippet b/bundle/snipmate-snippets/ruby/aspe.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/aspe.snippet rename to bundle/snipmate-snippets/ruby/aspe.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/aspne.snippet b/bundle/snipmate-snippets/ruby/aspne.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/aspne.snippet rename to bundle/snipmate-snippets/ruby/aspne.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asr.snippet b/bundle/snipmate-snippets/ruby/asr.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asr.snippet rename to bundle/snipmate-snippets/ruby/asr.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asrko.snippet b/bundle/snipmate-snippets/ruby/asrko.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asrko.snippet rename to bundle/snipmate-snippets/ruby/asrko.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asrm.snippet b/bundle/snipmate-snippets/ruby/asrm.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asrm.snippet rename to bundle/snipmate-snippets/ruby/asrm.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asrt.snippet b/bundle/snipmate-snippets/ruby/asrt.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asrt.snippet rename to bundle/snipmate-snippets/ruby/asrt.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/asse.snippet b/bundle/snipmate-snippets/ruby/asse.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/asse.snippet rename to bundle/snipmate-snippets/ruby/asse.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/ast.snippet b/bundle/snipmate-snippets/ruby/ast.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/ast.snippet rename to bundle/snipmate-snippets/ruby/ast.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/astr.snippet b/bundle/snipmate-snippets/ruby/astr.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/astr.snippet rename to bundle/snipmate-snippets/ruby/astr.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/bm.snippet b/bundle/snipmate-snippets/ruby/bm.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/bm.snippet rename to bundle/snipmate-snippets/ruby/bm.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/case.snippet b/bundle/snipmate-snippets/ruby/case.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/case.snippet rename to bundle/snipmate-snippets/ruby/case.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/class.snippet b/bundle/snipmate-snippets/ruby/class.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/class.snippet rename to bundle/snipmate-snippets/ruby/class.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/classe.snippet b/bundle/snipmate-snippets/ruby/classe.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/classe.snippet rename to bundle/snipmate-snippets/ruby/classe.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/def.snippet b/bundle/snipmate-snippets/ruby/def.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/def.snippet rename to bundle/snipmate-snippets/ruby/def.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/defi.snippet b/bundle/snipmate-snippets/ruby/defi.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/defi.snippet rename to bundle/snipmate-snippets/ruby/defi.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/defmm.snippet b/bundle/snipmate-snippets/ruby/defmm.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/defmm.snippet rename to bundle/snipmate-snippets/ruby/defmm.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/defs.snippet b/bundle/snipmate-snippets/ruby/defs.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/defs.snippet rename to bundle/snipmate-snippets/ruby/defs.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/deft.snippet b/bundle/snipmate-snippets/ruby/deft.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/deft.snippet rename to bundle/snipmate-snippets/ruby/deft.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/detect.snippet b/bundle/snipmate-snippets/ruby/detect.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/detect.snippet rename to bundle/snipmate-snippets/ruby/detect.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/detecto.snippet b/bundle/snipmate-snippets/ruby/detecto.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/detecto.snippet rename to bundle/snipmate-snippets/ruby/detecto.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/dglob.snippet b/bundle/snipmate-snippets/ruby/dglob.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/dglob.snippet rename to bundle/snipmate-snippets/ruby/dglob.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/do.snippet b/bundle/snipmate-snippets/ruby/do.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/do.snippet rename to bundle/snipmate-snippets/ruby/do.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/dop.snippet b/bundle/snipmate-snippets/ruby/dop.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/dop.snippet rename to bundle/snipmate-snippets/ruby/dop.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/ea.snippet b/bundle/snipmate-snippets/ruby/ea.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/ea.snippet rename to bundle/snipmate-snippets/ruby/ea.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/each.snippet b/bundle/snipmate-snippets/ruby/each.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/each.snippet rename to bundle/snipmate-snippets/ruby/each.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/each_with_index.snippet b/bundle/snipmate-snippets/ruby/each_with_index.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/each_with_index.snippet rename to bundle/snipmate-snippets/ruby/each_with_index.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/each_with_indexo.snippet b/bundle/snipmate-snippets/ruby/each_with_indexo.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/each_with_indexo.snippet rename to bundle/snipmate-snippets/ruby/each_with_indexo.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/eacho.snippet b/bundle/snipmate-snippets/ruby/eacho.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/eacho.snippet rename to bundle/snipmate-snippets/ruby/eacho.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/eado.snippet b/bundle/snipmate-snippets/ruby/eado.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/eado.snippet rename to bundle/snipmate-snippets/ruby/eado.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/eawi.snippet b/bundle/snipmate-snippets/ruby/eawi.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/eawi.snippet rename to bundle/snipmate-snippets/ruby/eawi.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/eawido.snippet b/bundle/snipmate-snippets/ruby/eawido.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/eawido.snippet rename to bundle/snipmate-snippets/ruby/eawido.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/elsif.snippet b/bundle/snipmate-snippets/ruby/elsif.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/elsif.snippet rename to bundle/snipmate-snippets/ruby/elsif.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/fileeach.snippet b/bundle/snipmate-snippets/ruby/fileeach.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/fileeach.snippet rename to bundle/snipmate-snippets/ruby/fileeach.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/fopen.snippet b/bundle/snipmate-snippets/ruby/fopen.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/fopen.snippet rename to bundle/snipmate-snippets/ruby/fopen.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/fread.snippet b/bundle/snipmate-snippets/ruby/fread.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/fread.snippet rename to bundle/snipmate-snippets/ruby/fread.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/http_get.snippet b/bundle/snipmate-snippets/ruby/http_get.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/http_get.snippet rename to bundle/snipmate-snippets/ruby/http_get.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/http_post.snippet b/bundle/snipmate-snippets/ruby/http_post.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/http_post.snippet rename to bundle/snipmate-snippets/ruby/http_post.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/if.snippet b/bundle/snipmate-snippets/ruby/if.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/if.snippet rename to bundle/snipmate-snippets/ruby/if.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/ife.snippet b/bundle/snipmate-snippets/ruby/ife.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/ife.snippet rename to bundle/snipmate-snippets/ruby/ife.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/inj.snippet b/bundle/snipmate-snippets/ruby/inj.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/inj.snippet rename to bundle/snipmate-snippets/ruby/inj.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/injdo.snippet b/bundle/snipmate-snippets/ruby/injdo.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/injdo.snippet rename to bundle/snipmate-snippets/ruby/injdo.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/inject.snippet b/bundle/snipmate-snippets/ruby/inject.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/inject.snippet rename to bundle/snipmate-snippets/ruby/inject.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/injecto.snippet b/bundle/snipmate-snippets/ruby/injecto.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/injecto.snippet rename to bundle/snipmate-snippets/ruby/injecto.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/ip.snippet b/bundle/snipmate-snippets/ruby/ip.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/ip.snippet rename to bundle/snipmate-snippets/ruby/ip.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/map.snippet b/bundle/snipmate-snippets/ruby/map.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/map.snippet rename to bundle/snipmate-snippets/ruby/map.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/mapdo.snippet b/bundle/snipmate-snippets/ruby/mapdo.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/mapdo.snippet rename to bundle/snipmate-snippets/ruby/mapdo.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/mapo.snippet b/bundle/snipmate-snippets/ruby/mapo.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/mapo.snippet rename to bundle/snipmate-snippets/ruby/mapo.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/mod.snippet b/bundle/snipmate-snippets/ruby/mod.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/mod.snippet rename to bundle/snipmate-snippets/ruby/mod.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/module.snippet b/bundle/snipmate-snippets/ruby/module.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/module.snippet rename to bundle/snipmate-snippets/ruby/module.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/nam.snippet b/bundle/snipmate-snippets/ruby/nam.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/nam.snippet rename to bundle/snipmate-snippets/ruby/nam.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/ope.snippet b/bundle/snipmate-snippets/ruby/ope.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/ope.snippet rename to bundle/snipmate-snippets/ruby/ope.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/pathhere.snippet b/bundle/snipmate-snippets/ruby/pathhere.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/pathhere.snippet rename to bundle/snipmate-snippets/ruby/pathhere.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/r.snippet b/bundle/snipmate-snippets/ruby/r.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/r.snippet rename to bundle/snipmate-snippets/ruby/r.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/reject.snippet b/bundle/snipmate-snippets/ruby/reject.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/reject.snippet rename to bundle/snipmate-snippets/ruby/reject.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/rejecto.snippet b/bundle/snipmate-snippets/ruby/rejecto.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/rejecto.snippet rename to bundle/snipmate-snippets/ruby/rejecto.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/rep.snippet b/bundle/snipmate-snippets/ruby/rep.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/rep.snippet rename to bundle/snipmate-snippets/ruby/rep.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/rw.snippet b/bundle/snipmate-snippets/ruby/rw.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/rw.snippet rename to bundle/snipmate-snippets/ruby/rw.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/select.snippet b/bundle/snipmate-snippets/ruby/select.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/select.snippet rename to bundle/snipmate-snippets/ruby/select.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/selecto.snippet b/bundle/snipmate-snippets/ruby/selecto.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/selecto.snippet rename to bundle/snipmate-snippets/ruby/selecto.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/sinc.snippet b/bundle/snipmate-snippets/ruby/sinc.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/sinc.snippet rename to bundle/snipmate-snippets/ruby/sinc.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/sort.snippet b/bundle/snipmate-snippets/ruby/sort.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/sort.snippet rename to bundle/snipmate-snippets/ruby/sort.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/sorto.snippet b/bundle/snipmate-snippets/ruby/sorto.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/sorto.snippet rename to bundle/snipmate-snippets/ruby/sorto.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/tas.snippet b/bundle/snipmate-snippets/ruby/tas.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/tas.snippet rename to bundle/snipmate-snippets/ruby/tas.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/task.snippet b/bundle/snipmate-snippets/ruby/task.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/task.snippet rename to bundle/snipmate-snippets/ruby/task.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/tc.snippet b/bundle/snipmate-snippets/ruby/tc.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/tc.snippet rename to bundle/snipmate-snippets/ruby/tc.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/unless.snippet b/bundle/snipmate-snippets/ruby/unless.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/unless.snippet rename to bundle/snipmate-snippets/ruby/unless.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/unlesse.snippet b/bundle/snipmate-snippets/ruby/unlesse.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/unlesse.snippet rename to bundle/snipmate-snippets/ruby/unlesse.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/w.snippet b/bundle/snipmate-snippets/ruby/w.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/w.snippet rename to bundle/snipmate-snippets/ruby/w.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/while.snippet b/bundle/snipmate-snippets/ruby/while.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/while.snippet rename to bundle/snipmate-snippets/ruby/while.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/xmlr.snippet b/bundle/snipmate-snippets/ruby/xmlr.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/xmlr.snippet rename to bundle/snipmate-snippets/ruby/xmlr.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/xpa.snippet b/bundle/snipmate-snippets/ruby/xpa.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/xpa.snippet rename to bundle/snipmate-snippets/ruby/xpa.snippet diff --git a/sources_non_forked/snipmate-snippets/ruby/zip.snippet b/bundle/snipmate-snippets/ruby/zip.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/ruby/zip.snippet rename to bundle/snipmate-snippets/ruby/zip.snippet diff --git a/sources_non_forked/snipmate-snippets/sinatra/get.snippet b/bundle/snipmate-snippets/sinatra/get.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/sinatra/get.snippet rename to bundle/snipmate-snippets/sinatra/get.snippet diff --git a/sources_non_forked/snipmate-snippets/sshconfig/host.snippet b/bundle/snipmate-snippets/sshconfig/host.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/sshconfig/host.snippet rename to bundle/snipmate-snippets/sshconfig/host.snippet diff --git a/sources_non_forked/snipmate-snippets/support_functions.vim b/bundle/snipmate-snippets/support_functions.vim similarity index 100% rename from sources_non_forked/snipmate-snippets/support_functions.vim rename to bundle/snipmate-snippets/support_functions.vim diff --git a/sources_non_forked/snipmate-snippets/vim/au.snippet b/bundle/snipmate-snippets/vim/au.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/vim/au.snippet rename to bundle/snipmate-snippets/vim/au.snippet diff --git a/sources_non_forked/snipmate-snippets/vim/com.snippet b/bundle/snipmate-snippets/vim/com.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/vim/com.snippet rename to bundle/snipmate-snippets/vim/com.snippet diff --git a/sources_non_forked/snipmate-snippets/vim/func.snippet b/bundle/snipmate-snippets/vim/func.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/vim/func.snippet rename to bundle/snipmate-snippets/vim/func.snippet diff --git a/sources_non_forked/snipmate-snippets/vim/if.snippet b/bundle/snipmate-snippets/vim/if.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/vim/if.snippet rename to bundle/snipmate-snippets/vim/if.snippet diff --git a/sources_non_forked/snipmate-snippets/vim/ife.snippet b/bundle/snipmate-snippets/vim/ife.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/vim/ife.snippet rename to bundle/snipmate-snippets/vim/ife.snippet diff --git a/sources_non_forked/snipmate-snippets/vim/log.snippet b/bundle/snipmate-snippets/vim/log.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/vim/log.snippet rename to bundle/snipmate-snippets/vim/log.snippet diff --git a/sources_non_forked/snipmate-snippets/vim/try.snippet b/bundle/snipmate-snippets/vim/try.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/vim/try.snippet rename to bundle/snipmate-snippets/vim/try.snippet diff --git a/sources_non_forked/snipmate-snippets/xslt/call.snippet b/bundle/snipmate-snippets/xslt/call.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/xslt/call.snippet rename to bundle/snipmate-snippets/xslt/call.snippet diff --git a/sources_non_forked/snipmate-snippets/xslt/choose.snippet b/bundle/snipmate-snippets/xslt/choose.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/xslt/choose.snippet rename to bundle/snipmate-snippets/xslt/choose.snippet diff --git a/sources_non_forked/snipmate-snippets/xslt/mat.snippet b/bundle/snipmate-snippets/xslt/mat.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/xslt/mat.snippet rename to bundle/snipmate-snippets/xslt/mat.snippet diff --git a/sources_non_forked/snipmate-snippets/xslt/out.snippet b/bundle/snipmate-snippets/xslt/out.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/xslt/out.snippet rename to bundle/snipmate-snippets/xslt/out.snippet diff --git a/sources_non_forked/snipmate-snippets/xslt/param.snippet b/bundle/snipmate-snippets/xslt/param.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/xslt/param.snippet rename to bundle/snipmate-snippets/xslt/param.snippet diff --git a/sources_non_forked/snipmate-snippets/xslt/sty.snippet b/bundle/snipmate-snippets/xslt/sty.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/xslt/sty.snippet rename to bundle/snipmate-snippets/xslt/sty.snippet diff --git a/sources_non_forked/snipmate-snippets/xslt/tem.snippet b/bundle/snipmate-snippets/xslt/tem.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/xslt/tem.snippet rename to bundle/snipmate-snippets/xslt/tem.snippet diff --git a/sources_non_forked/snipmate-snippets/xslt/value.snippet b/bundle/snipmate-snippets/xslt/value.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/xslt/value.snippet rename to bundle/snipmate-snippets/xslt/value.snippet diff --git a/sources_non_forked/snipmate-snippets/xslt/var.snippet b/bundle/snipmate-snippets/xslt/var.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/xslt/var.snippet rename to bundle/snipmate-snippets/xslt/var.snippet diff --git a/sources_non_forked/snipmate-snippets/xslt/wparam.snippet b/bundle/snipmate-snippets/xslt/wparam.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/xslt/wparam.snippet rename to bundle/snipmate-snippets/xslt/wparam.snippet diff --git a/sources_non_forked/snipmate-snippets/xslt/xdec.snippet b/bundle/snipmate-snippets/xslt/xdec.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/xslt/xdec.snippet rename to bundle/snipmate-snippets/xslt/xdec.snippet diff --git a/sources_non_forked/snipmate-snippets/zend/assert.snippet b/bundle/snipmate-snippets/zend/assert.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/zend/assert.snippet rename to bundle/snipmate-snippets/zend/assert.snippet diff --git a/sources_non_forked/snipmate-snippets/zend/boolcol.snippet b/bundle/snipmate-snippets/zend/boolcol.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/zend/boolcol.snippet rename to bundle/snipmate-snippets/zend/boolcol.snippet diff --git a/sources_non_forked/snipmate-snippets/zend/clac.snippet b/bundle/snipmate-snippets/zend/clac.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/zend/clac.snippet rename to bundle/snipmate-snippets/zend/clac.snippet diff --git a/sources_non_forked/snipmate-snippets/zend/flash.snippet b/bundle/snipmate-snippets/zend/flash.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/zend/flash.snippet rename to bundle/snipmate-snippets/zend/flash.snippet diff --git a/sources_non_forked/snipmate-snippets/zend/getconf.snippet b/bundle/snipmate-snippets/zend/getconf.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/zend/getconf.snippet rename to bundle/snipmate-snippets/zend/getconf.snippet diff --git a/sources_non_forked/snipmate-snippets/zend/input.snippet b/bundle/snipmate-snippets/zend/input.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/zend/input.snippet rename to bundle/snipmate-snippets/zend/input.snippet diff --git a/sources_non_forked/snipmate-snippets/zend/inputarr.snippet b/bundle/snipmate-snippets/zend/inputarr.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/zend/inputarr.snippet rename to bundle/snipmate-snippets/zend/inputarr.snippet diff --git a/sources_non_forked/snipmate-snippets/zend/intcol.snippet b/bundle/snipmate-snippets/zend/intcol.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/zend/intcol.snippet rename to bundle/snipmate-snippets/zend/intcol.snippet diff --git a/sources_non_forked/snipmate-snippets/zend/lib.snippet b/bundle/snipmate-snippets/zend/lib.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/zend/lib.snippet rename to bundle/snipmate-snippets/zend/lib.snippet diff --git a/sources_non_forked/snipmate-snippets/zend/model.snippet b/bundle/snipmate-snippets/zend/model.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/zend/model.snippet rename to bundle/snipmate-snippets/zend/model.snippet diff --git a/sources_non_forked/snipmate-snippets/zend/navi.snippet b/bundle/snipmate-snippets/zend/navi.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/zend/navi.snippet rename to bundle/snipmate-snippets/zend/navi.snippet diff --git a/sources_non_forked/snipmate-snippets/zend/route.snippet b/bundle/snipmate-snippets/zend/route.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/zend/route.snippet rename to bundle/snipmate-snippets/zend/route.snippet diff --git a/sources_non_forked/snipmate-snippets/zend/rp.snippet b/bundle/snipmate-snippets/zend/rp.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/zend/rp.snippet rename to bundle/snipmate-snippets/zend/rp.snippet diff --git a/sources_non_forked/snipmate-snippets/zend/strcol.snippet b/bundle/snipmate-snippets/zend/strcol.snippet similarity index 100% rename from sources_non_forked/snipmate-snippets/zend/strcol.snippet rename to bundle/snipmate-snippets/zend/strcol.snippet diff --git a/sources_non_forked/syntastic/.gitignore b/bundle/syntastic/.gitignore similarity index 100% rename from sources_non_forked/syntastic/.gitignore rename to bundle/syntastic/.gitignore diff --git a/sources_non_forked/syntastic/CONTRIBUTING.md b/bundle/syntastic/CONTRIBUTING.md similarity index 100% rename from sources_non_forked/syntastic/CONTRIBUTING.md rename to bundle/syntastic/CONTRIBUTING.md diff --git a/sources_non_forked/syntastic/LICENCE b/bundle/syntastic/LICENCE similarity index 100% rename from sources_non_forked/syntastic/LICENCE rename to bundle/syntastic/LICENCE diff --git a/sources_non_forked/syntastic/README.markdown b/bundle/syntastic/README.markdown similarity index 100% rename from sources_non_forked/syntastic/README.markdown rename to bundle/syntastic/README.markdown diff --git a/sources_non_forked/syntastic/_assets/screenshot_1.png b/bundle/syntastic/_assets/screenshot_1.png similarity index 100% rename from sources_non_forked/syntastic/_assets/screenshot_1.png rename to bundle/syntastic/_assets/screenshot_1.png diff --git a/sources_non_forked/syntastic/autoload/syntastic/c.vim b/bundle/syntastic/autoload/syntastic/c.vim similarity index 100% rename from sources_non_forked/syntastic/autoload/syntastic/c.vim rename to bundle/syntastic/autoload/syntastic/c.vim diff --git a/sources_non_forked/syntastic/autoload/syntastic/log.vim b/bundle/syntastic/autoload/syntastic/log.vim similarity index 100% rename from sources_non_forked/syntastic/autoload/syntastic/log.vim rename to bundle/syntastic/autoload/syntastic/log.vim diff --git a/sources_non_forked/syntastic/autoload/syntastic/postprocess.vim b/bundle/syntastic/autoload/syntastic/postprocess.vim similarity index 100% rename from sources_non_forked/syntastic/autoload/syntastic/postprocess.vim rename to bundle/syntastic/autoload/syntastic/postprocess.vim diff --git a/sources_non_forked/syntastic/autoload/syntastic/preprocess.vim b/bundle/syntastic/autoload/syntastic/preprocess.vim similarity index 100% rename from sources_non_forked/syntastic/autoload/syntastic/preprocess.vim rename to bundle/syntastic/autoload/syntastic/preprocess.vim diff --git a/sources_non_forked/syntastic/autoload/syntastic/util.vim b/bundle/syntastic/autoload/syntastic/util.vim similarity index 100% rename from sources_non_forked/syntastic/autoload/syntastic/util.vim rename to bundle/syntastic/autoload/syntastic/util.vim diff --git a/sources_non_forked/syntastic/doc/syntastic.txt b/bundle/syntastic/doc/syntastic.txt similarity index 100% rename from sources_non_forked/syntastic/doc/syntastic.txt rename to bundle/syntastic/doc/syntastic.txt diff --git a/sources_non_forked/syntastic/plugin/syntastic.vim b/bundle/syntastic/plugin/syntastic.vim similarity index 100% rename from sources_non_forked/syntastic/plugin/syntastic.vim rename to bundle/syntastic/plugin/syntastic.vim diff --git a/sources_non_forked/syntastic/plugin/syntastic/autoloclist.vim b/bundle/syntastic/plugin/syntastic/autoloclist.vim similarity index 100% rename from sources_non_forked/syntastic/plugin/syntastic/autoloclist.vim rename to bundle/syntastic/plugin/syntastic/autoloclist.vim diff --git a/sources_non_forked/syntastic/plugin/syntastic/balloons.vim b/bundle/syntastic/plugin/syntastic/balloons.vim similarity index 100% rename from sources_non_forked/syntastic/plugin/syntastic/balloons.vim rename to bundle/syntastic/plugin/syntastic/balloons.vim diff --git a/sources_non_forked/syntastic/plugin/syntastic/checker.vim b/bundle/syntastic/plugin/syntastic/checker.vim similarity index 100% rename from sources_non_forked/syntastic/plugin/syntastic/checker.vim rename to bundle/syntastic/plugin/syntastic/checker.vim diff --git a/sources_non_forked/syntastic/plugin/syntastic/cursor.vim b/bundle/syntastic/plugin/syntastic/cursor.vim similarity index 100% rename from sources_non_forked/syntastic/plugin/syntastic/cursor.vim rename to bundle/syntastic/plugin/syntastic/cursor.vim diff --git a/sources_non_forked/syntastic/plugin/syntastic/highlighting.vim b/bundle/syntastic/plugin/syntastic/highlighting.vim similarity index 100% rename from sources_non_forked/syntastic/plugin/syntastic/highlighting.vim rename to bundle/syntastic/plugin/syntastic/highlighting.vim diff --git a/sources_non_forked/syntastic/plugin/syntastic/loclist.vim b/bundle/syntastic/plugin/syntastic/loclist.vim similarity index 100% rename from sources_non_forked/syntastic/plugin/syntastic/loclist.vim rename to bundle/syntastic/plugin/syntastic/loclist.vim diff --git a/sources_non_forked/syntastic/plugin/syntastic/modemap.vim b/bundle/syntastic/plugin/syntastic/modemap.vim similarity index 100% rename from sources_non_forked/syntastic/plugin/syntastic/modemap.vim rename to bundle/syntastic/plugin/syntastic/modemap.vim diff --git a/sources_non_forked/syntastic/plugin/syntastic/notifiers.vim b/bundle/syntastic/plugin/syntastic/notifiers.vim similarity index 100% rename from sources_non_forked/syntastic/plugin/syntastic/notifiers.vim rename to bundle/syntastic/plugin/syntastic/notifiers.vim diff --git a/sources_non_forked/syntastic/plugin/syntastic/registry.vim b/bundle/syntastic/plugin/syntastic/registry.vim similarity index 100% rename from sources_non_forked/syntastic/plugin/syntastic/registry.vim rename to bundle/syntastic/plugin/syntastic/registry.vim diff --git a/sources_non_forked/syntastic/plugin/syntastic/signs.vim b/bundle/syntastic/plugin/syntastic/signs.vim similarity index 100% rename from sources_non_forked/syntastic/plugin/syntastic/signs.vim rename to bundle/syntastic/plugin/syntastic/signs.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/actionscript/mxmlc.vim b/bundle/syntastic/syntax_checkers/actionscript/mxmlc.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/actionscript/mxmlc.vim rename to bundle/syntastic/syntax_checkers/actionscript/mxmlc.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/ada/gcc.vim b/bundle/syntastic/syntax_checkers/ada/gcc.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/ada/gcc.vim rename to bundle/syntastic/syntax_checkers/ada/gcc.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/applescript/osacompile.vim b/bundle/syntastic/syntax_checkers/applescript/osacompile.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/applescript/osacompile.vim rename to bundle/syntastic/syntax_checkers/applescript/osacompile.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/asciidoc/asciidoc.vim b/bundle/syntastic/syntax_checkers/asciidoc/asciidoc.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/asciidoc/asciidoc.vim rename to bundle/syntastic/syntax_checkers/asciidoc/asciidoc.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/asm/gcc.vim b/bundle/syntastic/syntax_checkers/asm/gcc.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/asm/gcc.vim rename to bundle/syntastic/syntax_checkers/asm/gcc.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/bemhtml/bemhtmllint.vim b/bundle/syntastic/syntax_checkers/bemhtml/bemhtmllint.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/bemhtml/bemhtmllint.vim rename to bundle/syntastic/syntax_checkers/bemhtml/bemhtmllint.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/c/avrgcc.vim b/bundle/syntastic/syntax_checkers/c/avrgcc.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/c/avrgcc.vim rename to bundle/syntastic/syntax_checkers/c/avrgcc.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/c/checkpatch.vim b/bundle/syntastic/syntax_checkers/c/checkpatch.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/c/checkpatch.vim rename to bundle/syntastic/syntax_checkers/c/checkpatch.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/c/cppcheck.vim b/bundle/syntastic/syntax_checkers/c/cppcheck.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/c/cppcheck.vim rename to bundle/syntastic/syntax_checkers/c/cppcheck.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/c/gcc.vim b/bundle/syntastic/syntax_checkers/c/gcc.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/c/gcc.vim rename to bundle/syntastic/syntax_checkers/c/gcc.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/c/make.vim b/bundle/syntastic/syntax_checkers/c/make.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/c/make.vim rename to bundle/syntastic/syntax_checkers/c/make.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/c/oclint.vim b/bundle/syntastic/syntax_checkers/c/oclint.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/c/oclint.vim rename to bundle/syntastic/syntax_checkers/c/oclint.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/c/sparse.vim b/bundle/syntastic/syntax_checkers/c/sparse.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/c/sparse.vim rename to bundle/syntastic/syntax_checkers/c/sparse.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/c/splint.vim b/bundle/syntastic/syntax_checkers/c/splint.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/c/splint.vim rename to bundle/syntastic/syntax_checkers/c/splint.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/chef/foodcritic.vim b/bundle/syntastic/syntax_checkers/chef/foodcritic.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/chef/foodcritic.vim rename to bundle/syntastic/syntax_checkers/chef/foodcritic.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/co/coco.vim b/bundle/syntastic/syntax_checkers/co/coco.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/co/coco.vim rename to bundle/syntastic/syntax_checkers/co/coco.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/cobol/cobc.vim b/bundle/syntastic/syntax_checkers/cobol/cobc.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/cobol/cobc.vim rename to bundle/syntastic/syntax_checkers/cobol/cobc.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/coffee/coffee.vim b/bundle/syntastic/syntax_checkers/coffee/coffee.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/coffee/coffee.vim rename to bundle/syntastic/syntax_checkers/coffee/coffee.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/coffee/coffeelint.vim b/bundle/syntastic/syntax_checkers/coffee/coffeelint.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/coffee/coffeelint.vim rename to bundle/syntastic/syntax_checkers/coffee/coffeelint.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/coq/coqtop.vim b/bundle/syntastic/syntax_checkers/coq/coqtop.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/coq/coqtop.vim rename to bundle/syntastic/syntax_checkers/coq/coqtop.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/cpp/cppcheck.vim b/bundle/syntastic/syntax_checkers/cpp/cppcheck.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/cpp/cppcheck.vim rename to bundle/syntastic/syntax_checkers/cpp/cppcheck.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/cpp/cpplint.vim b/bundle/syntastic/syntax_checkers/cpp/cpplint.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/cpp/cpplint.vim rename to bundle/syntastic/syntax_checkers/cpp/cpplint.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/cpp/gcc.vim b/bundle/syntastic/syntax_checkers/cpp/gcc.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/cpp/gcc.vim rename to bundle/syntastic/syntax_checkers/cpp/gcc.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/cpp/oclint.vim b/bundle/syntastic/syntax_checkers/cpp/oclint.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/cpp/oclint.vim rename to bundle/syntastic/syntax_checkers/cpp/oclint.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/cs/mcs.vim b/bundle/syntastic/syntax_checkers/cs/mcs.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/cs/mcs.vim rename to bundle/syntastic/syntax_checkers/cs/mcs.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/css/csslint.vim b/bundle/syntastic/syntax_checkers/css/csslint.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/css/csslint.vim rename to bundle/syntastic/syntax_checkers/css/csslint.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/css/phpcs.vim b/bundle/syntastic/syntax_checkers/css/phpcs.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/css/phpcs.vim rename to bundle/syntastic/syntax_checkers/css/phpcs.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/css/prettycss.vim b/bundle/syntastic/syntax_checkers/css/prettycss.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/css/prettycss.vim rename to bundle/syntastic/syntax_checkers/css/prettycss.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/cucumber/cucumber.vim b/bundle/syntastic/syntax_checkers/cucumber/cucumber.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/cucumber/cucumber.vim rename to bundle/syntastic/syntax_checkers/cucumber/cucumber.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/cuda/nvcc.vim b/bundle/syntastic/syntax_checkers/cuda/nvcc.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/cuda/nvcc.vim rename to bundle/syntastic/syntax_checkers/cuda/nvcc.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/d/dmd.vim b/bundle/syntastic/syntax_checkers/d/dmd.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/d/dmd.vim rename to bundle/syntastic/syntax_checkers/d/dmd.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/dart/dartanalyzer.vim b/bundle/syntastic/syntax_checkers/dart/dartanalyzer.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/dart/dartanalyzer.vim rename to bundle/syntastic/syntax_checkers/dart/dartanalyzer.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/docbk/xmllint.vim b/bundle/syntastic/syntax_checkers/docbk/xmllint.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/docbk/xmllint.vim rename to bundle/syntastic/syntax_checkers/docbk/xmllint.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/dustjs/swiffer.vim b/bundle/syntastic/syntax_checkers/dustjs/swiffer.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/dustjs/swiffer.vim rename to bundle/syntastic/syntax_checkers/dustjs/swiffer.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/elixir/elixir.vim b/bundle/syntastic/syntax_checkers/elixir/elixir.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/elixir/elixir.vim rename to bundle/syntastic/syntax_checkers/elixir/elixir.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/erlang/erlang_check_file.erl b/bundle/syntastic/syntax_checkers/erlang/erlang_check_file.erl similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/erlang/erlang_check_file.erl rename to bundle/syntastic/syntax_checkers/erlang/erlang_check_file.erl diff --git a/sources_non_forked/syntastic/syntax_checkers/erlang/escript.vim b/bundle/syntastic/syntax_checkers/erlang/escript.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/erlang/escript.vim rename to bundle/syntastic/syntax_checkers/erlang/escript.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/erlang/syntaxerl.vim b/bundle/syntastic/syntax_checkers/erlang/syntaxerl.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/erlang/syntaxerl.vim rename to bundle/syntastic/syntax_checkers/erlang/syntaxerl.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim b/bundle/syntastic/syntax_checkers/eruby/ruby.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim rename to bundle/syntastic/syntax_checkers/eruby/ruby.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/fortran/gfortran.vim b/bundle/syntastic/syntax_checkers/fortran/gfortran.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/fortran/gfortran.vim rename to bundle/syntastic/syntax_checkers/fortran/gfortran.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/glsl/cgc.vim b/bundle/syntastic/syntax_checkers/glsl/cgc.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/glsl/cgc.vim rename to bundle/syntastic/syntax_checkers/glsl/cgc.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/go/go.vim b/bundle/syntastic/syntax_checkers/go/go.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/go/go.vim rename to bundle/syntastic/syntax_checkers/go/go.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/go/gofmt.vim b/bundle/syntastic/syntax_checkers/go/gofmt.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/go/gofmt.vim rename to bundle/syntastic/syntax_checkers/go/gofmt.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/go/golint.vim b/bundle/syntastic/syntax_checkers/go/golint.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/go/golint.vim rename to bundle/syntastic/syntax_checkers/go/golint.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/go/gotype.vim b/bundle/syntastic/syntax_checkers/go/gotype.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/go/gotype.vim rename to bundle/syntastic/syntax_checkers/go/gotype.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/go/govet.vim b/bundle/syntastic/syntax_checkers/go/govet.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/go/govet.vim rename to bundle/syntastic/syntax_checkers/go/govet.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/haml/haml.vim b/bundle/syntastic/syntax_checkers/haml/haml.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/haml/haml.vim rename to bundle/syntastic/syntax_checkers/haml/haml.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/haml/haml_lint.vim b/bundle/syntastic/syntax_checkers/haml/haml_lint.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/haml/haml_lint.vim rename to bundle/syntastic/syntax_checkers/haml/haml_lint.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/handlebars/handlebars.vim b/bundle/syntastic/syntax_checkers/handlebars/handlebars.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/handlebars/handlebars.vim rename to bundle/syntastic/syntax_checkers/handlebars/handlebars.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim b/bundle/syntastic/syntax_checkers/haskell/ghc-mod.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim rename to bundle/syntastic/syntax_checkers/haskell/ghc-mod.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/haskell/hdevtools.vim b/bundle/syntastic/syntax_checkers/haskell/hdevtools.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/haskell/hdevtools.vim rename to bundle/syntastic/syntax_checkers/haskell/hdevtools.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/haskell/hlint.vim b/bundle/syntastic/syntax_checkers/haskell/hlint.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/haskell/hlint.vim rename to bundle/syntastic/syntax_checkers/haskell/hlint.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/haxe/haxe.vim b/bundle/syntastic/syntax_checkers/haxe/haxe.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/haxe/haxe.vim rename to bundle/syntastic/syntax_checkers/haxe/haxe.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/hss/hss.vim b/bundle/syntastic/syntax_checkers/hss/hss.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/hss/hss.vim rename to bundle/syntastic/syntax_checkers/hss/hss.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim b/bundle/syntastic/syntax_checkers/html/jshint.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/html/jshint.vim rename to bundle/syntastic/syntax_checkers/html/jshint.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/html/tidy.vim b/bundle/syntastic/syntax_checkers/html/tidy.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/html/tidy.vim rename to bundle/syntastic/syntax_checkers/html/tidy.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/html/validator.vim b/bundle/syntastic/syntax_checkers/html/validator.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/html/validator.vim rename to bundle/syntastic/syntax_checkers/html/validator.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/html/w3.vim b/bundle/syntastic/syntax_checkers/html/w3.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/html/w3.vim rename to bundle/syntastic/syntax_checkers/html/w3.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim b/bundle/syntastic/syntax_checkers/java/checkstyle.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim rename to bundle/syntastic/syntax_checkers/java/checkstyle.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/java/javac.vim b/bundle/syntastic/syntax_checkers/java/javac.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/java/javac.vim rename to bundle/syntastic/syntax_checkers/java/javac.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/closurecompiler.vim b/bundle/syntastic/syntax_checkers/javascript/closurecompiler.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/javascript/closurecompiler.vim rename to bundle/syntastic/syntax_checkers/javascript/closurecompiler.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim b/bundle/syntastic/syntax_checkers/javascript/eslint.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim rename to bundle/syntastic/syntax_checkers/javascript/eslint.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/gjslint.vim b/bundle/syntastic/syntax_checkers/javascript/gjslint.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/javascript/gjslint.vim rename to bundle/syntastic/syntax_checkers/javascript/gjslint.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jscs.vim b/bundle/syntastic/syntax_checkers/javascript/jscs.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/javascript/jscs.vim rename to bundle/syntastic/syntax_checkers/javascript/jscs.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim b/bundle/syntastic/syntax_checkers/javascript/jshint.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim rename to bundle/syntastic/syntax_checkers/javascript/jshint.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jsl.vim b/bundle/syntastic/syntax_checkers/javascript/jsl.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/javascript/jsl.vim rename to bundle/syntastic/syntax_checkers/javascript/jsl.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jslint.vim b/bundle/syntastic/syntax_checkers/javascript/jslint.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/javascript/jslint.vim rename to bundle/syntastic/syntax_checkers/javascript/jslint.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim b/bundle/syntastic/syntax_checkers/javascript/jsxhint.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim rename to bundle/syntastic/syntax_checkers/javascript/jsxhint.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/json/jsonlint.vim b/bundle/syntastic/syntax_checkers/json/jsonlint.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/json/jsonlint.vim rename to bundle/syntastic/syntax_checkers/json/jsonlint.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/json/jsonval.vim b/bundle/syntastic/syntax_checkers/json/jsonval.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/json/jsonval.vim rename to bundle/syntastic/syntax_checkers/json/jsonval.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/less/less-lint.coffee b/bundle/syntastic/syntax_checkers/less/less-lint.coffee similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/less/less-lint.coffee rename to bundle/syntastic/syntax_checkers/less/less-lint.coffee diff --git a/sources_non_forked/syntastic/syntax_checkers/less/less-lint.js b/bundle/syntastic/syntax_checkers/less/less-lint.js similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/less/less-lint.js rename to bundle/syntastic/syntax_checkers/less/less-lint.js diff --git a/sources_non_forked/syntastic/syntax_checkers/less/lessc.vim b/bundle/syntastic/syntax_checkers/less/lessc.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/less/lessc.vim rename to bundle/syntastic/syntax_checkers/less/lessc.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/lex/flex.vim b/bundle/syntastic/syntax_checkers/lex/flex.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/lex/flex.vim rename to bundle/syntastic/syntax_checkers/lex/flex.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/limbo/limbo.vim b/bundle/syntastic/syntax_checkers/limbo/limbo.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/limbo/limbo.vim rename to bundle/syntastic/syntax_checkers/limbo/limbo.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/lisp/clisp.vim b/bundle/syntastic/syntax_checkers/lisp/clisp.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/lisp/clisp.vim rename to bundle/syntastic/syntax_checkers/lisp/clisp.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/llvm/llvm.vim b/bundle/syntastic/syntax_checkers/llvm/llvm.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/llvm/llvm.vim rename to bundle/syntastic/syntax_checkers/llvm/llvm.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/lua/luac.vim b/bundle/syntastic/syntax_checkers/lua/luac.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/lua/luac.vim rename to bundle/syntastic/syntax_checkers/lua/luac.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/matlab/mlint.vim b/bundle/syntastic/syntax_checkers/matlab/mlint.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/matlab/mlint.vim rename to bundle/syntastic/syntax_checkers/matlab/mlint.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/nasm/nasm.vim b/bundle/syntastic/syntax_checkers/nasm/nasm.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/nasm/nasm.vim rename to bundle/syntastic/syntax_checkers/nasm/nasm.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/nroff/mandoc.vim b/bundle/syntastic/syntax_checkers/nroff/mandoc.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/nroff/mandoc.vim rename to bundle/syntastic/syntax_checkers/nroff/mandoc.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/objc/gcc.vim b/bundle/syntastic/syntax_checkers/objc/gcc.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/objc/gcc.vim rename to bundle/syntastic/syntax_checkers/objc/gcc.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/objc/oclint.vim b/bundle/syntastic/syntax_checkers/objc/oclint.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/objc/oclint.vim rename to bundle/syntastic/syntax_checkers/objc/oclint.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/objcpp/gcc.vim b/bundle/syntastic/syntax_checkers/objcpp/gcc.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/objcpp/gcc.vim rename to bundle/syntastic/syntax_checkers/objcpp/gcc.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/objcpp/oclint.vim b/bundle/syntastic/syntax_checkers/objcpp/oclint.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/objcpp/oclint.vim rename to bundle/syntastic/syntax_checkers/objcpp/oclint.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/ocaml/camlp4o.vim b/bundle/syntastic/syntax_checkers/ocaml/camlp4o.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/ocaml/camlp4o.vim rename to bundle/syntastic/syntax_checkers/ocaml/camlp4o.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/perl/perl.vim b/bundle/syntastic/syntax_checkers/perl/perl.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/perl/perl.vim rename to bundle/syntastic/syntax_checkers/perl/perl.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/perl/perlcritic.vim b/bundle/syntastic/syntax_checkers/perl/perlcritic.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/perl/perlcritic.vim rename to bundle/syntastic/syntax_checkers/perl/perlcritic.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/perl/podchecker.vim b/bundle/syntastic/syntax_checkers/perl/podchecker.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/perl/podchecker.vim rename to bundle/syntastic/syntax_checkers/perl/podchecker.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/php/php.vim b/bundle/syntastic/syntax_checkers/php/php.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/php/php.vim rename to bundle/syntastic/syntax_checkers/php/php.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/php/phpcs.vim b/bundle/syntastic/syntax_checkers/php/phpcs.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/php/phpcs.vim rename to bundle/syntastic/syntax_checkers/php/phpcs.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/php/phpmd.vim b/bundle/syntastic/syntax_checkers/php/phpmd.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/php/phpmd.vim rename to bundle/syntastic/syntax_checkers/php/phpmd.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/po/msgfmt.vim b/bundle/syntastic/syntax_checkers/po/msgfmt.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/po/msgfmt.vim rename to bundle/syntastic/syntax_checkers/po/msgfmt.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/pod/podchecker.vim b/bundle/syntastic/syntax_checkers/pod/podchecker.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/pod/podchecker.vim rename to bundle/syntastic/syntax_checkers/pod/podchecker.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/puppet/puppet.vim b/bundle/syntastic/syntax_checkers/puppet/puppet.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/puppet/puppet.vim rename to bundle/syntastic/syntax_checkers/puppet/puppet.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/puppet/puppetlint.vim b/bundle/syntastic/syntax_checkers/puppet/puppetlint.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/puppet/puppetlint.vim rename to bundle/syntastic/syntax_checkers/puppet/puppetlint.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/python/compile.py b/bundle/syntastic/syntax_checkers/python/compile.py similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/python/compile.py rename to bundle/syntastic/syntax_checkers/python/compile.py diff --git a/sources_non_forked/syntastic/syntax_checkers/python/flake8.vim b/bundle/syntastic/syntax_checkers/python/flake8.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/python/flake8.vim rename to bundle/syntastic/syntax_checkers/python/flake8.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/python/frosted.vim b/bundle/syntastic/syntax_checkers/python/frosted.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/python/frosted.vim rename to bundle/syntastic/syntax_checkers/python/frosted.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pep257.vim b/bundle/syntastic/syntax_checkers/python/pep257.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/python/pep257.vim rename to bundle/syntastic/syntax_checkers/python/pep257.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pep8.vim b/bundle/syntastic/syntax_checkers/python/pep8.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/python/pep8.vim rename to bundle/syntastic/syntax_checkers/python/pep8.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/python/py3kwarn.vim b/bundle/syntastic/syntax_checkers/python/py3kwarn.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/python/py3kwarn.vim rename to bundle/syntastic/syntax_checkers/python/py3kwarn.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pyflakes.vim b/bundle/syntastic/syntax_checkers/python/pyflakes.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/python/pyflakes.vim rename to bundle/syntastic/syntax_checkers/python/pyflakes.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pylama.vim b/bundle/syntastic/syntax_checkers/python/pylama.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/python/pylama.vim rename to bundle/syntastic/syntax_checkers/python/pylama.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim b/bundle/syntastic/syntax_checkers/python/pylint.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/python/pylint.vim rename to bundle/syntastic/syntax_checkers/python/pylint.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/python/python.vim b/bundle/syntastic/syntax_checkers/python/python.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/python/python.vim rename to bundle/syntastic/syntax_checkers/python/python.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/racket/code-ayatollah.vim b/bundle/syntastic/syntax_checkers/racket/code-ayatollah.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/racket/code-ayatollah.vim rename to bundle/syntastic/syntax_checkers/racket/code-ayatollah.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/racket/racket.vim b/bundle/syntastic/syntax_checkers/racket/racket.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/racket/racket.vim rename to bundle/syntastic/syntax_checkers/racket/racket.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/rst/rst2pseudoxml.vim b/bundle/syntastic/syntax_checkers/rst/rst2pseudoxml.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/rst/rst2pseudoxml.vim rename to bundle/syntastic/syntax_checkers/rst/rst2pseudoxml.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/rst/rstcheck.vim b/bundle/syntastic/syntax_checkers/rst/rstcheck.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/rst/rstcheck.vim rename to bundle/syntastic/syntax_checkers/rst/rstcheck.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/jruby.vim b/bundle/syntastic/syntax_checkers/ruby/jruby.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/ruby/jruby.vim rename to bundle/syntastic/syntax_checkers/ruby/jruby.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/macruby.vim b/bundle/syntastic/syntax_checkers/ruby/macruby.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/ruby/macruby.vim rename to bundle/syntastic/syntax_checkers/ruby/macruby.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim b/bundle/syntastic/syntax_checkers/ruby/mri.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim rename to bundle/syntastic/syntax_checkers/ruby/mri.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/rubocop.vim b/bundle/syntastic/syntax_checkers/ruby/rubocop.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/ruby/rubocop.vim rename to bundle/syntastic/syntax_checkers/ruby/rubocop.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/rubylint.vim b/bundle/syntastic/syntax_checkers/ruby/rubylint.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/ruby/rubylint.vim rename to bundle/syntastic/syntax_checkers/ruby/rubylint.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/rust/rustc.vim b/bundle/syntastic/syntax_checkers/rust/rustc.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/rust/rustc.vim rename to bundle/syntastic/syntax_checkers/rust/rustc.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/sass/sass.vim b/bundle/syntastic/syntax_checkers/sass/sass.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/sass/sass.vim rename to bundle/syntastic/syntax_checkers/sass/sass.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/scala/fsc.vim b/bundle/syntastic/syntax_checkers/scala/fsc.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/scala/fsc.vim rename to bundle/syntastic/syntax_checkers/scala/fsc.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/scala/scalac.vim b/bundle/syntastic/syntax_checkers/scala/scalac.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/scala/scalac.vim rename to bundle/syntastic/syntax_checkers/scala/scalac.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/scss/sass.vim b/bundle/syntastic/syntax_checkers/scss/sass.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/scss/sass.vim rename to bundle/syntastic/syntax_checkers/scss/sass.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/scss/scss_lint.vim b/bundle/syntastic/syntax_checkers/scss/scss_lint.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/scss/scss_lint.vim rename to bundle/syntastic/syntax_checkers/scss/scss_lint.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/sh/checkbashisms.vim b/bundle/syntastic/syntax_checkers/sh/checkbashisms.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/sh/checkbashisms.vim rename to bundle/syntastic/syntax_checkers/sh/checkbashisms.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/sh/sh.vim b/bundle/syntastic/syntax_checkers/sh/sh.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/sh/sh.vim rename to bundle/syntastic/syntax_checkers/sh/sh.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/sh/shellcheck.vim b/bundle/syntastic/syntax_checkers/sh/shellcheck.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/sh/shellcheck.vim rename to bundle/syntastic/syntax_checkers/sh/shellcheck.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/slim/slimrb.vim b/bundle/syntastic/syntax_checkers/slim/slimrb.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/slim/slimrb.vim rename to bundle/syntastic/syntax_checkers/slim/slimrb.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/tcl/nagelfar.vim b/bundle/syntastic/syntax_checkers/tcl/nagelfar.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/tcl/nagelfar.vim rename to bundle/syntastic/syntax_checkers/tcl/nagelfar.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/tex/chktex.vim b/bundle/syntastic/syntax_checkers/tex/chktex.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/tex/chktex.vim rename to bundle/syntastic/syntax_checkers/tex/chktex.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/tex/lacheck.vim b/bundle/syntastic/syntax_checkers/tex/lacheck.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/tex/lacheck.vim rename to bundle/syntastic/syntax_checkers/tex/lacheck.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/texinfo/makeinfo.vim b/bundle/syntastic/syntax_checkers/texinfo/makeinfo.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/texinfo/makeinfo.vim rename to bundle/syntastic/syntax_checkers/texinfo/makeinfo.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/text/atdtool.vim b/bundle/syntastic/syntax_checkers/text/atdtool.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/text/atdtool.vim rename to bundle/syntastic/syntax_checkers/text/atdtool.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/text/language_check.vim b/bundle/syntastic/syntax_checkers/text/language_check.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/text/language_check.vim rename to bundle/syntastic/syntax_checkers/text/language_check.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/twig/twiglint.vim b/bundle/syntastic/syntax_checkers/twig/twiglint.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/twig/twiglint.vim rename to bundle/syntastic/syntax_checkers/twig/twiglint.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/typescript/tsc.vim b/bundle/syntastic/syntax_checkers/typescript/tsc.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/typescript/tsc.vim rename to bundle/syntastic/syntax_checkers/typescript/tsc.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/vala/valac.vim b/bundle/syntastic/syntax_checkers/vala/valac.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/vala/valac.vim rename to bundle/syntastic/syntax_checkers/vala/valac.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/verilog/verilator.vim b/bundle/syntastic/syntax_checkers/verilog/verilator.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/verilog/verilator.vim rename to bundle/syntastic/syntax_checkers/verilog/verilator.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/vhdl/ghdl.vim b/bundle/syntastic/syntax_checkers/vhdl/ghdl.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/vhdl/ghdl.vim rename to bundle/syntastic/syntax_checkers/vhdl/ghdl.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim b/bundle/syntastic/syntax_checkers/vim/vimlint.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim rename to bundle/syntastic/syntax_checkers/vim/vimlint.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/xhtml/jshint.vim b/bundle/syntastic/syntax_checkers/xhtml/jshint.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/xhtml/jshint.vim rename to bundle/syntastic/syntax_checkers/xhtml/jshint.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/xhtml/tidy.vim b/bundle/syntastic/syntax_checkers/xhtml/tidy.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/xhtml/tidy.vim rename to bundle/syntastic/syntax_checkers/xhtml/tidy.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/xml/xmllint.vim b/bundle/syntastic/syntax_checkers/xml/xmllint.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/xml/xmllint.vim rename to bundle/syntastic/syntax_checkers/xml/xmllint.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/xslt/xmllint.vim b/bundle/syntastic/syntax_checkers/xslt/xmllint.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/xslt/xmllint.vim rename to bundle/syntastic/syntax_checkers/xslt/xmllint.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/yacc/bison.vim b/bundle/syntastic/syntax_checkers/yacc/bison.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/yacc/bison.vim rename to bundle/syntastic/syntax_checkers/yacc/bison.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/yaml/jsyaml.vim b/bundle/syntastic/syntax_checkers/yaml/jsyaml.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/yaml/jsyaml.vim rename to bundle/syntastic/syntax_checkers/yaml/jsyaml.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/yaml/yamlxs.vim b/bundle/syntastic/syntax_checkers/yaml/yamlxs.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/yaml/yamlxs.vim rename to bundle/syntastic/syntax_checkers/yaml/yamlxs.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/z80/z80syntaxchecker.vim b/bundle/syntastic/syntax_checkers/z80/z80syntaxchecker.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/z80/z80syntaxchecker.vim rename to bundle/syntastic/syntax_checkers/z80/z80syntaxchecker.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/zpt/zptlint.vim b/bundle/syntastic/syntax_checkers/zpt/zptlint.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/zpt/zptlint.vim rename to bundle/syntastic/syntax_checkers/zpt/zptlint.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/zsh/shellcheck.vim b/bundle/syntastic/syntax_checkers/zsh/shellcheck.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/zsh/shellcheck.vim rename to bundle/syntastic/syntax_checkers/zsh/shellcheck.vim diff --git a/sources_non_forked/syntastic/syntax_checkers/zsh/zsh.vim b/bundle/syntastic/syntax_checkers/zsh/zsh.vim similarity index 100% rename from sources_non_forked/syntastic/syntax_checkers/zsh/zsh.vim rename to bundle/syntastic/syntax_checkers/zsh/zsh.vim diff --git a/sources_non_forked/taglist.vim/README b/bundle/taglist.vim/README similarity index 100% rename from sources_non_forked/taglist.vim/README rename to bundle/taglist.vim/README diff --git a/sources_non_forked/taglist.vim/doc/taglist.txt b/bundle/taglist.vim/doc/taglist.txt similarity index 100% rename from sources_non_forked/taglist.vim/doc/taglist.txt rename to bundle/taglist.vim/doc/taglist.txt diff --git a/sources_non_forked/taglist.vim/plugin/taglist.vim b/bundle/taglist.vim/plugin/taglist.vim similarity index 100% rename from sources_non_forked/taglist.vim/plugin/taglist.vim rename to bundle/taglist.vim/plugin/taglist.vim diff --git a/sources_non_forked/tlib/README b/bundle/tlib/README similarity index 100% rename from sources_non_forked/tlib/README rename to bundle/tlib/README diff --git a/sources_non_forked/tlib/autoload/tlib.vim b/bundle/tlib/autoload/tlib.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib.vim rename to bundle/tlib/autoload/tlib.vim diff --git a/sources_non_forked/tlib/autoload/tlib/Filter_cnf.vim b/bundle/tlib/autoload/tlib/Filter_cnf.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/Filter_cnf.vim rename to bundle/tlib/autoload/tlib/Filter_cnf.vim diff --git a/sources_non_forked/tlib/autoload/tlib/Filter_cnfd.vim b/bundle/tlib/autoload/tlib/Filter_cnfd.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/Filter_cnfd.vim rename to bundle/tlib/autoload/tlib/Filter_cnfd.vim diff --git a/sources_non_forked/tlib/autoload/tlib/Filter_fuzzy.vim b/bundle/tlib/autoload/tlib/Filter_fuzzy.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/Filter_fuzzy.vim rename to bundle/tlib/autoload/tlib/Filter_fuzzy.vim diff --git a/sources_non_forked/tlib/autoload/tlib/Filter_glob.vim b/bundle/tlib/autoload/tlib/Filter_glob.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/Filter_glob.vim rename to bundle/tlib/autoload/tlib/Filter_glob.vim diff --git a/sources_non_forked/tlib/autoload/tlib/Object.vim b/bundle/tlib/autoload/tlib/Object.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/Object.vim rename to bundle/tlib/autoload/tlib/Object.vim diff --git a/sources_non_forked/tlib/autoload/tlib/Test.vim b/bundle/tlib/autoload/tlib/Test.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/Test.vim rename to bundle/tlib/autoload/tlib/Test.vim diff --git a/sources_non_forked/tlib/autoload/tlib/TestChild.vim b/bundle/tlib/autoload/tlib/TestChild.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/TestChild.vim rename to bundle/tlib/autoload/tlib/TestChild.vim diff --git a/sources_non_forked/tlib/autoload/tlib/World.vim b/bundle/tlib/autoload/tlib/World.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/World.vim rename to bundle/tlib/autoload/tlib/World.vim diff --git a/sources_non_forked/tlib/autoload/tlib/agent.vim b/bundle/tlib/autoload/tlib/agent.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/agent.vim rename to bundle/tlib/autoload/tlib/agent.vim diff --git a/sources_non_forked/tlib/autoload/tlib/arg.vim b/bundle/tlib/autoload/tlib/arg.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/arg.vim rename to bundle/tlib/autoload/tlib/arg.vim diff --git a/sources_non_forked/tlib/autoload/tlib/autocmdgroup.vim b/bundle/tlib/autoload/tlib/autocmdgroup.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/autocmdgroup.vim rename to bundle/tlib/autoload/tlib/autocmdgroup.vim diff --git a/sources_non_forked/tlib/autoload/tlib/balloon.vim b/bundle/tlib/autoload/tlib/balloon.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/balloon.vim rename to bundle/tlib/autoload/tlib/balloon.vim diff --git a/sources_non_forked/tlib/autoload/tlib/bitwise.vim b/bundle/tlib/autoload/tlib/bitwise.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/bitwise.vim rename to bundle/tlib/autoload/tlib/bitwise.vim diff --git a/sources_non_forked/tlib/autoload/tlib/buffer.vim b/bundle/tlib/autoload/tlib/buffer.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/buffer.vim rename to bundle/tlib/autoload/tlib/buffer.vim diff --git a/sources_non_forked/tlib/autoload/tlib/cache.vim b/bundle/tlib/autoload/tlib/cache.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/cache.vim rename to bundle/tlib/autoload/tlib/cache.vim diff --git a/sources_non_forked/tlib/autoload/tlib/char.vim b/bundle/tlib/autoload/tlib/char.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/char.vim rename to bundle/tlib/autoload/tlib/char.vim diff --git a/sources_non_forked/tlib/autoload/tlib/cmd.vim b/bundle/tlib/autoload/tlib/cmd.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/cmd.vim rename to bundle/tlib/autoload/tlib/cmd.vim diff --git a/sources_non_forked/tlib/autoload/tlib/comments.vim b/bundle/tlib/autoload/tlib/comments.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/comments.vim rename to bundle/tlib/autoload/tlib/comments.vim diff --git a/sources_non_forked/tlib/autoload/tlib/date.vim b/bundle/tlib/autoload/tlib/date.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/date.vim rename to bundle/tlib/autoload/tlib/date.vim diff --git a/sources_non_forked/tlib/autoload/tlib/dir.vim b/bundle/tlib/autoload/tlib/dir.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/dir.vim rename to bundle/tlib/autoload/tlib/dir.vim diff --git a/sources_non_forked/tlib/autoload/tlib/eval.vim b/bundle/tlib/autoload/tlib/eval.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/eval.vim rename to bundle/tlib/autoload/tlib/eval.vim diff --git a/sources_non_forked/tlib/autoload/tlib/file.vim b/bundle/tlib/autoload/tlib/file.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/file.vim rename to bundle/tlib/autoload/tlib/file.vim diff --git a/sources_non_forked/tlib/autoload/tlib/fixes.vim b/bundle/tlib/autoload/tlib/fixes.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/fixes.vim rename to bundle/tlib/autoload/tlib/fixes.vim diff --git a/sources_non_forked/tlib/autoload/tlib/grep.vim b/bundle/tlib/autoload/tlib/grep.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/grep.vim rename to bundle/tlib/autoload/tlib/grep.vim diff --git a/sources_non_forked/tlib/autoload/tlib/hash.vim b/bundle/tlib/autoload/tlib/hash.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/hash.vim rename to bundle/tlib/autoload/tlib/hash.vim diff --git a/sources_non_forked/tlib/autoload/tlib/hook.vim b/bundle/tlib/autoload/tlib/hook.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/hook.vim rename to bundle/tlib/autoload/tlib/hook.vim diff --git a/sources_non_forked/tlib/autoload/tlib/input.vim b/bundle/tlib/autoload/tlib/input.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/input.vim rename to bundle/tlib/autoload/tlib/input.vim diff --git a/sources_non_forked/tlib/autoload/tlib/list.vim b/bundle/tlib/autoload/tlib/list.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/list.vim rename to bundle/tlib/autoload/tlib/list.vim diff --git a/sources_non_forked/tlib/autoload/tlib/map.vim b/bundle/tlib/autoload/tlib/map.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/map.vim rename to bundle/tlib/autoload/tlib/map.vim diff --git a/sources_non_forked/tlib/autoload/tlib/normal.vim b/bundle/tlib/autoload/tlib/normal.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/normal.vim rename to bundle/tlib/autoload/tlib/normal.vim diff --git a/sources_non_forked/tlib/autoload/tlib/notify.vim b/bundle/tlib/autoload/tlib/notify.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/notify.vim rename to bundle/tlib/autoload/tlib/notify.vim diff --git a/sources_non_forked/tlib/autoload/tlib/number.vim b/bundle/tlib/autoload/tlib/number.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/number.vim rename to bundle/tlib/autoload/tlib/number.vim diff --git a/sources_non_forked/tlib/autoload/tlib/paragraph.vim b/bundle/tlib/autoload/tlib/paragraph.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/paragraph.vim rename to bundle/tlib/autoload/tlib/paragraph.vim diff --git a/sources_non_forked/tlib/autoload/tlib/persistent.vim b/bundle/tlib/autoload/tlib/persistent.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/persistent.vim rename to bundle/tlib/autoload/tlib/persistent.vim diff --git a/sources_non_forked/tlib/autoload/tlib/progressbar.vim b/bundle/tlib/autoload/tlib/progressbar.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/progressbar.vim rename to bundle/tlib/autoload/tlib/progressbar.vim diff --git a/sources_non_forked/tlib/autoload/tlib/rx.vim b/bundle/tlib/autoload/tlib/rx.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/rx.vim rename to bundle/tlib/autoload/tlib/rx.vim diff --git a/sources_non_forked/tlib/autoload/tlib/scratch.vim b/bundle/tlib/autoload/tlib/scratch.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/scratch.vim rename to bundle/tlib/autoload/tlib/scratch.vim diff --git a/sources_non_forked/tlib/autoload/tlib/signs.vim b/bundle/tlib/autoload/tlib/signs.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/signs.vim rename to bundle/tlib/autoload/tlib/signs.vim diff --git a/sources_non_forked/tlib/autoload/tlib/string.vim b/bundle/tlib/autoload/tlib/string.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/string.vim rename to bundle/tlib/autoload/tlib/string.vim diff --git a/sources_non_forked/tlib/autoload/tlib/syntax.vim b/bundle/tlib/autoload/tlib/syntax.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/syntax.vim rename to bundle/tlib/autoload/tlib/syntax.vim diff --git a/sources_non_forked/tlib/autoload/tlib/tab.vim b/bundle/tlib/autoload/tlib/tab.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/tab.vim rename to bundle/tlib/autoload/tlib/tab.vim diff --git a/sources_non_forked/tlib/autoload/tlib/tag.vim b/bundle/tlib/autoload/tlib/tag.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/tag.vim rename to bundle/tlib/autoload/tlib/tag.vim diff --git a/sources_non_forked/tlib/autoload/tlib/textobjects.vim b/bundle/tlib/autoload/tlib/textobjects.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/textobjects.vim rename to bundle/tlib/autoload/tlib/textobjects.vim diff --git a/sources_non_forked/tlib/autoload/tlib/time.vim b/bundle/tlib/autoload/tlib/time.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/time.vim rename to bundle/tlib/autoload/tlib/time.vim diff --git a/sources_non_forked/tlib/autoload/tlib/type.vim b/bundle/tlib/autoload/tlib/type.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/type.vim rename to bundle/tlib/autoload/tlib/type.vim diff --git a/sources_non_forked/tlib/autoload/tlib/url.vim b/bundle/tlib/autoload/tlib/url.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/url.vim rename to bundle/tlib/autoload/tlib/url.vim diff --git a/sources_non_forked/tlib/autoload/tlib/var.vim b/bundle/tlib/autoload/tlib/var.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/var.vim rename to bundle/tlib/autoload/tlib/var.vim diff --git a/sources_non_forked/tlib/autoload/tlib/vcs.vim b/bundle/tlib/autoload/tlib/vcs.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/vcs.vim rename to bundle/tlib/autoload/tlib/vcs.vim diff --git a/sources_non_forked/tlib/autoload/tlib/vim.vim b/bundle/tlib/autoload/tlib/vim.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/vim.vim rename to bundle/tlib/autoload/tlib/vim.vim diff --git a/sources_non_forked/tlib/autoload/tlib/win.vim b/bundle/tlib/autoload/tlib/win.vim similarity index 100% rename from sources_non_forked/tlib/autoload/tlib/win.vim rename to bundle/tlib/autoload/tlib/win.vim diff --git a/sources_non_forked/tlib/doc/tlib.txt b/bundle/tlib/doc/tlib.txt similarity index 100% rename from sources_non_forked/tlib/doc/tlib.txt rename to bundle/tlib/doc/tlib.txt diff --git a/sources_non_forked/tlib/plugin/02tlib.vim b/bundle/tlib/plugin/02tlib.vim similarity index 100% rename from sources_non_forked/tlib/plugin/02tlib.vim rename to bundle/tlib/plugin/02tlib.vim diff --git a/sources_non_forked/tlib/test/tlib.vim b/bundle/tlib/test/tlib.vim similarity index 100% rename from sources_non_forked/tlib/test/tlib.vim rename to bundle/tlib/test/tlib.vim diff --git a/sources_non_forked/vim-addon-mw-utils/.gitignore b/bundle/vim-addon-mw-utils/.gitignore similarity index 100% rename from sources_non_forked/vim-addon-mw-utils/.gitignore rename to bundle/vim-addon-mw-utils/.gitignore diff --git a/sources_non_forked/vim-addon-mw-utils/autoload/buf_utils.vim b/bundle/vim-addon-mw-utils/autoload/buf_utils.vim similarity index 100% rename from sources_non_forked/vim-addon-mw-utils/autoload/buf_utils.vim rename to bundle/vim-addon-mw-utils/autoload/buf_utils.vim diff --git a/sources_non_forked/vim-addon-mw-utils/autoload/cached_file_contents.vim b/bundle/vim-addon-mw-utils/autoload/cached_file_contents.vim similarity index 100% rename from sources_non_forked/vim-addon-mw-utils/autoload/cached_file_contents.vim rename to bundle/vim-addon-mw-utils/autoload/cached_file_contents.vim diff --git a/sources_non_forked/vim-addon-mw-utils/autoload/env_reload.vim b/bundle/vim-addon-mw-utils/autoload/env_reload.vim similarity index 100% rename from sources_non_forked/vim-addon-mw-utils/autoload/env_reload.vim rename to bundle/vim-addon-mw-utils/autoload/env_reload.vim diff --git a/sources_non_forked/vim-addon-mw-utils/autoload/funcref.vim b/bundle/vim-addon-mw-utils/autoload/funcref.vim similarity index 100% rename from sources_non_forked/vim-addon-mw-utils/autoload/funcref.vim rename to bundle/vim-addon-mw-utils/autoload/funcref.vim diff --git a/sources_non_forked/vim-addon-mw-utils/autoload/glob.vim b/bundle/vim-addon-mw-utils/autoload/glob.vim similarity index 100% rename from sources_non_forked/vim-addon-mw-utils/autoload/glob.vim rename to bundle/vim-addon-mw-utils/autoload/glob.vim diff --git a/sources_non_forked/vim-addon-mw-utils/autoload/tiny_cmd.vim b/bundle/vim-addon-mw-utils/autoload/tiny_cmd.vim similarity index 100% rename from sources_non_forked/vim-addon-mw-utils/autoload/tiny_cmd.vim rename to bundle/vim-addon-mw-utils/autoload/tiny_cmd.vim diff --git a/sources_non_forked/vim-addon-mw-utils/autoload/tovl/scratch_buffer.vim b/bundle/vim-addon-mw-utils/autoload/tovl/scratch_buffer.vim similarity index 100% rename from sources_non_forked/vim-addon-mw-utils/autoload/tovl/scratch_buffer.vim rename to bundle/vim-addon-mw-utils/autoload/tovl/scratch_buffer.vim diff --git a/sources_non_forked/vim-addon-mw-utils/autoload/tovl/ui/filter_list.vim b/bundle/vim-addon-mw-utils/autoload/tovl/ui/filter_list.vim similarity index 100% rename from sources_non_forked/vim-addon-mw-utils/autoload/tovl/ui/filter_list.vim rename to bundle/vim-addon-mw-utils/autoload/tovl/ui/filter_list.vim diff --git a/sources_non_forked/vim-addon-mw-utils/doc/cached_file_contents.txt b/bundle/vim-addon-mw-utils/doc/cached_file_contents.txt similarity index 100% rename from sources_non_forked/vim-addon-mw-utils/doc/cached_file_contents.txt rename to bundle/vim-addon-mw-utils/doc/cached_file_contents.txt diff --git a/sources_non_forked/vim-addon-mw-utils/doc/funcref.txt b/bundle/vim-addon-mw-utils/doc/funcref.txt similarity index 100% rename from sources_non_forked/vim-addon-mw-utils/doc/funcref.txt rename to bundle/vim-addon-mw-utils/doc/funcref.txt diff --git a/sources_non_forked/vim-addon-mw-utils/doc/tiny_cmd.txt b/bundle/vim-addon-mw-utils/doc/tiny_cmd.txt similarity index 100% rename from sources_non_forked/vim-addon-mw-utils/doc/tiny_cmd.txt rename to bundle/vim-addon-mw-utils/doc/tiny_cmd.txt diff --git a/sources_non_forked/vim-addon-mw-utils/vim-addon-mw-utils-addon-info.txt b/bundle/vim-addon-mw-utils/vim-addon-mw-utils-addon-info.txt similarity index 100% rename from sources_non_forked/vim-addon-mw-utils/vim-addon-mw-utils-addon-info.txt rename to bundle/vim-addon-mw-utils/vim-addon-mw-utils-addon-info.txt diff --git a/sources_non_forked/vim-airline/.gitignore b/bundle/vim-airline/.gitignore similarity index 100% rename from sources_non_forked/vim-airline/.gitignore rename to bundle/vim-airline/.gitignore diff --git a/sources_non_forked/vim-airline/.travis.yml b/bundle/vim-airline/.travis.yml similarity index 100% rename from sources_non_forked/vim-airline/.travis.yml rename to bundle/vim-airline/.travis.yml diff --git a/sources_non_forked/vim-airline/Gemfile b/bundle/vim-airline/Gemfile similarity index 100% rename from sources_non_forked/vim-airline/Gemfile rename to bundle/vim-airline/Gemfile diff --git a/sources_non_forked/vim-airline/LICENSE b/bundle/vim-airline/LICENSE similarity index 100% rename from sources_non_forked/vim-airline/LICENSE rename to bundle/vim-airline/LICENSE diff --git a/sources_non_forked/vim-airline/README.md b/bundle/vim-airline/README.md similarity index 100% rename from sources_non_forked/vim-airline/README.md rename to bundle/vim-airline/README.md diff --git a/sources_non_forked/vim-airline/Rakefile b/bundle/vim-airline/Rakefile similarity index 100% rename from sources_non_forked/vim-airline/Rakefile rename to bundle/vim-airline/Rakefile diff --git a/sources_non_forked/vim-airline/autoload/airline.vim b/bundle/vim-airline/autoload/airline.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline.vim rename to bundle/vim-airline/autoload/airline.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/builder.vim b/bundle/vim-airline/autoload/airline/builder.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/builder.vim rename to bundle/vim-airline/autoload/airline/builder.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/debug.vim b/bundle/vim-airline/autoload/airline/debug.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/debug.vim rename to bundle/vim-airline/autoload/airline/debug.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/deprecation.vim b/bundle/vim-airline/autoload/airline/deprecation.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/deprecation.vim rename to bundle/vim-airline/autoload/airline/deprecation.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions.vim b/bundle/vim-airline/autoload/airline/extensions.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/extensions.vim rename to bundle/vim-airline/autoload/airline/extensions.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim b/bundle/vim-airline/autoload/airline/extensions/branch.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim rename to bundle/vim-airline/autoload/airline/extensions/branch.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/bufferline.vim b/bundle/vim-airline/autoload/airline/extensions/bufferline.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/extensions/bufferline.vim rename to bundle/vim-airline/autoload/airline/extensions/bufferline.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/commandt.vim b/bundle/vim-airline/autoload/airline/extensions/commandt.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/extensions/commandt.vim rename to bundle/vim-airline/autoload/airline/extensions/commandt.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/csv.vim b/bundle/vim-airline/autoload/airline/extensions/csv.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/extensions/csv.vim rename to bundle/vim-airline/autoload/airline/extensions/csv.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/ctrlp.vim b/bundle/vim-airline/autoload/airline/extensions/ctrlp.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/extensions/ctrlp.vim rename to bundle/vim-airline/autoload/airline/extensions/ctrlp.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/default.vim b/bundle/vim-airline/autoload/airline/extensions/default.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/extensions/default.vim rename to bundle/vim-airline/autoload/airline/extensions/default.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/eclim.vim b/bundle/vim-airline/autoload/airline/extensions/eclim.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/extensions/eclim.vim rename to bundle/vim-airline/autoload/airline/extensions/eclim.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/example.vim b/bundle/vim-airline/autoload/airline/extensions/example.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/extensions/example.vim rename to bundle/vim-airline/autoload/airline/extensions/example.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/hunks.vim b/bundle/vim-airline/autoload/airline/extensions/hunks.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/extensions/hunks.vim rename to bundle/vim-airline/autoload/airline/extensions/hunks.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/netrw.vim b/bundle/vim-airline/autoload/airline/extensions/netrw.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/extensions/netrw.vim rename to bundle/vim-airline/autoload/airline/extensions/netrw.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/promptline.vim b/bundle/vim-airline/autoload/airline/extensions/promptline.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/extensions/promptline.vim rename to bundle/vim-airline/autoload/airline/extensions/promptline.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/quickfix.vim b/bundle/vim-airline/autoload/airline/extensions/quickfix.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/extensions/quickfix.vim rename to bundle/vim-airline/autoload/airline/extensions/quickfix.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/syntastic.vim b/bundle/vim-airline/autoload/airline/extensions/syntastic.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/extensions/syntastic.vim rename to bundle/vim-airline/autoload/airline/extensions/syntastic.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim b/bundle/vim-airline/autoload/airline/extensions/tabline.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim rename to bundle/vim-airline/autoload/airline/extensions/tabline.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/default.vim b/bundle/vim-airline/autoload/airline/extensions/tabline/default.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/extensions/tabline/default.vim rename to bundle/vim-airline/autoload/airline/extensions/tabline/default.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail.vim b/bundle/vim-airline/autoload/airline/extensions/tabline/unique_tail.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail.vim rename to bundle/vim-airline/autoload/airline/extensions/tabline/unique_tail.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim b/bundle/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim rename to bundle/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tagbar.vim b/bundle/vim-airline/autoload/airline/extensions/tagbar.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/extensions/tagbar.vim rename to bundle/vim-airline/autoload/airline/extensions/tagbar.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tmuxline.vim b/bundle/vim-airline/autoload/airline/extensions/tmuxline.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/extensions/tmuxline.vim rename to bundle/vim-airline/autoload/airline/extensions/tmuxline.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/undotree.vim b/bundle/vim-airline/autoload/airline/extensions/undotree.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/extensions/undotree.vim rename to bundle/vim-airline/autoload/airline/extensions/undotree.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/unite.vim b/bundle/vim-airline/autoload/airline/extensions/unite.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/extensions/unite.vim rename to bundle/vim-airline/autoload/airline/extensions/unite.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/virtualenv.vim b/bundle/vim-airline/autoload/airline/extensions/virtualenv.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/extensions/virtualenv.vim rename to bundle/vim-airline/autoload/airline/extensions/virtualenv.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim b/bundle/vim-airline/autoload/airline/extensions/whitespace.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim rename to bundle/vim-airline/autoload/airline/extensions/whitespace.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/highlighter.vim b/bundle/vim-airline/autoload/airline/highlighter.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/highlighter.vim rename to bundle/vim-airline/autoload/airline/highlighter.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/init.vim b/bundle/vim-airline/autoload/airline/init.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/init.vim rename to bundle/vim-airline/autoload/airline/init.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/parts.vim b/bundle/vim-airline/autoload/airline/parts.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/parts.vim rename to bundle/vim-airline/autoload/airline/parts.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/section.vim b/bundle/vim-airline/autoload/airline/section.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/section.vim rename to bundle/vim-airline/autoload/airline/section.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/themes.vim b/bundle/vim-airline/autoload/airline/themes.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/themes.vim rename to bundle/vim-airline/autoload/airline/themes.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/badwolf.vim b/bundle/vim-airline/autoload/airline/themes/badwolf.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/themes/badwolf.vim rename to bundle/vim-airline/autoload/airline/themes/badwolf.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/base16.vim b/bundle/vim-airline/autoload/airline/themes/base16.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/themes/base16.vim rename to bundle/vim-airline/autoload/airline/themes/base16.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/bubblegum.vim b/bundle/vim-airline/autoload/airline/themes/bubblegum.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/themes/bubblegum.vim rename to bundle/vim-airline/autoload/airline/themes/bubblegum.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/dark.vim b/bundle/vim-airline/autoload/airline/themes/dark.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/themes/dark.vim rename to bundle/vim-airline/autoload/airline/themes/dark.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/hybrid.vim b/bundle/vim-airline/autoload/airline/themes/hybrid.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/themes/hybrid.vim rename to bundle/vim-airline/autoload/airline/themes/hybrid.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/jellybeans.vim b/bundle/vim-airline/autoload/airline/themes/jellybeans.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/themes/jellybeans.vim rename to bundle/vim-airline/autoload/airline/themes/jellybeans.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/kalisi.vim b/bundle/vim-airline/autoload/airline/themes/kalisi.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/themes/kalisi.vim rename to bundle/vim-airline/autoload/airline/themes/kalisi.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/kolor.vim b/bundle/vim-airline/autoload/airline/themes/kolor.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/themes/kolor.vim rename to bundle/vim-airline/autoload/airline/themes/kolor.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/laederon.vim b/bundle/vim-airline/autoload/airline/themes/laederon.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/themes/laederon.vim rename to bundle/vim-airline/autoload/airline/themes/laederon.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/light.vim b/bundle/vim-airline/autoload/airline/themes/light.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/themes/light.vim rename to bundle/vim-airline/autoload/airline/themes/light.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/lucius.vim b/bundle/vim-airline/autoload/airline/themes/lucius.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/themes/lucius.vim rename to bundle/vim-airline/autoload/airline/themes/lucius.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/luna.vim b/bundle/vim-airline/autoload/airline/themes/luna.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/themes/luna.vim rename to bundle/vim-airline/autoload/airline/themes/luna.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/molokai.vim b/bundle/vim-airline/autoload/airline/themes/molokai.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/themes/molokai.vim rename to bundle/vim-airline/autoload/airline/themes/molokai.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/monochrome.vim b/bundle/vim-airline/autoload/airline/themes/monochrome.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/themes/monochrome.vim rename to bundle/vim-airline/autoload/airline/themes/monochrome.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/murmur.vim b/bundle/vim-airline/autoload/airline/themes/murmur.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/themes/murmur.vim rename to bundle/vim-airline/autoload/airline/themes/murmur.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/powerlineish.vim b/bundle/vim-airline/autoload/airline/themes/powerlineish.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/themes/powerlineish.vim rename to bundle/vim-airline/autoload/airline/themes/powerlineish.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/serene.vim b/bundle/vim-airline/autoload/airline/themes/serene.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/themes/serene.vim rename to bundle/vim-airline/autoload/airline/themes/serene.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/simple.vim b/bundle/vim-airline/autoload/airline/themes/simple.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/themes/simple.vim rename to bundle/vim-airline/autoload/airline/themes/simple.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/sol.vim b/bundle/vim-airline/autoload/airline/themes/sol.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/themes/sol.vim rename to bundle/vim-airline/autoload/airline/themes/sol.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/solarized.vim b/bundle/vim-airline/autoload/airline/themes/solarized.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/themes/solarized.vim rename to bundle/vim-airline/autoload/airline/themes/solarized.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/tomorrow.vim b/bundle/vim-airline/autoload/airline/themes/tomorrow.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/themes/tomorrow.vim rename to bundle/vim-airline/autoload/airline/themes/tomorrow.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/ubaryd.vim b/bundle/vim-airline/autoload/airline/themes/ubaryd.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/themes/ubaryd.vim rename to bundle/vim-airline/autoload/airline/themes/ubaryd.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/understated.vim b/bundle/vim-airline/autoload/airline/themes/understated.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/themes/understated.vim rename to bundle/vim-airline/autoload/airline/themes/understated.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/wombat.vim b/bundle/vim-airline/autoload/airline/themes/wombat.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/themes/wombat.vim rename to bundle/vim-airline/autoload/airline/themes/wombat.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/zenburn.vim b/bundle/vim-airline/autoload/airline/themes/zenburn.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/themes/zenburn.vim rename to bundle/vim-airline/autoload/airline/themes/zenburn.vim diff --git a/sources_non_forked/vim-airline/autoload/airline/util.vim b/bundle/vim-airline/autoload/airline/util.vim similarity index 100% rename from sources_non_forked/vim-airline/autoload/airline/util.vim rename to bundle/vim-airline/autoload/airline/util.vim diff --git a/sources_non_forked/vim-airline/doc/airline.txt b/bundle/vim-airline/doc/airline.txt similarity index 100% rename from sources_non_forked/vim-airline/doc/airline.txt rename to bundle/vim-airline/doc/airline.txt diff --git a/sources_non_forked/vim-airline/plugin/airline.vim b/bundle/vim-airline/plugin/airline.vim similarity index 100% rename from sources_non_forked/vim-airline/plugin/airline.vim rename to bundle/vim-airline/plugin/airline.vim diff --git a/sources_non_forked/vim-airline/t/airline.vim b/bundle/vim-airline/t/airline.vim similarity index 100% rename from sources_non_forked/vim-airline/t/airline.vim rename to bundle/vim-airline/t/airline.vim diff --git a/sources_non_forked/vim-airline/t/builder.vim b/bundle/vim-airline/t/builder.vim similarity index 100% rename from sources_non_forked/vim-airline/t/builder.vim rename to bundle/vim-airline/t/builder.vim diff --git a/sources_non_forked/vim-airline/t/commands.vim b/bundle/vim-airline/t/commands.vim similarity index 100% rename from sources_non_forked/vim-airline/t/commands.vim rename to bundle/vim-airline/t/commands.vim diff --git a/sources_non_forked/vim-airline/t/extensions_default.vim b/bundle/vim-airline/t/extensions_default.vim similarity index 100% rename from sources_non_forked/vim-airline/t/extensions_default.vim rename to bundle/vim-airline/t/extensions_default.vim diff --git a/sources_non_forked/vim-airline/t/highlighter.vim b/bundle/vim-airline/t/highlighter.vim similarity index 100% rename from sources_non_forked/vim-airline/t/highlighter.vim rename to bundle/vim-airline/t/highlighter.vim diff --git a/sources_non_forked/vim-airline/t/init.vim b/bundle/vim-airline/t/init.vim similarity index 100% rename from sources_non_forked/vim-airline/t/init.vim rename to bundle/vim-airline/t/init.vim diff --git a/sources_non_forked/vim-airline/t/parts.vim b/bundle/vim-airline/t/parts.vim similarity index 100% rename from sources_non_forked/vim-airline/t/parts.vim rename to bundle/vim-airline/t/parts.vim diff --git a/sources_non_forked/vim-airline/t/section.vim b/bundle/vim-airline/t/section.vim similarity index 100% rename from sources_non_forked/vim-airline/t/section.vim rename to bundle/vim-airline/t/section.vim diff --git a/sources_non_forked/vim-airline/t/themes.vim b/bundle/vim-airline/t/themes.vim similarity index 100% rename from sources_non_forked/vim-airline/t/themes.vim rename to bundle/vim-airline/t/themes.vim diff --git a/sources_non_forked/vim-airline/t/util.vim b/bundle/vim-airline/t/util.vim similarity index 100% rename from sources_non_forked/vim-airline/t/util.vim rename to bundle/vim-airline/t/util.vim diff --git a/sources_non_forked/vim-bundle-mako/README b/bundle/vim-bundle-mako/README similarity index 100% rename from sources_non_forked/vim-bundle-mako/README rename to bundle/vim-bundle-mako/README diff --git a/sources_non_forked/vim-bundle-mako/ftdetect/mako.vim b/bundle/vim-bundle-mako/ftdetect/mako.vim similarity index 100% rename from sources_non_forked/vim-bundle-mako/ftdetect/mako.vim rename to bundle/vim-bundle-mako/ftdetect/mako.vim diff --git a/sources_non_forked/vim-bundle-mako/ftplugin/mako.vim b/bundle/vim-bundle-mako/ftplugin/mako.vim similarity index 100% rename from sources_non_forked/vim-bundle-mako/ftplugin/mako.vim rename to bundle/vim-bundle-mako/ftplugin/mako.vim diff --git a/sources_non_forked/vim-bundle-mako/indent/mako.vim b/bundle/vim-bundle-mako/indent/mako.vim similarity index 100% rename from sources_non_forked/vim-bundle-mako/indent/mako.vim rename to bundle/vim-bundle-mako/indent/mako.vim diff --git a/sources_non_forked/vim-bundle-mako/syntax/mako.vim b/bundle/vim-bundle-mako/syntax/mako.vim similarity index 100% rename from sources_non_forked/vim-bundle-mako/syntax/mako.vim rename to bundle/vim-bundle-mako/syntax/mako.vim diff --git a/sources_non_forked/vim-coffee-script/.gitignore b/bundle/vim-coffee-script/.gitignore similarity index 100% rename from sources_non_forked/vim-coffee-script/.gitignore rename to bundle/vim-coffee-script/.gitignore diff --git a/sources_non_forked/vim-coffee-script/Copying.md b/bundle/vim-coffee-script/Copying.md similarity index 100% rename from sources_non_forked/vim-coffee-script/Copying.md rename to bundle/vim-coffee-script/Copying.md diff --git a/sources_non_forked/vim-coffee-script/Makefile b/bundle/vim-coffee-script/Makefile similarity index 100% rename from sources_non_forked/vim-coffee-script/Makefile rename to bundle/vim-coffee-script/Makefile diff --git a/sources_non_forked/vim-coffee-script/News.md b/bundle/vim-coffee-script/News.md similarity index 100% rename from sources_non_forked/vim-coffee-script/News.md rename to bundle/vim-coffee-script/News.md diff --git a/sources_non_forked/vim-coffee-script/Readme.md b/bundle/vim-coffee-script/Readme.md similarity index 100% rename from sources_non_forked/vim-coffee-script/Readme.md rename to bundle/vim-coffee-script/Readme.md diff --git a/sources_non_forked/vim-coffee-script/Thanks.md b/bundle/vim-coffee-script/Thanks.md similarity index 100% rename from sources_non_forked/vim-coffee-script/Thanks.md rename to bundle/vim-coffee-script/Thanks.md diff --git a/sources_non_forked/vim-coffee-script/Todo.md b/bundle/vim-coffee-script/Todo.md similarity index 100% rename from sources_non_forked/vim-coffee-script/Todo.md rename to bundle/vim-coffee-script/Todo.md diff --git a/sources_non_forked/vim-coffee-script/after/indent/html.vim b/bundle/vim-coffee-script/after/indent/html.vim similarity index 100% rename from sources_non_forked/vim-coffee-script/after/indent/html.vim rename to bundle/vim-coffee-script/after/indent/html.vim diff --git a/sources_non_forked/vim-coffee-script/after/syntax/haml.vim b/bundle/vim-coffee-script/after/syntax/haml.vim similarity index 100% rename from sources_non_forked/vim-coffee-script/after/syntax/haml.vim rename to bundle/vim-coffee-script/after/syntax/haml.vim diff --git a/sources_non_forked/vim-coffee-script/after/syntax/html.vim b/bundle/vim-coffee-script/after/syntax/html.vim similarity index 100% rename from sources_non_forked/vim-coffee-script/after/syntax/html.vim rename to bundle/vim-coffee-script/after/syntax/html.vim diff --git a/sources_non_forked/vim-coffee-script/autoload/coffee.vim b/bundle/vim-coffee-script/autoload/coffee.vim similarity index 100% rename from sources_non_forked/vim-coffee-script/autoload/coffee.vim rename to bundle/vim-coffee-script/autoload/coffee.vim diff --git a/sources_non_forked/vim-coffee-script/compiler/cake.vim b/bundle/vim-coffee-script/compiler/cake.vim similarity index 100% rename from sources_non_forked/vim-coffee-script/compiler/cake.vim rename to bundle/vim-coffee-script/compiler/cake.vim diff --git a/sources_non_forked/vim-coffee-script/compiler/coffee.vim b/bundle/vim-coffee-script/compiler/coffee.vim similarity index 100% rename from sources_non_forked/vim-coffee-script/compiler/coffee.vim rename to bundle/vim-coffee-script/compiler/coffee.vim diff --git a/sources_non_forked/vim-coffee-script/doc/coffee-script.txt b/bundle/vim-coffee-script/doc/coffee-script.txt similarity index 100% rename from sources_non_forked/vim-coffee-script/doc/coffee-script.txt rename to bundle/vim-coffee-script/doc/coffee-script.txt diff --git a/sources_non_forked/vim-coffee-script/ftdetect/coffee.vim b/bundle/vim-coffee-script/ftdetect/coffee.vim similarity index 100% rename from sources_non_forked/vim-coffee-script/ftdetect/coffee.vim rename to bundle/vim-coffee-script/ftdetect/coffee.vim diff --git a/sources_non_forked/vim-coffee-script/ftplugin/coffee.vim b/bundle/vim-coffee-script/ftplugin/coffee.vim similarity index 100% rename from sources_non_forked/vim-coffee-script/ftplugin/coffee.vim rename to bundle/vim-coffee-script/ftplugin/coffee.vim diff --git a/sources_non_forked/vim-coffee-script/indent/coffee.vim b/bundle/vim-coffee-script/indent/coffee.vim similarity index 100% rename from sources_non_forked/vim-coffee-script/indent/coffee.vim rename to bundle/vim-coffee-script/indent/coffee.vim diff --git a/sources_non_forked/vim-coffee-script/syntax/coffee.vim b/bundle/vim-coffee-script/syntax/coffee.vim similarity index 100% rename from sources_non_forked/vim-coffee-script/syntax/coffee.vim rename to bundle/vim-coffee-script/syntax/coffee.vim diff --git a/sources_non_forked/vim-coffee-script/test/test-interp.coffee b/bundle/vim-coffee-script/test/test-interp.coffee similarity index 100% rename from sources_non_forked/vim-coffee-script/test/test-interp.coffee rename to bundle/vim-coffee-script/test/test-interp.coffee diff --git a/sources_non_forked/vim-coffee-script/test/test-ops.coffee b/bundle/vim-coffee-script/test/test-ops.coffee similarity index 100% rename from sources_non_forked/vim-coffee-script/test/test-ops.coffee rename to bundle/vim-coffee-script/test/test-ops.coffee diff --git a/sources_non_forked/vim-coffee-script/test/test-reserved.coffee b/bundle/vim-coffee-script/test/test-reserved.coffee similarity index 100% rename from sources_non_forked/vim-coffee-script/test/test-reserved.coffee rename to bundle/vim-coffee-script/test/test-reserved.coffee diff --git a/sources_non_forked/vim-coffee-script/test/test.haml b/bundle/vim-coffee-script/test/test.haml similarity index 100% rename from sources_non_forked/vim-coffee-script/test/test.haml rename to bundle/vim-coffee-script/test/test.haml diff --git a/sources_non_forked/vim-coffee-script/test/test.html b/bundle/vim-coffee-script/test/test.html similarity index 100% rename from sources_non_forked/vim-coffee-script/test/test.html rename to bundle/vim-coffee-script/test/test.html diff --git a/sources_non_forked/vim-colors-solarized/README.mkd b/bundle/vim-colors-solarized/README.mkd similarity index 100% rename from sources_non_forked/vim-colors-solarized/README.mkd rename to bundle/vim-colors-solarized/README.mkd diff --git a/sources_non_forked/vim-colors-solarized/autoload/togglebg.vim b/bundle/vim-colors-solarized/autoload/togglebg.vim similarity index 100% rename from sources_non_forked/vim-colors-solarized/autoload/togglebg.vim rename to bundle/vim-colors-solarized/autoload/togglebg.vim diff --git a/sources_non_forked/vim-colors-solarized/bitmaps/togglebg.png b/bundle/vim-colors-solarized/bitmaps/togglebg.png similarity index 100% rename from sources_non_forked/vim-colors-solarized/bitmaps/togglebg.png rename to bundle/vim-colors-solarized/bitmaps/togglebg.png diff --git a/sources_non_forked/vim-colors-solarized/colors/solarized.vim b/bundle/vim-colors-solarized/colors/solarized.vim similarity index 100% rename from sources_non_forked/vim-colors-solarized/colors/solarized.vim rename to bundle/vim-colors-solarized/colors/solarized.vim diff --git a/sources_non_forked/vim-colors-solarized/doc/solarized.txt b/bundle/vim-colors-solarized/doc/solarized.txt similarity index 100% rename from sources_non_forked/vim-colors-solarized/doc/solarized.txt rename to bundle/vim-colors-solarized/doc/solarized.txt diff --git a/sources_non_forked/vim-commentary/.gitignore b/bundle/vim-commentary/.gitignore similarity index 100% rename from sources_non_forked/vim-commentary/.gitignore rename to bundle/vim-commentary/.gitignore diff --git a/sources_non_forked/vim-commentary/CONTRIBUTING.markdown b/bundle/vim-commentary/CONTRIBUTING.markdown similarity index 100% rename from sources_non_forked/vim-commentary/CONTRIBUTING.markdown rename to bundle/vim-commentary/CONTRIBUTING.markdown diff --git a/sources_non_forked/vim-commentary/README.markdown b/bundle/vim-commentary/README.markdown similarity index 100% rename from sources_non_forked/vim-commentary/README.markdown rename to bundle/vim-commentary/README.markdown diff --git a/sources_non_forked/vim-commentary/doc/commentary.txt b/bundle/vim-commentary/doc/commentary.txt similarity index 100% rename from sources_non_forked/vim-commentary/doc/commentary.txt rename to bundle/vim-commentary/doc/commentary.txt diff --git a/sources_non_forked/vim-commentary/plugin/commentary.vim b/bundle/vim-commentary/plugin/commentary.vim similarity index 100% rename from sources_non_forked/vim-commentary/plugin/commentary.vim rename to bundle/vim-commentary/plugin/commentary.vim diff --git a/sources_non_forked/vim-csharp b/bundle/vim-csharp similarity index 100% rename from sources_non_forked/vim-csharp rename to bundle/vim-csharp diff --git a/sources_non_forked/vim-css-color b/bundle/vim-css-color similarity index 100% rename from sources_non_forked/vim-css-color rename to bundle/vim-css-color diff --git a/sources_non_forked/vim-css3-syntax b/bundle/vim-css3-syntax similarity index 100% rename from sources_non_forked/vim-css3-syntax rename to bundle/vim-css3-syntax diff --git a/sources_non_forked/vim-cucumber b/bundle/vim-cucumber similarity index 100% rename from sources_non_forked/vim-cucumber rename to bundle/vim-cucumber diff --git a/sources_non_forked/vim-expand-region/MIT-LICENSE.txt b/bundle/vim-expand-region/MIT-LICENSE.txt similarity index 100% rename from sources_non_forked/vim-expand-region/MIT-LICENSE.txt rename to bundle/vim-expand-region/MIT-LICENSE.txt diff --git a/sources_non_forked/vim-expand-region/README.md b/bundle/vim-expand-region/README.md similarity index 100% rename from sources_non_forked/vim-expand-region/README.md rename to bundle/vim-expand-region/README.md diff --git a/sources_non_forked/vim-expand-region/autoload/expand_region.vim b/bundle/vim-expand-region/autoload/expand_region.vim similarity index 100% rename from sources_non_forked/vim-expand-region/autoload/expand_region.vim rename to bundle/vim-expand-region/autoload/expand_region.vim diff --git a/sources_non_forked/vim-expand-region/doc/expand_region.txt b/bundle/vim-expand-region/doc/expand_region.txt similarity index 100% rename from sources_non_forked/vim-expand-region/doc/expand_region.txt rename to bundle/vim-expand-region/doc/expand_region.txt diff --git a/sources_non_forked/vim-expand-region/expand-region.gif b/bundle/vim-expand-region/expand-region.gif similarity index 100% rename from sources_non_forked/vim-expand-region/expand-region.gif rename to bundle/vim-expand-region/expand-region.gif diff --git a/sources_non_forked/vim-expand-region/plugin/expand_region.vim b/bundle/vim-expand-region/plugin/expand_region.vim similarity index 100% rename from sources_non_forked/vim-expand-region/plugin/expand_region.vim rename to bundle/vim-expand-region/plugin/expand_region.vim diff --git a/sources_non_forked/vim-fugitive/.gitignore b/bundle/vim-fugitive/.gitignore similarity index 100% rename from sources_non_forked/vim-fugitive/.gitignore rename to bundle/vim-fugitive/.gitignore diff --git a/sources_non_forked/vim-fugitive/CONTRIBUTING.markdown b/bundle/vim-fugitive/CONTRIBUTING.markdown similarity index 100% rename from sources_non_forked/vim-fugitive/CONTRIBUTING.markdown rename to bundle/vim-fugitive/CONTRIBUTING.markdown diff --git a/sources_non_forked/vim-fugitive/README.markdown b/bundle/vim-fugitive/README.markdown similarity index 100% rename from sources_non_forked/vim-fugitive/README.markdown rename to bundle/vim-fugitive/README.markdown diff --git a/sources_non_forked/vim-fugitive/doc/fugitive.txt b/bundle/vim-fugitive/doc/fugitive.txt similarity index 100% rename from sources_non_forked/vim-fugitive/doc/fugitive.txt rename to bundle/vim-fugitive/doc/fugitive.txt diff --git a/sources_non_forked/vim-fugitive/plugin/fugitive.vim b/bundle/vim-fugitive/plugin/fugitive.vim similarity index 100% rename from sources_non_forked/vim-fugitive/plugin/fugitive.vim rename to bundle/vim-fugitive/plugin/fugitive.vim diff --git a/sources_non_forked/vim-golang/autoload/go/complete.vim b/bundle/vim-golang/autoload/go/complete.vim similarity index 100% rename from sources_non_forked/vim-golang/autoload/go/complete.vim rename to bundle/vim-golang/autoload/go/complete.vim diff --git a/sources_non_forked/vim-golang/compiler/go.vim b/bundle/vim-golang/compiler/go.vim similarity index 100% rename from sources_non_forked/vim-golang/compiler/go.vim rename to bundle/vim-golang/compiler/go.vim diff --git a/sources_non_forked/vim-golang/ftdetect/gofiletype.vim b/bundle/vim-golang/ftdetect/gofiletype.vim similarity index 100% rename from sources_non_forked/vim-golang/ftdetect/gofiletype.vim rename to bundle/vim-golang/ftdetect/gofiletype.vim diff --git a/sources_non_forked/vim-golang/ftplugin/go.vim b/bundle/vim-golang/ftplugin/go.vim similarity index 100% rename from sources_non_forked/vim-golang/ftplugin/go.vim rename to bundle/vim-golang/ftplugin/go.vim diff --git a/sources_non_forked/vim-golang/ftplugin/go/fmt.vim b/bundle/vim-golang/ftplugin/go/fmt.vim similarity index 100% rename from sources_non_forked/vim-golang/ftplugin/go/fmt.vim rename to bundle/vim-golang/ftplugin/go/fmt.vim diff --git a/sources_non_forked/vim-golang/ftplugin/go/import.vim b/bundle/vim-golang/ftplugin/go/import.vim similarity index 100% rename from sources_non_forked/vim-golang/ftplugin/go/import.vim rename to bundle/vim-golang/ftplugin/go/import.vim diff --git a/sources_non_forked/vim-golang/ftplugin/go/test.sh b/bundle/vim-golang/ftplugin/go/test.sh similarity index 100% rename from sources_non_forked/vim-golang/ftplugin/go/test.sh rename to bundle/vim-golang/ftplugin/go/test.sh diff --git a/sources_non_forked/vim-golang/indent/go.vim b/bundle/vim-golang/indent/go.vim similarity index 100% rename from sources_non_forked/vim-golang/indent/go.vim rename to bundle/vim-golang/indent/go.vim diff --git a/sources_non_forked/vim-golang/mirror.txt b/bundle/vim-golang/mirror.txt similarity index 100% rename from sources_non_forked/vim-golang/mirror.txt rename to bundle/vim-golang/mirror.txt diff --git a/sources_non_forked/vim-golang/plugin/godoc.vim b/bundle/vim-golang/plugin/godoc.vim similarity index 100% rename from sources_non_forked/vim-golang/plugin/godoc.vim rename to bundle/vim-golang/plugin/godoc.vim diff --git a/sources_non_forked/vim-golang/readme.txt b/bundle/vim-golang/readme.txt similarity index 100% rename from sources_non_forked/vim-golang/readme.txt rename to bundle/vim-golang/readme.txt diff --git a/sources_non_forked/vim-golang/syntax/go.vim b/bundle/vim-golang/syntax/go.vim similarity index 100% rename from sources_non_forked/vim-golang/syntax/go.vim rename to bundle/vim-golang/syntax/go.vim diff --git a/sources_non_forked/vim-golang/syntax/godoc.vim b/bundle/vim-golang/syntax/godoc.vim similarity index 100% rename from sources_non_forked/vim-golang/syntax/godoc.vim rename to bundle/vim-golang/syntax/godoc.vim diff --git a/sources_non_forked/vim-haml b/bundle/vim-haml similarity index 100% rename from sources_non_forked/vim-haml rename to bundle/vim-haml diff --git a/sources_non_forked/vim-indent-object/.gitignore b/bundle/vim-indent-object/.gitignore similarity index 100% rename from sources_non_forked/vim-indent-object/.gitignore rename to bundle/vim-indent-object/.gitignore diff --git a/sources_non_forked/vim-indent-object/doc/indent-object.txt b/bundle/vim-indent-object/doc/indent-object.txt similarity index 100% rename from sources_non_forked/vim-indent-object/doc/indent-object.txt rename to bundle/vim-indent-object/doc/indent-object.txt diff --git a/sources_non_forked/vim-indent-object/plugin/indent-object.vim b/bundle/vim-indent-object/plugin/indent-object.vim similarity index 100% rename from sources_non_forked/vim-indent-object/plugin/indent-object.vim rename to bundle/vim-indent-object/plugin/indent-object.vim diff --git a/sources_non_forked/vim-javascript b/bundle/vim-javascript similarity index 100% rename from sources_non_forked/vim-javascript rename to bundle/vim-javascript diff --git a/sources_non_forked/vim-less/.gitignore b/bundle/vim-less/.gitignore similarity index 100% rename from sources_non_forked/vim-less/.gitignore rename to bundle/vim-less/.gitignore diff --git a/sources_non_forked/vim-less/README.md b/bundle/vim-less/README.md similarity index 100% rename from sources_non_forked/vim-less/README.md rename to bundle/vim-less/README.md diff --git a/sources_non_forked/vim-less/ftdetect/less.vim b/bundle/vim-less/ftdetect/less.vim similarity index 100% rename from sources_non_forked/vim-less/ftdetect/less.vim rename to bundle/vim-less/ftdetect/less.vim diff --git a/sources_non_forked/vim-less/ftplugin/less.vim b/bundle/vim-less/ftplugin/less.vim similarity index 100% rename from sources_non_forked/vim-less/ftplugin/less.vim rename to bundle/vim-less/ftplugin/less.vim diff --git a/sources_non_forked/vim-less/indent/less.vim b/bundle/vim-less/indent/less.vim similarity index 100% rename from sources_non_forked/vim-less/indent/less.vim rename to bundle/vim-less/indent/less.vim diff --git a/sources_non_forked/vim-less/screenshot.png b/bundle/vim-less/screenshot.png similarity index 100% rename from sources_non_forked/vim-less/screenshot.png rename to bundle/vim-less/screenshot.png diff --git a/sources_non_forked/vim-less/syntax/less.vim b/bundle/vim-less/syntax/less.vim similarity index 100% rename from sources_non_forked/vim-less/syntax/less.vim rename to bundle/vim-less/syntax/less.vim diff --git a/sources_non_forked/vim-markdown/ftdetect/markdown.vim b/bundle/vim-markdown/ftdetect/markdown.vim similarity index 100% rename from sources_non_forked/vim-markdown/ftdetect/markdown.vim rename to bundle/vim-markdown/ftdetect/markdown.vim diff --git a/sources_non_forked/vim-markdown/ftplugin/markdown.vim b/bundle/vim-markdown/ftplugin/markdown.vim similarity index 100% rename from sources_non_forked/vim-markdown/ftplugin/markdown.vim rename to bundle/vim-markdown/ftplugin/markdown.vim diff --git a/sources_non_forked/vim-markdown/syntax/markdown.vim b/bundle/vim-markdown/syntax/markdown.vim similarity index 100% rename from sources_non_forked/vim-markdown/syntax/markdown.vim rename to bundle/vim-markdown/syntax/markdown.vim diff --git a/sources_non_forked/vim-multiple-cursors/.rspec b/bundle/vim-multiple-cursors/.rspec similarity index 100% rename from sources_non_forked/vim-multiple-cursors/.rspec rename to bundle/vim-multiple-cursors/.rspec diff --git a/sources_non_forked/vim-multiple-cursors/.travis.yml b/bundle/vim-multiple-cursors/.travis.yml similarity index 100% rename from sources_non_forked/vim-multiple-cursors/.travis.yml rename to bundle/vim-multiple-cursors/.travis.yml diff --git a/sources_non_forked/vim-multiple-cursors/CHANGELOG.md b/bundle/vim-multiple-cursors/CHANGELOG.md similarity index 100% rename from sources_non_forked/vim-multiple-cursors/CHANGELOG.md rename to bundle/vim-multiple-cursors/CHANGELOG.md diff --git a/sources_non_forked/vim-multiple-cursors/Gemfile b/bundle/vim-multiple-cursors/Gemfile similarity index 100% rename from sources_non_forked/vim-multiple-cursors/Gemfile rename to bundle/vim-multiple-cursors/Gemfile diff --git a/sources_non_forked/vim-multiple-cursors/Gemfile.lock b/bundle/vim-multiple-cursors/Gemfile.lock similarity index 100% rename from sources_non_forked/vim-multiple-cursors/Gemfile.lock rename to bundle/vim-multiple-cursors/Gemfile.lock diff --git a/sources_non_forked/vim-multiple-cursors/MIT-LICENSE.txt b/bundle/vim-multiple-cursors/MIT-LICENSE.txt similarity index 100% rename from sources_non_forked/vim-multiple-cursors/MIT-LICENSE.txt rename to bundle/vim-multiple-cursors/MIT-LICENSE.txt diff --git a/sources_non_forked/vim-multiple-cursors/README.md b/bundle/vim-multiple-cursors/README.md similarity index 100% rename from sources_non_forked/vim-multiple-cursors/README.md rename to bundle/vim-multiple-cursors/README.md diff --git a/sources_non_forked/vim-multiple-cursors/Rakefile b/bundle/vim-multiple-cursors/Rakefile similarity index 100% rename from sources_non_forked/vim-multiple-cursors/Rakefile rename to bundle/vim-multiple-cursors/Rakefile diff --git a/sources_non_forked/vim-multiple-cursors/assets/example1.gif b/bundle/vim-multiple-cursors/assets/example1.gif similarity index 100% rename from sources_non_forked/vim-multiple-cursors/assets/example1.gif rename to bundle/vim-multiple-cursors/assets/example1.gif diff --git a/sources_non_forked/vim-multiple-cursors/assets/example2.gif b/bundle/vim-multiple-cursors/assets/example2.gif similarity index 100% rename from sources_non_forked/vim-multiple-cursors/assets/example2.gif rename to bundle/vim-multiple-cursors/assets/example2.gif diff --git a/sources_non_forked/vim-multiple-cursors/assets/example3.gif b/bundle/vim-multiple-cursors/assets/example3.gif similarity index 100% rename from sources_non_forked/vim-multiple-cursors/assets/example3.gif rename to bundle/vim-multiple-cursors/assets/example3.gif diff --git a/sources_non_forked/vim-multiple-cursors/assets/example4.gif b/bundle/vim-multiple-cursors/assets/example4.gif similarity index 100% rename from sources_non_forked/vim-multiple-cursors/assets/example4.gif rename to bundle/vim-multiple-cursors/assets/example4.gif diff --git a/sources_non_forked/vim-multiple-cursors/autoload/multiple_cursors.vim b/bundle/vim-multiple-cursors/autoload/multiple_cursors.vim similarity index 100% rename from sources_non_forked/vim-multiple-cursors/autoload/multiple_cursors.vim rename to bundle/vim-multiple-cursors/autoload/multiple_cursors.vim diff --git a/sources_non_forked/vim-multiple-cursors/doc/multiple_cursors.txt b/bundle/vim-multiple-cursors/doc/multiple_cursors.txt similarity index 100% rename from sources_non_forked/vim-multiple-cursors/doc/multiple_cursors.txt rename to bundle/vim-multiple-cursors/doc/multiple_cursors.txt diff --git a/sources_non_forked/vim-multiple-cursors/plugin/multiple_cursors.vim b/bundle/vim-multiple-cursors/plugin/multiple_cursors.vim similarity index 100% rename from sources_non_forked/vim-multiple-cursors/plugin/multiple_cursors.vim rename to bundle/vim-multiple-cursors/plugin/multiple_cursors.vim diff --git a/sources_non_forked/vim-multiple-cursors/spec/benchmark_spec.rb b/bundle/vim-multiple-cursors/spec/benchmark_spec.rb similarity index 100% rename from sources_non_forked/vim-multiple-cursors/spec/benchmark_spec.rb rename to bundle/vim-multiple-cursors/spec/benchmark_spec.rb diff --git a/sources_non_forked/vim-multiple-cursors/spec/multiple_cursors_spec.rb b/bundle/vim-multiple-cursors/spec/multiple_cursors_spec.rb similarity index 100% rename from sources_non_forked/vim-multiple-cursors/spec/multiple_cursors_spec.rb rename to bundle/vim-multiple-cursors/spec/multiple_cursors_spec.rb diff --git a/sources_non_forked/vim-multiple-cursors/spec/spec_helper.rb b/bundle/vim-multiple-cursors/spec/spec_helper.rb similarity index 100% rename from sources_non_forked/vim-multiple-cursors/spec/spec_helper.rb rename to bundle/vim-multiple-cursors/spec/spec_helper.rb diff --git a/sources_non_forked/vim-puppet b/bundle/vim-puppet similarity index 100% rename from sources_non_forked/vim-puppet rename to bundle/vim-puppet diff --git a/sources_non_forked/vim-pyte/README b/bundle/vim-pyte/README similarity index 100% rename from sources_non_forked/vim-pyte/README rename to bundle/vim-pyte/README diff --git a/sources_non_forked/vim-pyte/colors/pyte.vim b/bundle/vim-pyte/colors/pyte.vim similarity index 100% rename from sources_non_forked/vim-pyte/colors/pyte.vim rename to bundle/vim-pyte/colors/pyte.vim diff --git a/sources_non_forked/vim-rails b/bundle/vim-rails similarity index 100% rename from sources_non_forked/vim-rails rename to bundle/vim-rails diff --git a/sources_non_forked/vim-rake b/bundle/vim-rake similarity index 100% rename from sources_non_forked/vim-rake rename to bundle/vim-rake diff --git a/sources_non_forked/vim-repeat/README.markdown b/bundle/vim-repeat/README.markdown similarity index 100% rename from sources_non_forked/vim-repeat/README.markdown rename to bundle/vim-repeat/README.markdown diff --git a/sources_non_forked/vim-repeat/autoload/repeat.vim b/bundle/vim-repeat/autoload/repeat.vim similarity index 100% rename from sources_non_forked/vim-repeat/autoload/repeat.vim rename to bundle/vim-repeat/autoload/repeat.vim diff --git a/sources_non_forked/vim-ruby b/bundle/vim-ruby similarity index 100% rename from sources_non_forked/vim-ruby rename to bundle/vim-ruby diff --git a/sources_non_forked/vim-snipmate/.gitignore b/bundle/vim-snipmate/.gitignore similarity index 100% rename from sources_non_forked/vim-snipmate/.gitignore rename to bundle/vim-snipmate/.gitignore diff --git a/sources_non_forked/vim-snipmate/Contributors.md b/bundle/vim-snipmate/Contributors.md similarity index 100% rename from sources_non_forked/vim-snipmate/Contributors.md rename to bundle/vim-snipmate/Contributors.md diff --git a/sources_non_forked/vim-snipmate/README.md b/bundle/vim-snipmate/README.md similarity index 100% rename from sources_non_forked/vim-snipmate/README.md rename to bundle/vim-snipmate/README.md diff --git a/sources_non_forked/vim-snipmate/addon-info.json b/bundle/vim-snipmate/addon-info.json similarity index 100% rename from sources_non_forked/vim-snipmate/addon-info.json rename to bundle/vim-snipmate/addon-info.json diff --git a/sources_non_forked/vim-snipmate/after/plugin/snipMate.vim b/bundle/vim-snipmate/after/plugin/snipMate.vim similarity index 100% rename from sources_non_forked/vim-snipmate/after/plugin/snipMate.vim rename to bundle/vim-snipmate/after/plugin/snipMate.vim diff --git a/sources_non_forked/vim-snipmate/autoload/snipMate.vim b/bundle/vim-snipmate/autoload/snipMate.vim similarity index 100% rename from sources_non_forked/vim-snipmate/autoload/snipMate.vim rename to bundle/vim-snipmate/autoload/snipMate.vim diff --git a/sources_non_forked/vim-snipmate/autoload/snipMate_python_demo.vim b/bundle/vim-snipmate/autoload/snipMate_python_demo.vim similarity index 100% rename from sources_non_forked/vim-snipmate/autoload/snipMate_python_demo.vim rename to bundle/vim-snipmate/autoload/snipMate_python_demo.vim diff --git a/sources_non_forked/vim-snipmate/doc/snipMate.txt b/bundle/vim-snipmate/doc/snipMate.txt similarity index 100% rename from sources_non_forked/vim-snipmate/doc/snipMate.txt rename to bundle/vim-snipmate/doc/snipMate.txt diff --git a/sources_non_forked/vim-snipmate/ftplugin/html_snip_helper.vim b/bundle/vim-snipmate/ftplugin/html_snip_helper.vim similarity index 100% rename from sources_non_forked/vim-snipmate/ftplugin/html_snip_helper.vim rename to bundle/vim-snipmate/ftplugin/html_snip_helper.vim diff --git a/sources_non_forked/vim-snipmate/ftplugin/snippet.vim b/bundle/vim-snipmate/ftplugin/snippet.vim similarity index 100% rename from sources_non_forked/vim-snipmate/ftplugin/snippet.vim rename to bundle/vim-snipmate/ftplugin/snippet.vim diff --git a/sources_non_forked/vim-snipmate/ftplugin/snippets.vim b/bundle/vim-snipmate/ftplugin/snippets.vim similarity index 100% rename from sources_non_forked/vim-snipmate/ftplugin/snippets.vim rename to bundle/vim-snipmate/ftplugin/snippets.vim diff --git a/sources_non_forked/vim-snipmate/plugin/snipMate.vim b/bundle/vim-snipmate/plugin/snipMate.vim similarity index 100% rename from sources_non_forked/vim-snipmate/plugin/snipMate.vim rename to bundle/vim-snipmate/plugin/snipMate.vim diff --git a/sources_non_forked/vim-snipmate/plugin/snipMateInterface.vim b/bundle/vim-snipmate/plugin/snipMateInterface.vim similarity index 100% rename from sources_non_forked/vim-snipmate/plugin/snipMateInterface.vim rename to bundle/vim-snipmate/plugin/snipMateInterface.vim diff --git a/sources_non_forked/vim-snipmate/syntax/snippet.vim b/bundle/vim-snipmate/syntax/snippet.vim similarity index 100% rename from sources_non_forked/vim-snipmate/syntax/snippet.vim rename to bundle/vim-snipmate/syntax/snippet.vim diff --git a/sources_non_forked/vim-snipmate/syntax/snippets.vim b/bundle/vim-snipmate/syntax/snippets.vim similarity index 100% rename from sources_non_forked/vim-snipmate/syntax/snippets.vim rename to bundle/vim-snipmate/syntax/snippets.vim diff --git a/sources_non_forked/vim-snippets/LICENSE b/bundle/vim-snippets/LICENSE similarity index 100% rename from sources_non_forked/vim-snippets/LICENSE rename to bundle/vim-snippets/LICENSE diff --git a/sources_non_forked/vim-snippets/README.md b/bundle/vim-snippets/README.md similarity index 100% rename from sources_non_forked/vim-snippets/README.md rename to bundle/vim-snippets/README.md diff --git a/sources_non_forked/vim-snippets/UltiSnips/README b/bundle/vim-snippets/UltiSnips/README similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/README rename to bundle/vim-snippets/UltiSnips/README diff --git a/sources_non_forked/vim-snippets/UltiSnips/all.snippets b/bundle/vim-snippets/UltiSnips/all.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/all.snippets rename to bundle/vim-snippets/UltiSnips/all.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/bib.snippets b/bundle/vim-snippets/UltiSnips/bib.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/bib.snippets rename to bundle/vim-snippets/UltiSnips/bib.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/bindzone.snippets b/bundle/vim-snippets/UltiSnips/bindzone.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/bindzone.snippets rename to bundle/vim-snippets/UltiSnips/bindzone.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/c.snippets b/bundle/vim-snippets/UltiSnips/c.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/c.snippets rename to bundle/vim-snippets/UltiSnips/c.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/coffee.snippets b/bundle/vim-snippets/UltiSnips/coffee.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/coffee.snippets rename to bundle/vim-snippets/UltiSnips/coffee.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/coffee_jasmine.snippets b/bundle/vim-snippets/UltiSnips/coffee_jasmine.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/coffee_jasmine.snippets rename to bundle/vim-snippets/UltiSnips/coffee_jasmine.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/cpp.snippets b/bundle/vim-snippets/UltiSnips/cpp.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/cpp.snippets rename to bundle/vim-snippets/UltiSnips/cpp.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/cs.snippets b/bundle/vim-snippets/UltiSnips/cs.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/cs.snippets rename to bundle/vim-snippets/UltiSnips/cs.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/css.snippets b/bundle/vim-snippets/UltiSnips/css.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/css.snippets rename to bundle/vim-snippets/UltiSnips/css.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/d.snippets b/bundle/vim-snippets/UltiSnips/d.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/d.snippets rename to bundle/vim-snippets/UltiSnips/d.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/django.snippets b/bundle/vim-snippets/UltiSnips/django.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/django.snippets rename to bundle/vim-snippets/UltiSnips/django.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/elixir.snippets b/bundle/vim-snippets/UltiSnips/elixir.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/elixir.snippets rename to bundle/vim-snippets/UltiSnips/elixir.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/erlang.snippets b/bundle/vim-snippets/UltiSnips/erlang.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/erlang.snippets rename to bundle/vim-snippets/UltiSnips/erlang.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets b/bundle/vim-snippets/UltiSnips/eruby.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/eruby.snippets rename to bundle/vim-snippets/UltiSnips/eruby.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/go.snippets b/bundle/vim-snippets/UltiSnips/go.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/go.snippets rename to bundle/vim-snippets/UltiSnips/go.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/haskell.snippets b/bundle/vim-snippets/UltiSnips/haskell.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/haskell.snippets rename to bundle/vim-snippets/UltiSnips/haskell.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/help.snippets b/bundle/vim-snippets/UltiSnips/help.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/help.snippets rename to bundle/vim-snippets/UltiSnips/help.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/html.snippets b/bundle/vim-snippets/UltiSnips/html.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/html.snippets rename to bundle/vim-snippets/UltiSnips/html.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/html_minimal.snippets b/bundle/vim-snippets/UltiSnips/html_minimal.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/html_minimal.snippets rename to bundle/vim-snippets/UltiSnips/html_minimal.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/htmldjango.snippets b/bundle/vim-snippets/UltiSnips/htmldjango.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/htmldjango.snippets rename to bundle/vim-snippets/UltiSnips/htmldjango.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/htmljinja.snippets b/bundle/vim-snippets/UltiSnips/htmljinja.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/htmljinja.snippets rename to bundle/vim-snippets/UltiSnips/htmljinja.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/java.snippets b/bundle/vim-snippets/UltiSnips/java.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/java.snippets rename to bundle/vim-snippets/UltiSnips/java.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets b/bundle/vim-snippets/UltiSnips/javascript.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/javascript.snippets rename to bundle/vim-snippets/UltiSnips/javascript.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/javascript_ember.snippets b/bundle/vim-snippets/UltiSnips/javascript_ember.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/javascript_ember.snippets rename to bundle/vim-snippets/UltiSnips/javascript_ember.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/javascript_jasmine.snippets b/bundle/vim-snippets/UltiSnips/javascript_jasmine.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/javascript_jasmine.snippets rename to bundle/vim-snippets/UltiSnips/javascript_jasmine.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/javascript_jsdoc.snippets b/bundle/vim-snippets/UltiSnips/javascript_jsdoc.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/javascript_jsdoc.snippets rename to bundle/vim-snippets/UltiSnips/javascript_jsdoc.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/jinja2.snippets b/bundle/vim-snippets/UltiSnips/jinja2.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/jinja2.snippets rename to bundle/vim-snippets/UltiSnips/jinja2.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/json.snippets b/bundle/vim-snippets/UltiSnips/json.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/json.snippets rename to bundle/vim-snippets/UltiSnips/json.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/ledger.snippets b/bundle/vim-snippets/UltiSnips/ledger.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/ledger.snippets rename to bundle/vim-snippets/UltiSnips/ledger.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/lhaskell.snippets b/bundle/vim-snippets/UltiSnips/lhaskell.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/lhaskell.snippets rename to bundle/vim-snippets/UltiSnips/lhaskell.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/lua.snippets b/bundle/vim-snippets/UltiSnips/lua.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/lua.snippets rename to bundle/vim-snippets/UltiSnips/lua.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/mako.snippets b/bundle/vim-snippets/UltiSnips/mako.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/mako.snippets rename to bundle/vim-snippets/UltiSnips/mako.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/markdown.snippets b/bundle/vim-snippets/UltiSnips/markdown.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/markdown.snippets rename to bundle/vim-snippets/UltiSnips/markdown.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/objc.snippets b/bundle/vim-snippets/UltiSnips/objc.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/objc.snippets rename to bundle/vim-snippets/UltiSnips/objc.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/ocaml.snippets b/bundle/vim-snippets/UltiSnips/ocaml.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/ocaml.snippets rename to bundle/vim-snippets/UltiSnips/ocaml.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/perl.snippets b/bundle/vim-snippets/UltiSnips/perl.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/perl.snippets rename to bundle/vim-snippets/UltiSnips/perl.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/php.snippets b/bundle/vim-snippets/UltiSnips/php.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/php.snippets rename to bundle/vim-snippets/UltiSnips/php.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/php_phpunit.snippets b/bundle/vim-snippets/UltiSnips/php_phpunit.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/php_phpunit.snippets rename to bundle/vim-snippets/UltiSnips/php_phpunit.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/php_symfony2.snippets b/bundle/vim-snippets/UltiSnips/php_symfony2.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/php_symfony2.snippets rename to bundle/vim-snippets/UltiSnips/php_symfony2.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/puppet.snippets b/bundle/vim-snippets/UltiSnips/puppet.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/puppet.snippets rename to bundle/vim-snippets/UltiSnips/puppet.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/python.snippets b/bundle/vim-snippets/UltiSnips/python.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/python.snippets rename to bundle/vim-snippets/UltiSnips/python.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/rails.snippets b/bundle/vim-snippets/UltiSnips/rails.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/rails.snippets rename to bundle/vim-snippets/UltiSnips/rails.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/rst.snippets b/bundle/vim-snippets/UltiSnips/rst.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/rst.snippets rename to bundle/vim-snippets/UltiSnips/rst.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/ruby.snippets b/bundle/vim-snippets/UltiSnips/ruby.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/ruby.snippets rename to bundle/vim-snippets/UltiSnips/ruby.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/scss.snippets b/bundle/vim-snippets/UltiSnips/scss.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/scss.snippets rename to bundle/vim-snippets/UltiSnips/scss.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/sh.snippets b/bundle/vim-snippets/UltiSnips/sh.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/sh.snippets rename to bundle/vim-snippets/UltiSnips/sh.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/snippets.snippets b/bundle/vim-snippets/UltiSnips/snippets.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/snippets.snippets rename to bundle/vim-snippets/UltiSnips/snippets.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/tcl.snippets b/bundle/vim-snippets/UltiSnips/tcl.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/tcl.snippets rename to bundle/vim-snippets/UltiSnips/tcl.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/tex.snippets b/bundle/vim-snippets/UltiSnips/tex.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/tex.snippets rename to bundle/vim-snippets/UltiSnips/tex.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/texmath.snippets b/bundle/vim-snippets/UltiSnips/texmath.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/texmath.snippets rename to bundle/vim-snippets/UltiSnips/texmath.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/twig.snippets b/bundle/vim-snippets/UltiSnips/twig.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/twig.snippets rename to bundle/vim-snippets/UltiSnips/twig.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/vim.snippets b/bundle/vim-snippets/UltiSnips/vim.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/vim.snippets rename to bundle/vim-snippets/UltiSnips/vim.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/xhtml.snippets b/bundle/vim-snippets/UltiSnips/xhtml.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/xhtml.snippets rename to bundle/vim-snippets/UltiSnips/xhtml.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/xml.snippets b/bundle/vim-snippets/UltiSnips/xml.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/xml.snippets rename to bundle/vim-snippets/UltiSnips/xml.snippets diff --git a/sources_non_forked/vim-snippets/UltiSnips/zsh.snippets b/bundle/vim-snippets/UltiSnips/zsh.snippets similarity index 100% rename from sources_non_forked/vim-snippets/UltiSnips/zsh.snippets rename to bundle/vim-snippets/UltiSnips/zsh.snippets diff --git a/sources_non_forked/vim-snippets/addon-info.json b/bundle/vim-snippets/addon-info.json similarity index 100% rename from sources_non_forked/vim-snippets/addon-info.json rename to bundle/vim-snippets/addon-info.json diff --git a/sources_non_forked/vim-snippets/autoload/vim_snippets.vim b/bundle/vim-snippets/autoload/vim_snippets.vim similarity index 100% rename from sources_non_forked/vim-snippets/autoload/vim_snippets.vim rename to bundle/vim-snippets/autoload/vim_snippets.vim diff --git a/sources_non_forked/vim-snippets/snippets/_.snippets b/bundle/vim-snippets/snippets/_.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/_.snippets rename to bundle/vim-snippets/snippets/_.snippets diff --git a/sources_non_forked/vim-snippets/snippets/actionscript.snippets b/bundle/vim-snippets/snippets/actionscript.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/actionscript.snippets rename to bundle/vim-snippets/snippets/actionscript.snippets diff --git a/sources_non_forked/vim-snippets/snippets/apache.snippets b/bundle/vim-snippets/snippets/apache.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/apache.snippets rename to bundle/vim-snippets/snippets/apache.snippets diff --git a/sources_non_forked/vim-snippets/snippets/autoit.snippets b/bundle/vim-snippets/snippets/autoit.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/autoit.snippets rename to bundle/vim-snippets/snippets/autoit.snippets diff --git a/sources_non_forked/vim-snippets/snippets/c.snippets b/bundle/vim-snippets/snippets/c.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/c.snippets rename to bundle/vim-snippets/snippets/c.snippets diff --git a/sources_non_forked/vim-snippets/snippets/chef.snippets b/bundle/vim-snippets/snippets/chef.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/chef.snippets rename to bundle/vim-snippets/snippets/chef.snippets diff --git a/sources_non_forked/vim-snippets/snippets/clojure.snippets b/bundle/vim-snippets/snippets/clojure.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/clojure.snippets rename to bundle/vim-snippets/snippets/clojure.snippets diff --git a/sources_non_forked/vim-snippets/snippets/cmake.snippets b/bundle/vim-snippets/snippets/cmake.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/cmake.snippets rename to bundle/vim-snippets/snippets/cmake.snippets diff --git a/sources_non_forked/vim-snippets/snippets/coffee/angular_coffee.snippets b/bundle/vim-snippets/snippets/coffee/angular_coffee.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/coffee/angular_coffee.snippets rename to bundle/vim-snippets/snippets/coffee/angular_coffee.snippets diff --git a/sources_non_forked/vim-snippets/snippets/coffee/coffee.snippets b/bundle/vim-snippets/snippets/coffee/coffee.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/coffee/coffee.snippets rename to bundle/vim-snippets/snippets/coffee/coffee.snippets diff --git a/sources_non_forked/vim-snippets/snippets/coffee/jquery_coffee.snippets b/bundle/vim-snippets/snippets/coffee/jquery_coffee.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/coffee/jquery_coffee.snippets rename to bundle/vim-snippets/snippets/coffee/jquery_coffee.snippets diff --git a/sources_non_forked/vim-snippets/snippets/cpp.snippets b/bundle/vim-snippets/snippets/cpp.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/cpp.snippets rename to bundle/vim-snippets/snippets/cpp.snippets diff --git a/sources_non_forked/vim-snippets/snippets/cs.snippets b/bundle/vim-snippets/snippets/cs.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/cs.snippets rename to bundle/vim-snippets/snippets/cs.snippets diff --git a/sources_non_forked/vim-snippets/snippets/css.snippets b/bundle/vim-snippets/snippets/css.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/css.snippets rename to bundle/vim-snippets/snippets/css.snippets diff --git a/sources_non_forked/vim-snippets/snippets/dart.snippets b/bundle/vim-snippets/snippets/dart.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/dart.snippets rename to bundle/vim-snippets/snippets/dart.snippets diff --git a/sources_non_forked/vim-snippets/snippets/diff.snippets b/bundle/vim-snippets/snippets/diff.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/diff.snippets rename to bundle/vim-snippets/snippets/diff.snippets diff --git a/sources_non_forked/vim-snippets/snippets/django.snippets b/bundle/vim-snippets/snippets/django.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/django.snippets rename to bundle/vim-snippets/snippets/django.snippets diff --git a/sources_non_forked/vim-snippets/snippets/dosini.snippets b/bundle/vim-snippets/snippets/dosini.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/dosini.snippets rename to bundle/vim-snippets/snippets/dosini.snippets diff --git a/sources_non_forked/vim-snippets/snippets/elixir.snippets b/bundle/vim-snippets/snippets/elixir.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/elixir.snippets rename to bundle/vim-snippets/snippets/elixir.snippets diff --git a/sources_non_forked/vim-snippets/snippets/erlang.snippets b/bundle/vim-snippets/snippets/erlang.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/erlang.snippets rename to bundle/vim-snippets/snippets/erlang.snippets diff --git a/sources_non_forked/vim-snippets/snippets/eruby.snippets b/bundle/vim-snippets/snippets/eruby.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/eruby.snippets rename to bundle/vim-snippets/snippets/eruby.snippets diff --git a/sources_non_forked/vim-snippets/snippets/falcon.snippets b/bundle/vim-snippets/snippets/falcon.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/falcon.snippets rename to bundle/vim-snippets/snippets/falcon.snippets diff --git a/sources_non_forked/vim-snippets/snippets/go.snippets b/bundle/vim-snippets/snippets/go.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/go.snippets rename to bundle/vim-snippets/snippets/go.snippets diff --git a/sources_non_forked/vim-snippets/snippets/haml.snippets b/bundle/vim-snippets/snippets/haml.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/haml.snippets rename to bundle/vim-snippets/snippets/haml.snippets diff --git a/sources_non_forked/vim-snippets/snippets/haskell.snippets b/bundle/vim-snippets/snippets/haskell.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/haskell.snippets rename to bundle/vim-snippets/snippets/haskell.snippets diff --git a/sources_non_forked/vim-snippets/snippets/html.snippets b/bundle/vim-snippets/snippets/html.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/html.snippets rename to bundle/vim-snippets/snippets/html.snippets diff --git a/sources_non_forked/vim-snippets/snippets/html_minimal.snippets b/bundle/vim-snippets/snippets/html_minimal.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/html_minimal.snippets rename to bundle/vim-snippets/snippets/html_minimal.snippets diff --git a/sources_non_forked/vim-snippets/snippets/htmldjango.snippets b/bundle/vim-snippets/snippets/htmldjango.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/htmldjango.snippets rename to bundle/vim-snippets/snippets/htmldjango.snippets diff --git a/sources_non_forked/vim-snippets/snippets/htmltornado.snippets b/bundle/vim-snippets/snippets/htmltornado.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/htmltornado.snippets rename to bundle/vim-snippets/snippets/htmltornado.snippets diff --git a/sources_non_forked/vim-snippets/snippets/java.snippets b/bundle/vim-snippets/snippets/java.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/java.snippets rename to bundle/vim-snippets/snippets/java.snippets diff --git a/sources_non_forked/vim-snippets/snippets/javascript/javascript-jquery.snippets b/bundle/vim-snippets/snippets/javascript/javascript-jquery.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/javascript/javascript-jquery.snippets rename to bundle/vim-snippets/snippets/javascript/javascript-jquery.snippets diff --git a/sources_non_forked/vim-snippets/snippets/javascript/javascript.d3.snippets b/bundle/vim-snippets/snippets/javascript/javascript.d3.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/javascript/javascript.d3.snippets rename to bundle/vim-snippets/snippets/javascript/javascript.d3.snippets diff --git a/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets b/bundle/vim-snippets/snippets/javascript/javascript.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets rename to bundle/vim-snippets/snippets/javascript/javascript.snippets diff --git a/sources_non_forked/vim-snippets/snippets/jsp.snippets b/bundle/vim-snippets/snippets/jsp.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/jsp.snippets rename to bundle/vim-snippets/snippets/jsp.snippets diff --git a/sources_non_forked/vim-snippets/snippets/ledger.snippets b/bundle/vim-snippets/snippets/ledger.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/ledger.snippets rename to bundle/vim-snippets/snippets/ledger.snippets diff --git a/sources_non_forked/vim-snippets/snippets/ls.snippets b/bundle/vim-snippets/snippets/ls.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/ls.snippets rename to bundle/vim-snippets/snippets/ls.snippets diff --git a/sources_non_forked/vim-snippets/snippets/lua.snippets b/bundle/vim-snippets/snippets/lua.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/lua.snippets rename to bundle/vim-snippets/snippets/lua.snippets diff --git a/sources_non_forked/vim-snippets/snippets/make.snippets b/bundle/vim-snippets/snippets/make.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/make.snippets rename to bundle/vim-snippets/snippets/make.snippets diff --git a/sources_non_forked/vim-snippets/snippets/mako.snippets b/bundle/vim-snippets/snippets/mako.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/mako.snippets rename to bundle/vim-snippets/snippets/mako.snippets diff --git a/sources_non_forked/vim-snippets/snippets/markdown.snippets b/bundle/vim-snippets/snippets/markdown.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/markdown.snippets rename to bundle/vim-snippets/snippets/markdown.snippets diff --git a/sources_non_forked/vim-snippets/snippets/objc.snippets b/bundle/vim-snippets/snippets/objc.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/objc.snippets rename to bundle/vim-snippets/snippets/objc.snippets diff --git a/sources_non_forked/vim-snippets/snippets/openfoam.snippets b/bundle/vim-snippets/snippets/openfoam.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/openfoam.snippets rename to bundle/vim-snippets/snippets/openfoam.snippets diff --git a/sources_non_forked/vim-snippets/snippets/perl.snippets b/bundle/vim-snippets/snippets/perl.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/perl.snippets rename to bundle/vim-snippets/snippets/perl.snippets diff --git a/sources_non_forked/vim-snippets/snippets/php.snippets b/bundle/vim-snippets/snippets/php.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/php.snippets rename to bundle/vim-snippets/snippets/php.snippets diff --git a/sources_non_forked/vim-snippets/snippets/plsql.snippets b/bundle/vim-snippets/snippets/plsql.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/plsql.snippets rename to bundle/vim-snippets/snippets/plsql.snippets diff --git a/sources_non_forked/vim-snippets/snippets/po.snippets b/bundle/vim-snippets/snippets/po.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/po.snippets rename to bundle/vim-snippets/snippets/po.snippets diff --git a/sources_non_forked/vim-snippets/snippets/processing.snippets b/bundle/vim-snippets/snippets/processing.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/processing.snippets rename to bundle/vim-snippets/snippets/processing.snippets diff --git a/sources_non_forked/vim-snippets/snippets/progress.snippets b/bundle/vim-snippets/snippets/progress.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/progress.snippets rename to bundle/vim-snippets/snippets/progress.snippets diff --git a/sources_non_forked/vim-snippets/snippets/puppet.snippets b/bundle/vim-snippets/snippets/puppet.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/puppet.snippets rename to bundle/vim-snippets/snippets/puppet.snippets diff --git a/sources_non_forked/vim-snippets/snippets/python.snippets b/bundle/vim-snippets/snippets/python.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/python.snippets rename to bundle/vim-snippets/snippets/python.snippets diff --git a/sources_non_forked/vim-snippets/snippets/r.snippets b/bundle/vim-snippets/snippets/r.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/r.snippets rename to bundle/vim-snippets/snippets/r.snippets diff --git a/sources_non_forked/vim-snippets/snippets/rst.snippets b/bundle/vim-snippets/snippets/rst.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/rst.snippets rename to bundle/vim-snippets/snippets/rst.snippets diff --git a/sources_non_forked/vim-snippets/snippets/ruby.snippets b/bundle/vim-snippets/snippets/ruby.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/ruby.snippets rename to bundle/vim-snippets/snippets/ruby.snippets diff --git a/sources_non_forked/vim-snippets/snippets/scala.snippets b/bundle/vim-snippets/snippets/scala.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/scala.snippets rename to bundle/vim-snippets/snippets/scala.snippets diff --git a/sources_non_forked/vim-snippets/snippets/sh.snippets b/bundle/vim-snippets/snippets/sh.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/sh.snippets rename to bundle/vim-snippets/snippets/sh.snippets diff --git a/sources_non_forked/vim-snippets/snippets/slim.snippets b/bundle/vim-snippets/snippets/slim.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/slim.snippets rename to bundle/vim-snippets/snippets/slim.snippets diff --git a/sources_non_forked/vim-snippets/snippets/snippets.snippets b/bundle/vim-snippets/snippets/snippets.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/snippets.snippets rename to bundle/vim-snippets/snippets/snippets.snippets diff --git a/sources_non_forked/vim-snippets/snippets/sql.snippets b/bundle/vim-snippets/snippets/sql.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/sql.snippets rename to bundle/vim-snippets/snippets/sql.snippets diff --git a/sources_non_forked/vim-snippets/snippets/tcl.snippets b/bundle/vim-snippets/snippets/tcl.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/tcl.snippets rename to bundle/vim-snippets/snippets/tcl.snippets diff --git a/sources_non_forked/vim-snippets/snippets/tex.snippets b/bundle/vim-snippets/snippets/tex.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/tex.snippets rename to bundle/vim-snippets/snippets/tex.snippets diff --git a/sources_non_forked/vim-snippets/snippets/textile.snippets b/bundle/vim-snippets/snippets/textile.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/textile.snippets rename to bundle/vim-snippets/snippets/textile.snippets diff --git a/sources_non_forked/vim-snippets/snippets/vim.snippets b/bundle/vim-snippets/snippets/vim.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/vim.snippets rename to bundle/vim-snippets/snippets/vim.snippets diff --git a/sources_non_forked/vim-snippets/snippets/xslt.snippets b/bundle/vim-snippets/snippets/xslt.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/xslt.snippets rename to bundle/vim-snippets/snippets/xslt.snippets diff --git a/sources_non_forked/vim-snippets/snippets/yii-chtml.snippets b/bundle/vim-snippets/snippets/yii-chtml.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/yii-chtml.snippets rename to bundle/vim-snippets/snippets/yii-chtml.snippets diff --git a/sources_non_forked/vim-snippets/snippets/yii.snippets b/bundle/vim-snippets/snippets/yii.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/yii.snippets rename to bundle/vim-snippets/snippets/yii.snippets diff --git a/sources_non_forked/vim-snippets/snippets/zsh.snippets b/bundle/vim-snippets/snippets/zsh.snippets similarity index 100% rename from sources_non_forked/vim-snippets/snippets/zsh.snippets rename to bundle/vim-snippets/snippets/zsh.snippets diff --git a/sources_non_forked/vim-surround/.gitignore b/bundle/vim-surround/.gitignore similarity index 100% rename from sources_non_forked/vim-surround/.gitignore rename to bundle/vim-surround/.gitignore diff --git a/sources_non_forked/vim-surround/README.markdown b/bundle/vim-surround/README.markdown similarity index 100% rename from sources_non_forked/vim-surround/README.markdown rename to bundle/vim-surround/README.markdown diff --git a/sources_non_forked/vim-surround/doc/surround.txt b/bundle/vim-surround/doc/surround.txt similarity index 100% rename from sources_non_forked/vim-surround/doc/surround.txt rename to bundle/vim-surround/doc/surround.txt diff --git a/sources_non_forked/vim-surround/plugin/surround.vim b/bundle/vim-surround/plugin/surround.vim similarity index 100% rename from sources_non_forked/vim-surround/plugin/surround.vim rename to bundle/vim-surround/plugin/surround.vim diff --git a/sources_non_forked/vim-zenroom2/README.markdown b/bundle/vim-zenroom2/README.markdown similarity index 100% rename from sources_non_forked/vim-zenroom2/README.markdown rename to bundle/vim-zenroom2/README.markdown diff --git a/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim b/bundle/vim-zenroom2/plugin/zenroom2.vim similarity index 100% rename from sources_non_forked/vim-zenroom2/plugin/zenroom2.vim rename to bundle/vim-zenroom2/plugin/zenroom2.vim diff --git a/sources_non_forked/vimux b/bundle/vimux similarity index 100% rename from sources_non_forked/vimux rename to bundle/vimux diff --git a/sources_non_forked/vim-colors-solarized/doc/tags b/sources_non_forked/vim-colors-solarized/doc/tags deleted file mode 100644 index 3785a094..00000000 --- a/sources_non_forked/vim-colors-solarized/doc/tags +++ /dev/null @@ -1,27 +0,0 @@ -'solarized_bold' solarized.txt /*'solarized_bold'* -'solarized_contrast' solarized.txt /*'solarized_contrast'* -'solarized_degrade' solarized.txt /*'solarized_degrade'* -'solarized_hitrail' solarized.txt /*'solarized_hitrail'* -'solarized_italic' solarized.txt /*'solarized_italic'* -'solarized_menu' solarized.txt /*'solarized_menu'* -'solarized_termcolors' solarized.txt /*'solarized_termcolors'* -'solarized_termtrans' solarized.txt /*'solarized_termtrans'* -'solarized_underline' solarized.txt /*'solarized_underline'* -'solarized_visibility' solarized.txt /*'solarized_visibility'* -before solarized.txt /*before* -solarized solarized.txt /*solarized* -solarized-colors solarized.txt /*solarized-colors* -solarized-colorscheme solarized.txt /*solarized-colorscheme* -solarized-help solarized.txt /*solarized-help* -solarized-install solarized.txt /*solarized-install* -solarized-menu solarized.txt /*solarized-menu* -solarized-options solarized.txt /*solarized-options* -solarized-term solarized.txt /*solarized-term* -solarized-togglebg solarized.txt /*solarized-togglebg* -solarized.vim solarized.txt /*solarized.vim* -toggle-background solarized.txt /*toggle-background* -toggle-bg solarized.txt /*toggle-bg* -togglebg solarized.txt /*togglebg* -urxvt solarized.txt /*urxvt* -vim-colors-solarized solarized.txt /*vim-colors-solarized* -without solarized.txt /*without* diff --git a/update_plugins.py b/update_plugins.py index 78de7826..4a925d39 100644 --- a/update_plugins.py +++ b/update_plugins.py @@ -43,7 +43,7 @@ vim-golang https://github.com/jnwhiteh/vim-golang GITHUB_ZIP = '%s/archive/master.zip' -SOURCE_DIR = path.join(path.dirname(__file__), 'sources_non_forked') +SOURCE_DIR = path.join(path.dirname(__file__), 'bundle') def download_extract_replace(plugin_name, zip_path, temp_dir, source_dir): diff --git a/vimrcs/plugins_config.vim b/vimrcs/plugins_config.vim index 24319ed1..1b1746ad 100644 --- a/vimrcs/plugins_config.vim +++ b/vimrcs/plugins_config.vim @@ -9,7 +9,7 @@ " => Load pathogen paths """""""""""""""""""""""""""""" call pathogen#infect('~/.vim_runtime/sources_forked/{}') -call pathogen#infect('~/.vim_runtime/sources_non_forked/{}') +call pathogen#infect('~/.vim_runtime/bundle/{}') call pathogen#helptags() """"""""""""""""""""""""""""""