diff --git a/.bash_aliases b/.bash_aliases
index ef9cd1f..62646a7 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -31,6 +31,7 @@ alias omg="sudo service NetworkManager restart"
 alias zsh_fix="mv ~/.zsh_history ~/.zsh_history_bad; strings ~/.zsh_history_bad > ~/.zsh_history;fc -R ~/.zsh_history; rm ~/.zsh_history_bad"
 alias whatismyip="curl ifconfig.co"
 alias rmswp="find ~/.vim/tmp/ -iname \"*swp\" -delete"
+alias root="sudo su"
 
 function download_github_folder() {
     svn checkout $(echo $1 | sed "s/\/tree\/[a-zA-Z]\+/\/trunk/")
@@ -70,3 +71,40 @@ function secureme(){
     cd /home/viktor/;
     sudo openvpn --config viktor.ovpn &
 }
+
+function in(){
+    if [ $# -ne 1 ] && [ $# -ne 2 ];
+    then
+        echo "Usage:"
+        echo "To start existing container:"
+        echo "in <os you want>"
+        echo
+        echo "To start new container:"
+        echo "in new <os you want>"
+        return
+    fi
+
+    if [ $# -eq 1 ]
+    then
+        container_name="${1/:/_}"
+    else
+        container_name="${2/:/_}"
+    fi
+
+    if [ "$1" = "new" ] && [ $# -eq 2 ]
+    then
+        image_name=$2
+        if [[ $(docker container ls -a | grep "$container_name") ]]
+        then
+            if [[ $(docker ps | grep $container_name) ]]
+            then
+                docker stop $container_name >> /dev/null
+            fi
+            docker rm $container_name >> /dev/null
+        fi
+        docker run -it --name $container_name $image_name /bin/bash
+    else
+        docker start $container_name >> /dev/null
+        docker exec -it $container_name /bin/bash
+    fi
+}
diff --git a/.tmux.conf b/.tmux.conf
index a0d1c58..99203d3 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -1,26 +1,22 @@
 # cat << EOF > /dev/null
 # https://github.com/gpakosz/.tmux
-# (‑●‑●)> released under the WTFPL v2 license, by Gregory Pakosz (@gpakosz)
+# (‑●‑●)> dual licensed under the WTFPL v2 license and the MIT license,
+#         without any warranty.
+#         Copyright 2012— Gregory Pakosz (@gpakosz).
 # /!\ do not edit this file
-#     instead, override settings in ~/.tmux.conf.local
+#     instead, override settings in ~/.tmux.conf.local, see README.md
 
 
 # -- general -------------------------------------------------------------------
 
 set -g default-terminal "screen-256color" # colors!
-set -g xterm-keys on
+setw -g xterm-keys on
 set -s escape-time 10                     # faster command sequences
 set -sg repeat-time 600                   # increase repeat timeout
 set -s focus-events on
 
-
-# set -g prefix2 C-a                        # GNU-Screen compatible prefix
-# bind C-a send-prefix -2
-
-unbind C-x
-unbind M-x
-set prefix M-x
-bind-key M-x send-prefix
+set -g prefix2 C-a                        # GNU-Screen compatible prefix
+bind C-a send-prefix -2
 
 set -q -g status-utf8 on                  # expect UTF-8 (tmux < 2.2)
 setw -q -g utf8 on
@@ -51,7 +47,7 @@ set -g display-time 1000      # slightly longer status messages display time
 set -g status-interval 10     # redraw status line every 10 seconds
 
 # clear both screen and history
-bind -n C-l send-keys C-l \; run 'sleep 0.05 && tmux clear-history'
+bind -n C-l send-keys C-l \; run 'sleep 0.1' \; clear-history
 
 # activity
 set -g monitor-activity on
@@ -60,9 +56,17 @@ set -g visual-activity off
 
 # -- navigation ----------------------------------------------------------------
 
+# create session
+bind C-c new-session
+
 # find session
 bind C-f command-prompt -p find-session 'switch-client -t %%'
 
+# split current window horizontally
+bind - split-window -v
+# split current window vertically
+bind _ split-window -h
+
 # pane navigation
 bind -r h select-pane -L  # move left
 bind -r j select-pane -D  # move down
@@ -71,6 +75,9 @@ bind -r l select-pane -R  # move right
 bind > swap-pane -D       # swap current pane with the next one
 bind < swap-pane -U       # swap current pane with the previous one
 
+# maximize current pane
+bind + run 'cut -c3- ~/.tmux.conf | sh -s _maximize_pane #{session_name} #D'
+
 # pane resizing
 bind -r H resize-pane -L 2
 bind -r J resize-pane -D 2
@@ -122,16 +129,13 @@ run -b 'tmux bind -ct vi-edit Escape cancel 2> /dev/null || true'
 # -- copy mode -----------------------------------------------------------------
 
 bind Enter copy-mode # enter copy mode
-bind b list-buffers  # list paster buffers
-bind p paste-buffer  # paste from the top pate buffer
-bind P choose-buffer # choose which buffer to paste from
 
 run -b 'tmux bind -t vi-copy v begin-selection 2> /dev/null || true'
 run -b 'tmux bind -T copy-mode-vi v send -X begin-selection 2> /dev/null || true'
 run -b 'tmux bind -t vi-copy C-v rectangle-toggle 2> /dev/null || true'
 run -b 'tmux bind -T copy-mode-vi C-v send -X rectangle-toggle 2> /dev/null || true'
 run -b 'tmux bind -t vi-copy y copy-selection 2> /dev/null || true'
-run -b 'tmux bind -T copy-mode-vi y send -X copy-selection 2> /dev/null || true'
+run -b 'tmux bind -T copy-mode-vi y send -X copy-selection-and-cancel 2> /dev/null || true'
 run -b 'tmux bind -t vi-copy Escape cancel 2> /dev/null || true'
 run -b 'tmux bind -T copy-mode-vi Escape send -X cancel 2> /dev/null || true'
 run -b 'tmux bind -t vi-copy H start-of-line 2> /dev/null || true'
@@ -147,6 +151,13 @@ if -b 'command -v clip.exe > /dev/null 2>&1' 'bind y run -b "tmux save-buffer -
 if -b '[ -c /dev/clipboard ]' 'bind y run -b "tmux save-buffer - > /dev/clipboard"'
 
 
+# -- buffers -------------------------------------------------------------------
+
+bind b list-buffers  # list paste buffers
+bind p paste-buffer  # paste from the top paste buffer
+bind P choose-buffer # choose which buffer to paste from
+
+
 # -- user defined overrides ----------------------------------------------------
 
 if '[ -f ~/.tmux.conf.local ]' 'source ~/.tmux.conf.local'
@@ -154,7 +165,7 @@ if '[ -f ~/.tmux.conf.local ]' 'source ~/.tmux.conf.local'
 
 # -- 8< ------------------------------------------------------------------------
 
-# run 'cut -c3- ~/.tmux.conf | sh -s _apply_configuration'
+run 'cut -c3- ~/.tmux.conf | sh -s _apply_configuration'
 
 
 # EOF
@@ -209,80 +220,91 @@ if '[ -f ~/.tmux.conf.local ]' 'source ~/.tmux.conf.local'
 # }
 #
 # _toggle_mouse() {
-#   if tmux show -g -w | grep -q mode-mouse; then
-#     old=$(tmux show -g -w | grep mode-mouse | cut -d' ' -f2)
-#     new=""
+#   old=$(tmux show -gv mouse)
+#   new=""
 #
-#     if [ "$old" = "on" ]; then
-#       new="off"
-#     else
-#       new="on"
-#     fi
-#
-#     tmux set -g mode-mouse $new \;\
-#          set -g mouse-resize-pane $new \;\
-#          set -g mouse-select-pane $new \;\
-#          set -g mouse-select-window $new \;\
-#          display "mouse: $new"
+#   if [ "$old" = "on" ]; then
+#     new="off"
 #   else
-#     old=$(tmux show -g | grep mouse | head -n 1 | cut -d' ' -f2)
-#     new=""
-#
-#     if [ "$old" = "on" ]; then
-#       new="off"
-#     else
-#       new="on"
-#     fi
-#
-#     tmux set -g mouse $new \;\
-#          display "mouse: $new"
+#     new="on"
 #   fi
+#
+#   tmux set -g mouse $new \;\
+#        display "mouse: $new"
 # }
 #
 # _battery() {
+#   charge=0
 #   uname_s=$(uname -s)
 #   case "$uname_s" in
 #     *Darwin*)
-#       batt=$(pmset -g batt)
-#       percentage=$(echo "$batt" |egrep -o [0-9]+%) || return
-#       discharging=$(echo "$batt" | grep -qi "discharging" && echo "true" || echo "false")
-#       charge="${percentage%%%} / 100"
+#       while IFS= read -r line; do
+#         if [ x"$discharging" != x"true" ]; then
+#           discharging=$(printf '%s' "$line" | grep -qi "discharging" && echo "true" || echo "false")
+#         fi
+#         percentage=$(printf '%s' "$line" | grep -E -o '[0-9]+%')
+#         charge=$(awk -v charge="$charge" -v percentage="${percentage%%%}" 'BEGIN { print charge + percentage / 100 }')
+#         count=$((count + 1))
+#       done  << EOF
+# $(pmset -g batt | grep 'InternalBattery')
+# EOF
 #       ;;
 #     *Linux*)
-#       batpath=/sys/class/power_supply/BAT0
-#       if [ ! -d $batpath ]; then
-#         batpath=/sys/class/power_supply/BAT1
-#       fi
-#       discharging=$(grep -qi "discharging" $batpath/status && echo "true" || echo "false")
-#       bat_capacity=$batpath/capacity
-#       bat_energy_full=$batpath/energy_full
-#       bat_energy_now=$batpath/energy_now
-#       if [ -r "$bat_capacity" ]; then
-#         charge="$(cat $bat_capacity) / 100"
-#       else
-#         if [ ! -r "$bat_energy_full" ] || [ ! -r "$bat_energy_now" ]; then
-#           return
+#       while IFS= read -r batpath; do
+#         if [ x"$discharging" != x"true" ]; then
+#           discharging=$(grep -qi "discharging" "$batpath/status" && echo "true" || echo "false")
 #         fi
-#         charge="$(cat $bat_energy_now) / $(cat $bat_energy_full)" || return
-#       fi
+#         bat_capacity="$batpath/capacity"
+#         if [ -r "$bat_capacity" ]; then
+#           charge=$(awk -v charge="$charge" -v capacity="$(cat "$bat_capacity")" 'BEGIN { print charge + capacity / 100 }')
+#         else
+#           bat_energy_full="$batpath/energy_full"
+#           bat_energy_now="$batpath/energy_now"
+#           if [ -r "$bat_energy_full" ] && [ -r "$bat_energy_now" ]; then
+#             charge=$(awk -v charge="$charge" -v energy_now="$(cat "$bat_energy_now")" -v energy_full="$(cat "$bat_energy_full")" 'BEGIN { print charge + energy_now / energy_full }')
+#           fi
+#         fi
+#         count=$((count + 1))
+#       done  << EOF
+# $(find /sys/class/power_supply -maxdepth 1 -iname '*bat*')
+# EOF
 #       ;;
-#     *CYGWIN*)
-#       wmic path Win32_Battery 2>&1 | grep -q 'No Instance' && return
-#       discharging=$(wmic path Win32_Battery Get BatteryStatus 2>/dev/null | grep -q 1 && echo "true" || echo "false")
-#       percentage=$(wmic path Win32_Battery Get EstimatedChargeRemaining /format:list 2>/dev/null | grep '[^[:blank:]]' | cut -d= -f2)
-#       charge="${percentage} / 100"
+#     *CYGWIN*|*MSYS*|*MINGW*)
+#       while IFS= read -r line; do
+#         [ -z "$line" ] && continue
+#         if [ x"$discharging" != x"true" ]; then
+#           discharging=$(printf '%s' "$line" | awk '{ s = ($1 == 1) ? "true" : "false"; print s }')
+#         fi
+#         charge=$(printf '%s' "$line" | awk -v charge="$charge" '{ print charge + $2 / 100 }')
+#         count=$((count + 1))
+#       done  << EOF
+# $(wmic path Win32_Battery get BatteryStatus, EstimatedChargeRemaining | tr -d '\r' | tail -n +2)
+# EOF
 #       ;;
 #     *OpenBSD*)
-#        discharging=$(sysctl -n hw.sensors.acpibat0.raw0 | grep -q 1 && echo "true" || echo "false")
-#        if sysctl -n hw.sensors.acpibat0 | grep -q amphour; then
-#          charge="$(sysctl -n hw.sensors.acpibat0.amphour3 | cut -d' ' -f1) / $(sysctl -n hw.sensors.acpibat0.amphour0 | cut -d' ' -f1)"
-#        else
-#          charge="$(sysctl -n hw.sensors.acpibat0.watthour3 | cut -d' ' -f1) / $(sysctl -n hw.sensors.acpibat0.watthour0 | cut -d' ' -f1)"
-#        fi
+#       for batid in 0 1 2; do
+#         sysctl -n "hw.sensors.acpibat$batid.raw0" 2>&1 | grep -q 'not found' && continue
+#         if [ x"$discharging" != x"true" ]; then
+#           discharging=$(sysctl -n "hw.sensors.acpibat$batid.raw0" | grep -q 1 && echo "true" || echo "false")
+#         fi
+#         if sysctl -n "hw.sensors.acpibat$batid" | grep -q amphour; then
+#           charge=$(awk -v charge="$charge" -v remaining="$(sysctl -n hw.sensors.acpibat$batid.amphour3 | cut -d' ' -f1)" -v full="$(sysctl -n hw.sensors.acpibat$batid.amphour0 | cut -d' ' -f1)" 'BEGIN { print charge + remaining / full }')
+#         else
+#           charge=$(awk -v charge="$charge" -v remaining="$(sysctl -n hw.sensors.acpibat$batid.watthour3 | cut -d' ' -f1)" -v full="$(sysctl -n hw.sensors.acpibat$batid.watthour0 | cut -d' ' -f1)" 'BEGIN { print charge + remaining / full }')
+#         fi
+#         count=$((count + 1))
+#       done
 #       ;;
-#     *)
-#       return
 #   esac
+#   charge=$(awk -v charge="$charge" -v count="$count" 'BEGIN { print charge / count }')
+#   if [ "$charge" -eq 0 ]; then
+#     tmux  set -ug '@battery_status'  \;\
+#           set -ug '@battery_bar'     \;\
+#           set -ug '@battery_hbar'    \;\
+#           set -ug '@battery_vbar'    \;\
+#           set -ug '@battery_percentage'
+#     return
+#   fi
 #
 #   variables=$(tmux  show -gqv '@battery_bar_symbol_full' \;\
 #                     show -gqv '@battery_bar_symbol_empty' \;\
@@ -431,7 +453,7 @@ if '[ -f ~/.tmux.conf.local ]' 'source ~/.tmux.conf.local'
 #   ssh_only=$2
 #   # shellcheck disable=SC2039
 #   if [ x"$OSTYPE" = x"cygwin" ]; then
-#     pid=$(ps -a | awk -v tty="${tty##/dev/}" '$5 == tty && /ssh/ && && !/vagrant ssh/ && !/autossh/ && !/-W/ { print $1 }')
+#     pid=$(ps -a | awk -v tty="${tty##/dev/}" '$5 == tty && /ssh/ && !/vagrant ssh/ && !/autossh/ && !/-W/ { print $1 }')
 #     [ -n "$pid" ] && ssh_parameters=$(tr '\0' ' ' < "/proc/$pid/cmdline" | sed 's/^ssh //')
 #   else
 #     ssh_parameters=$(ps -t "$tty" -o command= | awk '/ssh/ && !/vagrant ssh/ && !/autossh/ && !/-W/ { $1=""; print $0; exit }')
@@ -514,7 +536,7 @@ if '[ -f ~/.tmux.conf.local ]' 'source ~/.tmux.conf.local'
 #       boot=$(sysctl -q -n kern.boottime | awk -F'[ ,:]+' '{ print $4 }')
 #       now=$(date +%s)
 #       ;;
-#     *Linux*|*CYGWIN*)
+#     *Linux*|*CYGWIN*|*MSYS*|*MINGW*)
 #       now=$(cut -d' ' -f1 < /proc/uptime)
 #       ;;
 #     *OpenBSD*)
@@ -583,81 +605,96 @@ if '[ -f ~/.tmux.conf.local ]' 'source ~/.tmux.conf.local'
 # }
 #
 # _apply_bindings() {
+#   line=$(tmux list-keys | grep new-window | head -1)
+#   prefix=${line%new-window*}
+#   column=${#prefix}
+#
 #   tmux_conf_new_window_retain_current_path=${tmux_conf_new_window_retain_current_path:-false}
-#   if _is_enabled "$tmux_conf_new_window_retain_current_path"; then
-#     tmux bind c new-window -c '#{pane_current_path}'
-#   else
-#     tmux bind c new-window
-#   fi
+#   while IFS= read -r line; do
+#     [ -z "$line" ] && continue
+#     left=$(printf '%s' "$line" | cut -c-"$column" | sed -E -e 's/[^ \ta-zA-Z0-9,._+@%/-]/\\&/g')
+#     if _is_enabled "$tmux_conf_new_window_retain_current_path"; then
+#       right=$(printf '%s' "$line" | cut -c"$column-" | awk -F'\"' 'BEGIN { OFS = FS } { for (i = 1; i <= NF; i+=2) { gsub(/#{.+}/, "\"&\"", $i) } print }' | sed -E -e 's/new-window$/new-window -c "#{pane_current_path}"/g')
+#     else
+#       right=$(printf '%s' "$line" | cut -c"$column"- | awk -F'\"' 'BEGIN { OFS = FS } { for (i = 1; i <= NF; i+=2) { gsub(/#{.+}/, "\"&\"", $i) } print }' | sed -E -e 's/-c[ \t]+"#\{pane_current_path\}"$//g')
+#     fi
+#     eval "tmux $left $right" 2>/dev/null || true
+#   done  << EOF
+# $(tmux list-keys 2>/dev/null | grep -e 'new-window\(\s\+-c\s\+"#{pane_current_path}\|$\)')
+# EOF
 #
 #   tmux_conf_new_pane_retain_current_path=${tmux_conf_new_pane_retain_current_path:-true}
+#   while IFS= read -r line; do
+#     [ -z "$line" ] && continue
+#     left=$(printf '%s' "$line" | cut -c-"$column" | sed -E -e 's/[^ \ta-zA-Z0-9,._+@%/-]/\\&/g')
+#     if _is_enabled "$tmux_conf_new_pane_retain_current_path"; then
+#       right=$(printf '%s' "$line" | cut -c"$column-" | awk -F'\"' 'BEGIN { OFS = FS } { for (i = 1; i <= NF; i+=2) { gsub(/#{.+}/, "\"&\"", $i) } print }' | sed -E -e 's/split-window([ \t]+-(h|v))?$/& -c "#{pane_current_path}"/g')
+#     else
+#       right=$(printf '%s' "$line" | cut -c"$column"- | awk -F'\"' 'BEGIN { OFS = FS } { for (i = 1; i <= NF; i+=2) { gsub(/#{.+}/, "\"&\"", $i) } print }' | sed -E -e 's/-c[ \t]+"#\{pane_current_path\}"$//g')
+#     fi
+#     eval "tmux $left $right" 2>/dev/null || true
+#   done  << EOF
+# $(tmux list-keys 2>/dev/null | grep -e 'split\(-\|_\)window')
+# EOF
+#
 #   tmux_conf_new_pane_reconnect_ssh=${tmux_conf_new_pane_reconnect_ssh:-false}
-#   if _is_enabled "$tmux_conf_new_pane_reconnect_ssh"; then
-#     if _is_enabled "$tmux_conf_new_pane_retain_current_path"; then
-#       tmux  bind '"'  run "cut -c3- ~/.tmux.conf | sh -s _split_window #{pane_tty} -v -c '#{pane_current_path}'" \;\
-#             bind %    run "cut -c3- ~/.tmux.conf | sh -s _split_window #{pane_tty} -h -c '#{pane_current_path}'" \;\
-#             bind -    run "cut -c3- ~/.tmux.conf | sh -s _split_window #{pane_tty} -v -c '#{pane_current_path}'" \;\
-#             bind _    run "cut -c3- ~/.tmux.conf | sh -s _split_window #{pane_tty} -h -c '#{pane_current_path}'"
+#   while IFS= read -r line; do
+#     [ -z "$line" ] && continue
+#     left=$(printf '%s' "$line" | cut -c-"$column" | sed -E -e 's/[^ \ta-zA-Z0-9,._+@%/-]/\\&/g')
+#     if _is_enabled "$tmux_conf_new_pane_reconnect_ssh"; then
+#       right=$(printf '%s' "$line" | cut -c"$column"- | awk -F'\"' 'BEGIN { OFS = FS } { for (i = 1; i <= NF; i+=2) { gsub(/#{.+}/, "\"&\"", $i) } print }' | sed -E -e 's/split-window([^;]+)/run-shell "cut -c3- ~\/\.tmux\.conf | sh -s _split_window #{pane_tty}\1"/g')
 #     else
-#       tmux  bind '"'  run "cut -c3- ~/.tmux.conf | sh -s _split_window #{pane_tty} -v" \;\
-#             bind %    run "cut -c3- ~/.tmux.conf | sh -s _split_window #{pane_tty} -h" \;\
-#             bind -    run "cut -c3- ~/.tmux.conf | sh -s _split_window #{pane_tty} -v" \;\
-#             bind _    run "cut -c3- ~/.tmux.conf | sh -s _split_window #{pane_tty} -h"
+#       right=$(printf '%s' "$line" | cut -c"$column"- | awk -F'\"' 'BEGIN { OFS = FS } { for (i = 1; i <= NF; i+=2) { gsub(/#{.+}/, "\"&\"", $i) } print }' | sed -E -e 's/run-shell "cut -c3- ~\/\.tmux\.conf \| sh -s _split_window #\{pane_tty\}([^;]+)"/split-window\1/g' -e 's/#\{.+\}/\"&\"/g')
 #     fi
-#   else
-#     if _is_enabled "$tmux_conf_new_pane_retain_current_path"; then
-#       tmux  bind '"'  split-window -v -c '#{pane_current_path}' \;\
-#             bind %    split-window -h -c '#{pane_current_path}' \;\
-#             bind -    split-window -v -c '#{pane_current_path}' \;\
-#             bind _    split-window -h -c '#{pane_current_path}'
-#     else
-#       tmux  bind '"'  split-window -v \;\
-#             bind %    split-window -h \;\
-#             bind -    split-window -v \;\
-#             bind _    split-window -h
-#     fi
-#   fi
+#     eval "tmux $left $right" 2>/dev/null || true
+#   done  << EOF
+# $(tmux list-keys 2>/dev/null | grep -e 'split\(-\|_\)window')
+# EOF
 #
 #   tmux_conf_new_session_prompt=${tmux_conf_new_session_prompt:-false}
-#   if _is_enabled "$tmux_conf_new_session_prompt"; then
-#     tmux bind C-c command-prompt -p new-session 'new-session -s "%%"'
-#   else
-#     tmux bind C-c new-session
-#   fi
-#
-#   if tmux -q -L swap-pane-test -f /dev/null new-session -d \; new-window \; new-window \; swap-pane -t :1 \; kill-session; then
-#     tmux bind + run 'cut -c3- ~/.tmux.conf | sh -s _maximize_pane #{session_name} #D'
-#   else
-#     tmux bind + display 'your tmux version has a buggy swap-pane command - see ticket #108, fixed in upstream commit 78e783e'
-#   fi
+#   while IFS= read -r line; do
+#     [ -z "$line" ] && continue
+#     left=$(printf '%s' "$line" | cut -c-"$column" | sed -E -e 's/[^ \ta-zA-Z0-9,._+@%/-]/\\&/g')
+#     if _is_enabled "$tmux_conf_new_session_prompt"; then
+#       right=$(printf '%s' "$line" | cut -c"$column"- | awk -F'\"' 'BEGIN { OFS = FS } { for (i = 1; i <= NF; i+=2) { gsub(/#{.+}/, "\"&\"", $i) } print }' | sed -E -e 's/new-session$/command-prompt -p new-session \"new-session -s %%\"/g')
+#     else
+#       right=$(printf '%s' "$line" | cut -c"$column"- | awk -F'\"' 'BEGIN { OFS = FS } { for (i = 1; i <= NF; i+=2) { gsub(/#{.+}/, "\"&\"", $i) } print }'| sed -E -e 's/command-prompt -p new-session[^;]+/new-session/g')
+#     fi
+#     eval "tmux $left $right" 2>/dev/null || true
+#   done  << EOF
+# $(tmux list-keys 2>/dev/null | grep -e 'new-session')
+# EOF
 #
 #   tmux_conf_copy_to_os_clipboard=${tmux_conf_copy_to_os_clipboard:-false}
-#   if _is_enabled "$tmux_conf_copy_to_os_clipboard"; then
-#     if command -v pbcopy > /dev/null 2>&1; then
-#       tmux bind -t vi-copy y copy-pipe 'pbcopy' 2> /dev/null || true
-#       tmux bind -T copy-mode-vi y send -X copy-pipe-and-cancel 'pbcopy' 2> /dev/null || true
-#     fi
-#     if command -v reattach-to-user-namespace > /dev/null 2>&1; then
-#       tmux bind -t vi-copy y copy-pipe 'reattach-to-user-namespace pbcopy' 2> /dev/null || true
-#       tmux bind -T copy-mode-vi y send -X copy-pipe-and-cancel 'reattach-to-user-namespace pbcopy' 2> /dev/null || true
-#     fi
-#     if command -v xsel > /dev/null 2>&1; then
-#       tmux bind -t vi-copy y copy-pipe 'xsel -i -b' 2> /dev/null || true
-#       tmux bind -T copy-mode-vi y send -X copy-pipe-and-cancel 'xsel -i -b' 2> /dev/null || true
-#     fi
-#     if ! command -v xsel > /dev/null 2>&1 && command -v xclip > /dev/null 2>&1; then
-#       tmux bind -t vi-copy y copy-pipe 'xclip -i -selection clipboard > /dev/null 2>&1' 2> /dev/null || true
-#       tmux bind -T copy-mode-vi y send -X copy-pipe-and-cancel 'xclip -i -selection clipboard > /dev/null 2>&1' 2> /dev/null || true
-#     fi
-#     if command -v clip.exe > /dev/null 2>&1; then
-#       tmux bind -t vi-copy y copy-pipe 'clip.exe' 2> /dev/null || true
-#       tmux bind -T copy-mode-vi y send -X copy-pipe-and-cancel 'clip.exe' 2> /dev/null || true
-#     fi
-#     if [ -c /dev/clipboard ] > /dev/null 2>&1; then
-#       tmux bind -t vi-copy y copy-pipe 'cat > /dev/clipboard' 2> /dev/null || true
-#       tmux bind -T copy-mode-vi y send -X copy-pipe-and-cancel 'cat > /dev/clipboard' 2> /dev/null || true
-#     fi
-#   fi
+#   command -v pbcopy > /dev/null 2>&1 && command='pbcopy'
+#   command -v reattach-to-user-namespace > /dev/null 2>&1 && command='reattach-to-user-namespace pbcopy'
+#   command -v xsel > /dev/null 2>&1 && command='xsel -i -b'
+#   ! command -v xsel > /dev/null 2>&1 && command -v xclip > /dev/null 2>&1 && command='xclip -i -selection clipboard > \/dev\/null 2>\&1'
+#   command -v clip.exe > /dev/null 2>&1 && command='clip\.exe'
+#   [ -c /dev/clipboard ] && command='cat > \/dev\/clipboard'
+#
+#   if [ -n "$command" ]; then
+#     # shellcheck disable=SC2086
+#     for table in "" "-t emacs-copy" "-t vi-copy"; do
+#       line=$(tmux list-keys $table 2>/dev/null | grep -e 'copy-selection\|copy-pipe' | head -1)
+#       prefix=${line%copy-*}
+#       column=${#prefix}
+#       [ -z "$line" ] && continue
+#
+#       while IFS= read -r line; do
+#         [ -z "$line" ] && continue
+#         left=$(printf '%s' "$line" | cut -c-"$column" | sed -E -e 's/[^ \ta-zA-Z0-9,._+@%/-]/\\&/g')
+#         if _is_enabled "$tmux_conf_copy_to_os_clipboard"; then
+#           right=$(printf '%s' "$line" | cut -c"$column"- | awk -F'\"' 'BEGIN { OFS = FS } { for (i = 1; i <= NF; i+=2) { gsub(/#{.+}/, "\"&\"", $i) } print }' | sed -E -e "s/copy-selection(-and-cancel)?$/copy-pipe\1 \"$command\"/g")
+#         else
+#           right=$(printf '%s' "$line" | cut -c"$column"- | awk -F'\"' 'BEGIN { OFS = FS } { for (i = 1; i <= NF; i+=2) { gsub(/#{.+}/, "\"&\"", $i) } print }' | sed -E -e "s/copy-pipe(-and-cancel)? \"$command\"$/copy-selection\1/g")
+#         fi
+#         eval "tmux $left $right" 2>/dev/null || true
+#       done  << EOF
+# $(tmux list-keys $table 2>/dev/null | grep -e 'copy-selection\|copy-pipe')
+# EOF
+#     done
+#  fi
 # }
 #
 # _apply_theme() {
@@ -867,19 +904,10 @@ if '[ -f ~/.tmux.conf.local ]' 'source ~/.tmux.conf.local'
 # $tmux_conf_theme_status_left
 # EOF
 #     )
-#
-#     # are we running a tmux in between v1.9 and v2.0?
-#     if [ x"$(tmux -q -L tmux_theme_status_left_test -f /dev/null new-session -d \; show -g -v status-left \; kill-session)" = x"[#S] " ]; then
-#       case "$status_left" in
-#         *\ )
-#           ;;
-#         *)
-#           status_left="$status_left "
-#           ;;
-#       esac
-#     fi
 #   fi
 #
+#   status_left="$status_left "
+#
 #   # -- status right style
 #
 #   tmux_conf_theme_status_right=${tmux_conf_theme_status_right-'#{pairing}#{prefix} #{battery_status} #{battery_bar} #{battery_percentage} , %R , %d %b | #{username} | #{hostname} '}
@@ -1083,5 +1111,3 @@ if '[ -f ~/.tmux.conf.local ]' 'source ~/.tmux.conf.local'
 # }
 #
 # "$@"
-run-shell /opt/tmux-ressurect/resurrect.tmux
-
diff --git a/.tmux.conf.local b/.tmux.conf.local
index dd40818..64d81f3 100644
--- a/.tmux.conf.local
+++ b/.tmux.conf.local
@@ -1,5 +1,7 @@
 # https://github.com/gpakosz/.tmux
-# (‑●‑●)> released under the WTFPL v2 license, by Gregory Pakosz (@gpakosz)
+# (‑●‑●)> dual licensed under the WTFPL v2 license and the MIT license,
+#         without any warranty.
+#         Copyright 2012— Gregory Pakosz (@gpakosz).
 
 
 # -- navigation ----------------------------------------------------------------
@@ -128,10 +130,10 @@ tmux_conf_theme_left_separator_main=''
 tmux_conf_theme_left_separator_sub='|'
 tmux_conf_theme_right_separator_main=''
 tmux_conf_theme_right_separator_sub='|'
-#tmux_conf_theme_left_separator_main=''  # /!\ you don't need to install Powerline
-#tmux_conf_theme_left_separator_sub=''   #   you only need fonts patched with
-#tmux_conf_theme_right_separator_main='' #   Powerline symbols or the standalone
-#tmux_conf_theme_right_separator_sub=''  #   PowerlineSymbols.otf font
+tmux_conf_theme_left_separator_main=''  # /!\ you don't need to install Powerline
+tmux_conf_theme_left_separator_sub=''   #   you only need fonts patched with
+tmux_conf_theme_right_separator_main='' #   Powerline symbols or the standalone
+tmux_conf_theme_right_separator_sub=''  #   PowerlineSymbols.otf font
 
 # status left/right content:
 #   - separate main sections with '|'
@@ -221,8 +223,9 @@ tmux_conf_battery_vbar_palette='gradient'
 # symbols used to indicate whether battery is charging or discharging
 tmux_conf_battery_status_charging='↑'       # U+2191
 tmux_conf_battery_status_discharging='↓'    # U+2193
-#tmux_conf_battery_status_charging='⚡'     # U+26A1
-#tmux_conf_battery_status_discharging='🔋'  # U+1F50B
+#tmux_conf_battery_status_charging='⚡ '    # U+26A1
+#tmux_conf_battery_status_charging='🔌 '    # U+1F50C
+#tmux_conf_battery_status_discharging='🔋 ' # U+1F50B
 
 # clock style
 tmux_conf_theme_clock_colour='#00afff'  # light blue
@@ -234,6 +237,8 @@ tmux_conf_theme_clock_style='24'
 # in copy mode, copying selection also copies to the OS clipboard
 #   - true
 #   - false (default)
+# on macOS, this requires installing reattach-to-user-namespace, see README.md
+# on Linux, this requires xsel or xclip
 tmux_conf_copy_to_os_clipboard=false
 
 
@@ -243,44 +248,42 @@ tmux_conf_copy_to_os_clipboard=false
 # increase history size
 #set -g history-limit 10000
 
+# start with mouse mode enabled
+#set -g mouse on
+
 # force Vi mode
 #   really you should export VISUAL or EDITOR environment variable, see manual
 #set -g status-keys vi
 #set -g mode-keys vi
 
-# replace C-b by C-a instead of using both prefixes
-unbind C-x
-# unbind C-b
-# set -g prefix C-a
-# bind C-a send-prefix
+# replace C-b by Alt-a (M-a) instead of using both prefixes
+set -gu prefix2
+unbind C-a
+unbind C-b
+set -g prefix M-x
+bind M-x send-prefix
 
 # move status line to top
 #set -g status-position top
 
 bind \ split-window -h -c "#{pane_current_path}" # Split panes horizontal
 bind - split-window -v -c "#{pane_current_path}" # Split panes vertically
-
 # Use Alt-vim keys without prefix key to switch panes
 bind -n M-h select-pane -L
 bind -n M-j select-pane -D
 bind -n M-k select-pane -U
 bind -n M-l select-pane -R
-
 # Use Alt-arrow keys without prefix key to switch panes
 bind -n M-Left select-pane -L
 bind -n M-Right select-pane -R
 bind -n M-Up select-pane -U
 bind -n M-Down select-pane -D
-
-
 #set -g mouse on
 # to enable mouse scroll, see https://github.com/tmux/tmux/issues/145#issuecomment-150736967
 bind -n WheelUpPane if-shell -F -t = "#{mouse_any_flag}" "send-keys -M" "if -Ft= '#{pane_in_mode}' 'send-keys -M' 'copy-mode -e'"
-
 bind j resize-pane -D 10
 bind k resize-pane -U 10
 bind l resize-pane -R 10
 bind h resize-pane -L 10
 
-
-unbind C-x
+run-shell /home/viktor/.tmux/resurrect/resurrect.tmux
diff --git a/.vimrc b/.vimrc
index 0a99d42..ab844b9 100644
--- a/.vimrc
+++ b/.vimrc
@@ -109,8 +109,16 @@ let g:airline#extensions#virtualenv#enabled = 1
 let g:airline#extensions#tabline#enabled = 1
 let g:airline#extensions#tabline#left_sep = ' '
 let g:airline#extensions#tabline#left_alt_sep = '|'
+" let g:airline_left_sep='>'
+" let g:airline_right_sep='<'
+" let g:airline_detect_modified=1
+let g:airline_powerline_fonts=1
+" let g:airline_section_b = '%{strftime("%c")}'
+" let g:airline_section_y = 'BN: %{bufnr("%")} FT: %y'
+
 
 " Enable wildmenu which is an enhanced  command completion
+"
 set wildmenu
 " Better copy & paste
 " When you want to paste large blocks of code into vim, press F2 before you
@@ -226,6 +234,8 @@ au InsertLeave * match ExtraWhitespace /\s\+$/
 "  http://www.vim.org/scripts/download_script.php?src_id=13400
 set t_Co=256
 color wombat256mod
+" color mayansmoke
+" color github
 
 " Spelling
 " set spell
diff --git a/.zshrc b/.zshrc
index c60034e..4654a54 100644
--- a/.zshrc
+++ b/.zshrc
@@ -9,6 +9,7 @@ export ZSH=~/.oh-my-zsh
 # it'll load a random theme each time that oh-my-zsh is loaded.
 # See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
 ZSH_THEME="bira"
+# ZSH_THEME="adben"
 
 # Uncomment the following line to use case-sensitive completion.
 # CASE_SENSITIVE="true"
@@ -24,7 +25,7 @@ HISTFILESIZE=9000
 HYPHEN_INSENSITIVE="true"
 
 # Uncomment the following line to disable bi-weekly auto-update checks.
-# DISABLE_AUTO_UPDATE="true"
+DISABLE_AUTO_UPDATE="true"
 
 # Uncomment the following line to change how often to auto-update (in days).
 # export UPDATE_ZSH_DAYS=13
@@ -44,7 +45,7 @@ COMPLETION_WAITING_DOTS="true"
 # Uncomment the following line if you want to disable marking untracked files
 # under VCS as dirty. This makes repository status check for large repositories
 # much, much faster.
-# DISABLE_UNTRACKED_FILES_DIRTY="true"
+DISABLE_UNTRACKED_FILES_DIRTY="true"
 
 # Uncomment the following line if you want to change the command execution time
 # stamp shown in the history command output.
@@ -61,7 +62,7 @@ HIST_STAMPS="dd.mm.yyyy"
 plugins=()
 
 source $ZSH/oh-my-zsh.sh
-tmux source-file /home/viktor/.tmux.conf
+# tmux source-file /home/viktor/.tmux.conf
 
 # User configuration
 
@@ -104,28 +105,15 @@ j () {
 
 # . ~/.bash_completion
 
-# Slows down shell.
-# source $ZSH/custom/plugins/zsh-git-prompt/zshrc.sh
-
-
 # Locale settings for perl
 #export LC_CTYPE=en_US.UTF-8
-
 #export LC_ALL=C
 #export LC_ALL=en_US.UTF-8
-#sudo usermod -aG docker viktor
-#newgrp docker
-
-# Send ssh key to server
-send_key() {
-  cat ~/.ssh/id_rsa.pub | ssh $1 "mkdir -p ~/.ssh && cat >>  ~/.ssh/authorized_keys"
-}
 
 PYENV_ROOT="$HOME/.pyenv"
 PATH="$PYENV_ROOT/bin:$PATH"
 eval "$(pyenv init -)"
 
-
 export VIRTUALENVWRAPPER_PYTHON=python
 export WORKON_HOME=$HOME/.virtualenvs
 # source /usr/local/bin/virtualenvwrapper.sh
diff --git a/vim-plugins/eclim/autoload/eclim.vim b/vim-plugins/bundle/eclim/autoload/eclim.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim.vim
rename to vim-plugins/bundle/eclim/autoload/eclim.vim
diff --git a/vim-plugins/eclim/autoload/eclim/client/nailgun.vim b/vim-plugins/bundle/eclim/autoload/eclim/client/nailgun.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/client/nailgun.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/client/nailgun.vim
diff --git a/vim-plugins/eclim/autoload/eclim/client/python/nailgun.py b/vim-plugins/bundle/eclim/autoload/eclim/client/python/nailgun.py
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/client/python/nailgun.py
rename to vim-plugins/bundle/eclim/autoload/eclim/client/python/nailgun.py
diff --git a/vim-plugins/eclim/autoload/eclim/client/python/nailgun.vim b/vim-plugins/bundle/eclim/autoload/eclim/client/python/nailgun.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/client/python/nailgun.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/client/python/nailgun.vim
diff --git a/vim-plugins/eclim/autoload/eclim/common/buffers.vim b/vim-plugins/bundle/eclim/autoload/eclim/common/buffers.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/common/buffers.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/common/buffers.vim
diff --git a/vim-plugins/eclim/autoload/eclim/common/history.vim b/vim-plugins/bundle/eclim/autoload/eclim/common/history.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/common/history.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/common/history.vim
diff --git a/vim-plugins/eclim/autoload/eclim/common/largefile.vim b/vim-plugins/bundle/eclim/autoload/eclim/common/largefile.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/common/largefile.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/common/largefile.vim
diff --git a/vim-plugins/eclim/autoload/eclim/common/license.vim b/vim-plugins/bundle/eclim/autoload/eclim/common/license.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/common/license.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/common/license.vim
diff --git a/vim-plugins/eclim/autoload/eclim/common/locate.vim b/vim-plugins/bundle/eclim/autoload/eclim/common/locate.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/common/locate.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/common/locate.vim
diff --git a/vim-plugins/eclim/autoload/eclim/common/template.vim b/vim-plugins/bundle/eclim/autoload/eclim/common/template.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/common/template.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/common/template.vim
diff --git a/vim-plugins/eclim/autoload/eclim/common/util.vim b/vim-plugins/bundle/eclim/autoload/eclim/common/util.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/common/util.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/common/util.vim
diff --git a/vim-plugins/eclim/autoload/eclim/css/complete.vim b/vim-plugins/bundle/eclim/autoload/eclim/css/complete.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/css/complete.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/css/complete.vim
diff --git a/vim-plugins/eclim/autoload/eclim/css/validate.vim b/vim-plugins/bundle/eclim/autoload/eclim/css/validate.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/css/validate.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/css/validate.vim
diff --git a/vim-plugins/eclim/autoload/eclim/cygwin.vim b/vim-plugins/bundle/eclim/autoload/eclim/cygwin.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/cygwin.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/cygwin.vim
diff --git a/vim-plugins/eclim/autoload/eclim/display/fold.vim b/vim-plugins/bundle/eclim/autoload/eclim/display/fold.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/display/fold.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/display/fold.vim
diff --git a/vim-plugins/eclim/autoload/eclim/display/menu.vim b/vim-plugins/bundle/eclim/autoload/eclim/display/menu.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/display/menu.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/display/menu.vim
diff --git a/vim-plugins/eclim/autoload/eclim/display/signs.vim b/vim-plugins/bundle/eclim/autoload/eclim/display/signs.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/display/signs.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/display/signs.vim
diff --git a/vim-plugins/eclim/autoload/eclim/display/window.vim b/vim-plugins/bundle/eclim/autoload/eclim/display/window.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/display/window.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/display/window.vim
diff --git a/vim-plugins/eclim/autoload/eclim/help.vim b/vim-plugins/bundle/eclim/autoload/eclim/help.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/help.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/help.vim
diff --git a/vim-plugins/eclim/autoload/eclim/html/complete.vim b/vim-plugins/bundle/eclim/autoload/eclim/html/complete.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/html/complete.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/html/complete.vim
diff --git a/vim-plugins/eclim/autoload/eclim/html/util.vim b/vim-plugins/bundle/eclim/autoload/eclim/html/util.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/html/util.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/html/util.vim
diff --git a/vim-plugins/eclim/autoload/eclim/html/validate.vim b/vim-plugins/bundle/eclim/autoload/eclim/html/validate.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/html/validate.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/html/validate.vim
diff --git a/vim-plugins/eclim/autoload/eclim/java/ant/complete.vim b/vim-plugins/bundle/eclim/autoload/eclim/java/ant/complete.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/java/ant/complete.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/java/ant/complete.vim
diff --git a/vim-plugins/eclim/autoload/eclim/java/ant/doc.vim b/vim-plugins/bundle/eclim/autoload/eclim/java/ant/doc.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/java/ant/doc.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/java/ant/doc.vim
diff --git a/vim-plugins/eclim/autoload/eclim/java/ant/ivy.vim b/vim-plugins/bundle/eclim/autoload/eclim/java/ant/ivy.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/java/ant/ivy.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/java/ant/ivy.vim
diff --git a/vim-plugins/eclim/autoload/eclim/java/ant/util.vim b/vim-plugins/bundle/eclim/autoload/eclim/java/ant/util.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/java/ant/util.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/java/ant/util.vim
diff --git a/vim-plugins/eclim/autoload/eclim/java/classpath.vim b/vim-plugins/bundle/eclim/autoload/eclim/java/classpath.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/java/classpath.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/java/classpath.vim
diff --git a/vim-plugins/eclim/autoload/eclim/java/complete.vim b/vim-plugins/bundle/eclim/autoload/eclim/java/complete.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/java/complete.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/java/complete.vim
diff --git a/vim-plugins/eclim/autoload/eclim/java/correct.vim b/vim-plugins/bundle/eclim/autoload/eclim/java/correct.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/java/correct.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/java/correct.vim
diff --git a/vim-plugins/eclim/autoload/eclim/java/debug.vim b/vim-plugins/bundle/eclim/autoload/eclim/java/debug.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/java/debug.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/java/debug.vim
diff --git a/vim-plugins/eclim/autoload/eclim/java/doc.vim b/vim-plugins/bundle/eclim/autoload/eclim/java/doc.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/java/doc.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/java/doc.vim
diff --git a/vim-plugins/eclim/autoload/eclim/java/hierarchy.vim b/vim-plugins/bundle/eclim/autoload/eclim/java/hierarchy.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/java/hierarchy.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/java/hierarchy.vim
diff --git a/vim-plugins/eclim/autoload/eclim/java/impl.vim b/vim-plugins/bundle/eclim/autoload/eclim/java/impl.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/java/impl.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/java/impl.vim
diff --git a/vim-plugins/eclim/autoload/eclim/java/import.vim b/vim-plugins/bundle/eclim/autoload/eclim/java/import.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/java/import.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/java/import.vim
diff --git a/vim-plugins/eclim/autoload/eclim/java/junit.vim b/vim-plugins/bundle/eclim/autoload/eclim/java/junit.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/java/junit.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/java/junit.vim
diff --git a/vim-plugins/eclim/autoload/eclim/java/logging.vim b/vim-plugins/bundle/eclim/autoload/eclim/java/logging.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/java/logging.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/java/logging.vim
diff --git a/vim-plugins/eclim/autoload/eclim/java/maven.vim b/vim-plugins/bundle/eclim/autoload/eclim/java/maven.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/java/maven.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/java/maven.vim
diff --git a/vim-plugins/eclim/autoload/eclim/java/new.vim b/vim-plugins/bundle/eclim/autoload/eclim/java/new.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/java/new.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/java/new.vim
diff --git a/vim-plugins/eclim/autoload/eclim/java/refactor.vim b/vim-plugins/bundle/eclim/autoload/eclim/java/refactor.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/java/refactor.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/java/refactor.vim
diff --git a/vim-plugins/eclim/autoload/eclim/java/search.vim b/vim-plugins/bundle/eclim/autoload/eclim/java/search.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/java/search.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/java/search.vim
diff --git a/vim-plugins/eclim/autoload/eclim/java/src.vim b/vim-plugins/bundle/eclim/autoload/eclim/java/src.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/java/src.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/java/src.vim
diff --git a/vim-plugins/eclim/autoload/eclim/java/tools.vim b/vim-plugins/bundle/eclim/autoload/eclim/java/tools.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/java/tools.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/java/tools.vim
diff --git a/vim-plugins/eclim/autoload/eclim/java/util.vim b/vim-plugins/bundle/eclim/autoload/eclim/java/util.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/java/util.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/java/util.vim
diff --git a/vim-plugins/eclim/autoload/eclim/javascript/complete.vim b/vim-plugins/bundle/eclim/autoload/eclim/javascript/complete.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/javascript/complete.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/javascript/complete.vim
diff --git a/vim-plugins/eclim/autoload/eclim/javascript/util.vim b/vim-plugins/bundle/eclim/autoload/eclim/javascript/util.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/javascript/util.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/javascript/util.vim
diff --git a/vim-plugins/eclim/autoload/eclim/lang.vim b/vim-plugins/bundle/eclim/autoload/eclim/lang.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/lang.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/lang.vim
diff --git a/vim-plugins/eclim/autoload/eclim/lang/hierarchy.vim b/vim-plugins/bundle/eclim/autoload/eclim/lang/hierarchy.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/lang/hierarchy.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/lang/hierarchy.vim
diff --git a/vim-plugins/eclim/autoload/eclim/project/problems.vim b/vim-plugins/bundle/eclim/autoload/eclim/project/problems.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/project/problems.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/project/problems.vim
diff --git a/vim-plugins/eclim/autoload/eclim/project/run.vim b/vim-plugins/bundle/eclim/autoload/eclim/project/run.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/project/run.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/project/run.vim
diff --git a/vim-plugins/eclim/autoload/eclim/project/tree.vim b/vim-plugins/bundle/eclim/autoload/eclim/project/tree.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/project/tree.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/project/tree.vim
diff --git a/vim-plugins/eclim/autoload/eclim/project/util.vim b/vim-plugins/bundle/eclim/autoload/eclim/project/util.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/project/util.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/project/util.vim
diff --git a/vim-plugins/eclim/autoload/eclim/taglisttoo/lang/commonsvalidator.vim b/vim-plugins/bundle/eclim/autoload/eclim/taglisttoo/lang/commonsvalidator.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/taglisttoo/lang/commonsvalidator.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/taglisttoo/lang/commonsvalidator.vim
diff --git a/vim-plugins/eclim/autoload/eclim/taglisttoo/lang/eclimhelp.vim b/vim-plugins/bundle/eclim/autoload/eclim/taglisttoo/lang/eclimhelp.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/taglisttoo/lang/eclimhelp.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/taglisttoo/lang/eclimhelp.vim
diff --git a/vim-plugins/eclim/autoload/eclim/taglisttoo/lang/forrest.vim b/vim-plugins/bundle/eclim/autoload/eclim/taglisttoo/lang/forrest.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/taglisttoo/lang/forrest.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/taglisttoo/lang/forrest.vim
diff --git a/vim-plugins/eclim/autoload/eclim/taglisttoo/lang/gant.vim b/vim-plugins/bundle/eclim/autoload/eclim/taglisttoo/lang/gant.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/taglisttoo/lang/gant.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/taglisttoo/lang/gant.vim
diff --git a/vim-plugins/eclim/autoload/eclim/taglisttoo/lang/hibernate.vim b/vim-plugins/bundle/eclim/autoload/eclim/taglisttoo/lang/hibernate.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/taglisttoo/lang/hibernate.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/taglisttoo/lang/hibernate.vim
diff --git a/vim-plugins/eclim/autoload/eclim/taglisttoo/lang/junit.vim b/vim-plugins/bundle/eclim/autoload/eclim/taglisttoo/lang/junit.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/taglisttoo/lang/junit.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/taglisttoo/lang/junit.vim
diff --git a/vim-plugins/eclim/autoload/eclim/taglisttoo/lang/spring.vim b/vim-plugins/bundle/eclim/autoload/eclim/taglisttoo/lang/spring.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/taglisttoo/lang/spring.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/taglisttoo/lang/spring.vim
diff --git a/vim-plugins/eclim/autoload/eclim/taglisttoo/lang/webxml.vim b/vim-plugins/bundle/eclim/autoload/eclim/taglisttoo/lang/webxml.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/taglisttoo/lang/webxml.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/taglisttoo/lang/webxml.vim
diff --git a/vim-plugins/eclim/autoload/eclim/taglisttoo/lang/wsdl.vim b/vim-plugins/bundle/eclim/autoload/eclim/taglisttoo/lang/wsdl.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/taglisttoo/lang/wsdl.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/taglisttoo/lang/wsdl.vim
diff --git a/vim-plugins/eclim/autoload/eclim/tree.vim b/vim-plugins/bundle/eclim/autoload/eclim/tree.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/tree.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/tree.vim
diff --git a/vim-plugins/eclim/autoload/eclim/util.vim b/vim-plugins/bundle/eclim/autoload/eclim/util.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/util.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/util.vim
diff --git a/vim-plugins/eclim/autoload/eclim/vimplugin.vim b/vim-plugins/bundle/eclim/autoload/eclim/vimplugin.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/vimplugin.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/vimplugin.vim
diff --git a/vim-plugins/eclim/autoload/eclim/web.vim b/vim-plugins/bundle/eclim/autoload/eclim/web.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/web.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/web.vim
diff --git a/vim-plugins/eclim/autoload/eclim/xml/complete.vim b/vim-plugins/bundle/eclim/autoload/eclim/xml/complete.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/xml/complete.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/xml/complete.vim
diff --git a/vim-plugins/eclim/autoload/eclim/xml/definition.vim b/vim-plugins/bundle/eclim/autoload/eclim/xml/definition.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/xml/definition.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/xml/definition.vim
diff --git a/vim-plugins/eclim/autoload/eclim/xml/format.vim b/vim-plugins/bundle/eclim/autoload/eclim/xml/format.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/xml/format.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/xml/format.vim
diff --git a/vim-plugins/eclim/autoload/eclim/xml/util.vim b/vim-plugins/bundle/eclim/autoload/eclim/xml/util.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/xml/util.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/xml/util.vim
diff --git a/vim-plugins/eclim/autoload/eclim/xml/validate.vim b/vim-plugins/bundle/eclim/autoload/eclim/xml/validate.vim
similarity index 100%
rename from vim-plugins/eclim/autoload/eclim/xml/validate.vim
rename to vim-plugins/bundle/eclim/autoload/eclim/xml/validate.vim
diff --git a/vim-plugins/eclim/bin/bash_complete b/vim-plugins/bundle/eclim/bin/bash_complete
similarity index 100%
rename from vim-plugins/eclim/bin/bash_complete
rename to vim-plugins/bundle/eclim/bin/bash_complete
diff --git a/vim-plugins/eclim/compiler/eclim_ant.vim b/vim-plugins/bundle/eclim/compiler/eclim_ant.vim
similarity index 100%
rename from vim-plugins/eclim/compiler/eclim_ant.vim
rename to vim-plugins/bundle/eclim/compiler/eclim_ant.vim
diff --git a/vim-plugins/eclim/compiler/eclim_javadoc.vim b/vim-plugins/bundle/eclim/compiler/eclim_javadoc.vim
similarity index 100%
rename from vim-plugins/eclim/compiler/eclim_javadoc.vim
rename to vim-plugins/bundle/eclim/compiler/eclim_javadoc.vim
diff --git a/vim-plugins/eclim/compiler/eclim_make.vim b/vim-plugins/bundle/eclim/compiler/eclim_make.vim
similarity index 100%
rename from vim-plugins/eclim/compiler/eclim_make.vim
rename to vim-plugins/bundle/eclim/compiler/eclim_make.vim
diff --git a/vim-plugins/eclim/compiler/eclim_maven.vim b/vim-plugins/bundle/eclim/compiler/eclim_maven.vim
similarity index 100%
rename from vim-plugins/eclim/compiler/eclim_maven.vim
rename to vim-plugins/bundle/eclim/compiler/eclim_maven.vim
diff --git a/vim-plugins/eclim/compiler/eclim_mvn.vim b/vim-plugins/bundle/eclim/compiler/eclim_mvn.vim
similarity index 100%
rename from vim-plugins/eclim/compiler/eclim_mvn.vim
rename to vim-plugins/bundle/eclim/compiler/eclim_mvn.vim
diff --git a/vim-plugins/eclim/compiler/eclim_xmllint.vim b/vim-plugins/bundle/eclim/compiler/eclim_xmllint.vim
similarity index 100%
rename from vim-plugins/eclim/compiler/eclim_xmllint.vim
rename to vim-plugins/bundle/eclim/compiler/eclim_xmllint.vim
diff --git a/vim-plugins/eclim/dict/java b/vim-plugins/bundle/eclim/dict/java
similarity index 100%
rename from vim-plugins/eclim/dict/java
rename to vim-plugins/bundle/eclim/dict/java
diff --git a/vim-plugins/eclim/doc/404.txt b/vim-plugins/bundle/eclim/doc/404.txt
similarity index 100%
rename from vim-plugins/eclim/doc/404.txt
rename to vim-plugins/bundle/eclim/doc/404.txt
diff --git a/vim-plugins/eclim/doc/archive/changes.txt b/vim-plugins/bundle/eclim/doc/archive/changes.txt
similarity index 100%
rename from vim-plugins/eclim/doc/archive/changes.txt
rename to vim-plugins/bundle/eclim/doc/archive/changes.txt
diff --git a/vim-plugins/eclim/doc/archive/news.txt b/vim-plugins/bundle/eclim/doc/archive/news.txt
similarity index 100%
rename from vim-plugins/eclim/doc/archive/news.txt
rename to vim-plugins/bundle/eclim/doc/archive/news.txt
diff --git a/vim-plugins/eclim/doc/changes.txt b/vim-plugins/bundle/eclim/doc/changes.txt
similarity index 100%
rename from vim-plugins/eclim/doc/changes.txt
rename to vim-plugins/bundle/eclim/doc/changes.txt
diff --git a/vim-plugins/eclim/doc/cheatsheet.txt b/vim-plugins/bundle/eclim/doc/cheatsheet.txt
similarity index 100%
rename from vim-plugins/eclim/doc/cheatsheet.txt
rename to vim-plugins/bundle/eclim/doc/cheatsheet.txt
diff --git a/vim-plugins/eclim/doc/contribute.txt b/vim-plugins/bundle/eclim/doc/contribute.txt
similarity index 100%
rename from vim-plugins/eclim/doc/contribute.txt
rename to vim-plugins/bundle/eclim/doc/contribute.txt
diff --git a/vim-plugins/eclim/doc/development/architecture.txt b/vim-plugins/bundle/eclim/doc/development/architecture.txt
similarity index 100%
rename from vim-plugins/eclim/doc/development/architecture.txt
rename to vim-plugins/bundle/eclim/doc/development/architecture.txt
diff --git a/vim-plugins/eclim/doc/development/commands.txt b/vim-plugins/bundle/eclim/doc/development/commands.txt
similarity index 100%
rename from vim-plugins/eclim/doc/development/commands.txt
rename to vim-plugins/bundle/eclim/doc/development/commands.txt
diff --git a/vim-plugins/eclim/doc/development/gettingstarted.txt b/vim-plugins/bundle/eclim/doc/development/gettingstarted.txt
similarity index 100%
rename from vim-plugins/eclim/doc/development/gettingstarted.txt
rename to vim-plugins/bundle/eclim/doc/development/gettingstarted.txt
diff --git a/vim-plugins/eclim/doc/development/index.txt b/vim-plugins/bundle/eclim/doc/development/index.txt
similarity index 100%
rename from vim-plugins/eclim/doc/development/index.txt
rename to vim-plugins/bundle/eclim/doc/development/index.txt
diff --git a/vim-plugins/eclim/doc/development/installer.txt b/vim-plugins/bundle/eclim/doc/development/installer.txt
similarity index 100%
rename from vim-plugins/eclim/doc/development/installer.txt
rename to vim-plugins/bundle/eclim/doc/development/installer.txt
diff --git a/vim-plugins/eclim/doc/development/plugins.txt b/vim-plugins/bundle/eclim/doc/development/plugins.txt
similarity index 100%
rename from vim-plugins/eclim/doc/development/plugins.txt
rename to vim-plugins/bundle/eclim/doc/development/plugins.txt
diff --git a/vim-plugins/eclim/doc/eclimd.txt b/vim-plugins/bundle/eclim/doc/eclimd.txt
similarity index 100%
rename from vim-plugins/eclim/doc/eclimd.txt
rename to vim-plugins/bundle/eclim/doc/eclimd.txt
diff --git a/vim-plugins/eclim/doc/faq.txt b/vim-plugins/bundle/eclim/doc/faq.txt
similarity index 100%
rename from vim-plugins/eclim/doc/faq.txt
rename to vim-plugins/bundle/eclim/doc/faq.txt
diff --git a/vim-plugins/eclim/doc/features.txt b/vim-plugins/bundle/eclim/doc/features.txt
similarity index 100%
rename from vim-plugins/eclim/doc/features.txt
rename to vim-plugins/bundle/eclim/doc/features.txt
diff --git a/vim-plugins/eclim/doc/gettinghelp.txt b/vim-plugins/bundle/eclim/doc/gettinghelp.txt
similarity index 100%
rename from vim-plugins/eclim/doc/gettinghelp.txt
rename to vim-plugins/bundle/eclim/doc/gettinghelp.txt
diff --git a/vim-plugins/eclim/doc/gettingstarted.txt b/vim-plugins/bundle/eclim/doc/gettingstarted.txt
similarity index 100%
rename from vim-plugins/eclim/doc/gettingstarted.txt
rename to vim-plugins/bundle/eclim/doc/gettingstarted.txt
diff --git a/vim-plugins/eclim/doc/index.txt b/vim-plugins/bundle/eclim/doc/index.txt
similarity index 100%
rename from vim-plugins/eclim/doc/index.txt
rename to vim-plugins/bundle/eclim/doc/index.txt
diff --git a/vim-plugins/eclim/doc/install.txt b/vim-plugins/bundle/eclim/doc/install.txt
similarity index 100%
rename from vim-plugins/eclim/doc/install.txt
rename to vim-plugins/bundle/eclim/doc/install.txt
diff --git a/vim-plugins/eclim/doc/relatedprojects.txt b/vim-plugins/bundle/eclim/doc/relatedprojects.txt
similarity index 100%
rename from vim-plugins/eclim/doc/relatedprojects.txt
rename to vim-plugins/bundle/eclim/doc/relatedprojects.txt
diff --git a/vim-plugins/eclim/doc/vim/c/complete.txt b/vim-plugins/bundle/eclim/doc/vim/c/complete.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/c/complete.txt
rename to vim-plugins/bundle/eclim/doc/vim/c/complete.txt
diff --git a/vim-plugins/eclim/doc/vim/c/index.txt b/vim-plugins/bundle/eclim/doc/vim/c/index.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/c/index.txt
rename to vim-plugins/bundle/eclim/doc/vim/c/index.txt
diff --git a/vim-plugins/eclim/doc/vim/c/inspection.txt b/vim-plugins/bundle/eclim/doc/vim/c/inspection.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/c/inspection.txt
rename to vim-plugins/bundle/eclim/doc/vim/c/inspection.txt
diff --git a/vim-plugins/eclim/doc/vim/c/project.txt b/vim-plugins/bundle/eclim/doc/vim/c/project.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/c/project.txt
rename to vim-plugins/bundle/eclim/doc/vim/c/project.txt
diff --git a/vim-plugins/eclim/doc/vim/c/search.txt b/vim-plugins/bundle/eclim/doc/vim/c/search.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/c/search.txt
rename to vim-plugins/bundle/eclim/doc/vim/c/search.txt
diff --git a/vim-plugins/eclim/doc/vim/c/validate.txt b/vim-plugins/bundle/eclim/doc/vim/c/validate.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/c/validate.txt
rename to vim-plugins/bundle/eclim/doc/vim/c/validate.txt
diff --git a/vim-plugins/eclim/doc/vim/code_completion.txt b/vim-plugins/bundle/eclim/doc/vim/code_completion.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/code_completion.txt
rename to vim-plugins/bundle/eclim/doc/vim/code_completion.txt
diff --git a/vim-plugins/eclim/doc/vim/core/eclim.txt b/vim-plugins/bundle/eclim/doc/vim/core/eclim.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/core/eclim.txt
rename to vim-plugins/bundle/eclim/doc/vim/core/eclim.txt
diff --git a/vim-plugins/eclim/doc/vim/core/history.txt b/vim-plugins/bundle/eclim/doc/vim/core/history.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/core/history.txt
rename to vim-plugins/bundle/eclim/doc/vim/core/history.txt
diff --git a/vim-plugins/eclim/doc/vim/core/index.txt b/vim-plugins/bundle/eclim/doc/vim/core/index.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/core/index.txt
rename to vim-plugins/bundle/eclim/doc/vim/core/index.txt
diff --git a/vim-plugins/eclim/doc/vim/core/locate.txt b/vim-plugins/bundle/eclim/doc/vim/core/locate.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/core/locate.txt
rename to vim-plugins/bundle/eclim/doc/vim/core/locate.txt
diff --git a/vim-plugins/eclim/doc/vim/core/project.txt b/vim-plugins/bundle/eclim/doc/vim/core/project.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/core/project.txt
rename to vim-plugins/bundle/eclim/doc/vim/core/project.txt
diff --git a/vim-plugins/eclim/doc/vim/core/util.txt b/vim-plugins/bundle/eclim/doc/vim/core/util.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/core/util.txt
rename to vim-plugins/bundle/eclim/doc/vim/core/util.txt
diff --git a/vim-plugins/eclim/doc/vim/dltk/buildpath.txt b/vim-plugins/bundle/eclim/doc/vim/dltk/buildpath.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/dltk/buildpath.txt
rename to vim-plugins/bundle/eclim/doc/vim/dltk/buildpath.txt
diff --git a/vim-plugins/eclim/doc/vim/groovy/complete.txt b/vim-plugins/bundle/eclim/doc/vim/groovy/complete.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/groovy/complete.txt
rename to vim-plugins/bundle/eclim/doc/vim/groovy/complete.txt
diff --git a/vim-plugins/eclim/doc/vim/groovy/index.txt b/vim-plugins/bundle/eclim/doc/vim/groovy/index.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/groovy/index.txt
rename to vim-plugins/bundle/eclim/doc/vim/groovy/index.txt
diff --git a/vim-plugins/eclim/doc/vim/groovy/validate.txt b/vim-plugins/bundle/eclim/doc/vim/groovy/validate.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/groovy/validate.txt
rename to vim-plugins/bundle/eclim/doc/vim/groovy/validate.txt
diff --git a/vim-plugins/eclim/doc/vim/html/index.txt b/vim-plugins/bundle/eclim/doc/vim/html/index.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/html/index.txt
rename to vim-plugins/bundle/eclim/doc/vim/html/index.txt
diff --git a/vim-plugins/eclim/doc/vim/index.txt b/vim-plugins/bundle/eclim/doc/vim/index.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/index.txt
rename to vim-plugins/bundle/eclim/doc/vim/index.txt
diff --git a/vim-plugins/eclim/doc/vim/java/android.txt b/vim-plugins/bundle/eclim/doc/vim/java/android.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/java/android.txt
rename to vim-plugins/bundle/eclim/doc/vim/java/android.txt
diff --git a/vim-plugins/eclim/doc/vim/java/ant.txt b/vim-plugins/bundle/eclim/doc/vim/java/ant.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/java/ant.txt
rename to vim-plugins/bundle/eclim/doc/vim/java/ant.txt
diff --git a/vim-plugins/eclim/doc/vim/java/classpath.txt b/vim-plugins/bundle/eclim/doc/vim/java/classpath.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/java/classpath.txt
rename to vim-plugins/bundle/eclim/doc/vim/java/classpath.txt
diff --git a/vim-plugins/eclim/doc/vim/java/complete.txt b/vim-plugins/bundle/eclim/doc/vim/java/complete.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/java/complete.txt
rename to vim-plugins/bundle/eclim/doc/vim/java/complete.txt
diff --git a/vim-plugins/eclim/doc/vim/java/debug.txt b/vim-plugins/bundle/eclim/doc/vim/java/debug.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/java/debug.txt
rename to vim-plugins/bundle/eclim/doc/vim/java/debug.txt
diff --git a/vim-plugins/eclim/doc/vim/java/format.txt b/vim-plugins/bundle/eclim/doc/vim/java/format.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/java/format.txt
rename to vim-plugins/bundle/eclim/doc/vim/java/format.txt
diff --git a/vim-plugins/eclim/doc/vim/java/import.txt b/vim-plugins/bundle/eclim/doc/vim/java/import.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/java/import.txt
rename to vim-plugins/bundle/eclim/doc/vim/java/import.txt
diff --git a/vim-plugins/eclim/doc/vim/java/index.txt b/vim-plugins/bundle/eclim/doc/vim/java/index.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/java/index.txt
rename to vim-plugins/bundle/eclim/doc/vim/java/index.txt
diff --git a/vim-plugins/eclim/doc/vim/java/inspection.txt b/vim-plugins/bundle/eclim/doc/vim/java/inspection.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/java/inspection.txt
rename to vim-plugins/bundle/eclim/doc/vim/java/inspection.txt
diff --git a/vim-plugins/eclim/doc/vim/java/java.txt b/vim-plugins/bundle/eclim/doc/vim/java/java.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/java/java.txt
rename to vim-plugins/bundle/eclim/doc/vim/java/java.txt
diff --git a/vim-plugins/eclim/doc/vim/java/javadoc.txt b/vim-plugins/bundle/eclim/doc/vim/java/javadoc.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/java/javadoc.txt
rename to vim-plugins/bundle/eclim/doc/vim/java/javadoc.txt
diff --git a/vim-plugins/eclim/doc/vim/java/logging.txt b/vim-plugins/bundle/eclim/doc/vim/java/logging.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/java/logging.txt
rename to vim-plugins/bundle/eclim/doc/vim/java/logging.txt
diff --git a/vim-plugins/eclim/doc/vim/java/maven.txt b/vim-plugins/bundle/eclim/doc/vim/java/maven.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/java/maven.txt
rename to vim-plugins/bundle/eclim/doc/vim/java/maven.txt
diff --git a/vim-plugins/eclim/doc/vim/java/methods.txt b/vim-plugins/bundle/eclim/doc/vim/java/methods.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/java/methods.txt
rename to vim-plugins/bundle/eclim/doc/vim/java/methods.txt
diff --git a/vim-plugins/eclim/doc/vim/java/refactor.txt b/vim-plugins/bundle/eclim/doc/vim/java/refactor.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/java/refactor.txt
rename to vim-plugins/bundle/eclim/doc/vim/java/refactor.txt
diff --git a/vim-plugins/eclim/doc/vim/java/search.txt b/vim-plugins/bundle/eclim/doc/vim/java/search.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/java/search.txt
rename to vim-plugins/bundle/eclim/doc/vim/java/search.txt
diff --git a/vim-plugins/eclim/doc/vim/java/types.txt b/vim-plugins/bundle/eclim/doc/vim/java/types.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/java/types.txt
rename to vim-plugins/bundle/eclim/doc/vim/java/types.txt
diff --git a/vim-plugins/eclim/doc/vim/java/unittests.txt b/vim-plugins/bundle/eclim/doc/vim/java/unittests.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/java/unittests.txt
rename to vim-plugins/bundle/eclim/doc/vim/java/unittests.txt
diff --git a/vim-plugins/eclim/doc/vim/java/validate.txt b/vim-plugins/bundle/eclim/doc/vim/java/validate.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/java/validate.txt
rename to vim-plugins/bundle/eclim/doc/vim/java/validate.txt
diff --git a/vim-plugins/eclim/doc/vim/java/webxml.txt b/vim-plugins/bundle/eclim/doc/vim/java/webxml.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/java/webxml.txt
rename to vim-plugins/bundle/eclim/doc/vim/java/webxml.txt
diff --git a/vim-plugins/eclim/doc/vim/javascript/index.txt b/vim-plugins/bundle/eclim/doc/vim/javascript/index.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/javascript/index.txt
rename to vim-plugins/bundle/eclim/doc/vim/javascript/index.txt
diff --git a/vim-plugins/eclim/doc/vim/php/buildpath.txt b/vim-plugins/bundle/eclim/doc/vim/php/buildpath.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/php/buildpath.txt
rename to vim-plugins/bundle/eclim/doc/vim/php/buildpath.txt
diff --git a/vim-plugins/eclim/doc/vim/php/complete.txt b/vim-plugins/bundle/eclim/doc/vim/php/complete.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/php/complete.txt
rename to vim-plugins/bundle/eclim/doc/vim/php/complete.txt
diff --git a/vim-plugins/eclim/doc/vim/php/index.txt b/vim-plugins/bundle/eclim/doc/vim/php/index.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/php/index.txt
rename to vim-plugins/bundle/eclim/doc/vim/php/index.txt
diff --git a/vim-plugins/eclim/doc/vim/php/search.txt b/vim-plugins/bundle/eclim/doc/vim/php/search.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/php/search.txt
rename to vim-plugins/bundle/eclim/doc/vim/php/search.txt
diff --git a/vim-plugins/eclim/doc/vim/php/validate.txt b/vim-plugins/bundle/eclim/doc/vim/php/validate.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/php/validate.txt
rename to vim-plugins/bundle/eclim/doc/vim/php/validate.txt
diff --git a/vim-plugins/eclim/doc/vim/python/complete.txt b/vim-plugins/bundle/eclim/doc/vim/python/complete.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/python/complete.txt
rename to vim-plugins/bundle/eclim/doc/vim/python/complete.txt
diff --git a/vim-plugins/eclim/doc/vim/python/django.txt b/vim-plugins/bundle/eclim/doc/vim/python/django.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/python/django.txt
rename to vim-plugins/bundle/eclim/doc/vim/python/django.txt
diff --git a/vim-plugins/eclim/doc/vim/python/index.txt b/vim-plugins/bundle/eclim/doc/vim/python/index.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/python/index.txt
rename to vim-plugins/bundle/eclim/doc/vim/python/index.txt
diff --git a/vim-plugins/eclim/doc/vim/python/path.txt b/vim-plugins/bundle/eclim/doc/vim/python/path.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/python/path.txt
rename to vim-plugins/bundle/eclim/doc/vim/python/path.txt
diff --git a/vim-plugins/eclim/doc/vim/python/search.txt b/vim-plugins/bundle/eclim/doc/vim/python/search.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/python/search.txt
rename to vim-plugins/bundle/eclim/doc/vim/python/search.txt
diff --git a/vim-plugins/eclim/doc/vim/python/validate.txt b/vim-plugins/bundle/eclim/doc/vim/python/validate.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/python/validate.txt
rename to vim-plugins/bundle/eclim/doc/vim/python/validate.txt
diff --git a/vim-plugins/eclim/doc/vim/refactoring.txt b/vim-plugins/bundle/eclim/doc/vim/refactoring.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/refactoring.txt
rename to vim-plugins/bundle/eclim/doc/vim/refactoring.txt
diff --git a/vim-plugins/eclim/doc/vim/ruby/buildpath.txt b/vim-plugins/bundle/eclim/doc/vim/ruby/buildpath.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/ruby/buildpath.txt
rename to vim-plugins/bundle/eclim/doc/vim/ruby/buildpath.txt
diff --git a/vim-plugins/eclim/doc/vim/ruby/complete.txt b/vim-plugins/bundle/eclim/doc/vim/ruby/complete.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/ruby/complete.txt
rename to vim-plugins/bundle/eclim/doc/vim/ruby/complete.txt
diff --git a/vim-plugins/eclim/doc/vim/ruby/index.txt b/vim-plugins/bundle/eclim/doc/vim/ruby/index.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/ruby/index.txt
rename to vim-plugins/bundle/eclim/doc/vim/ruby/index.txt
diff --git a/vim-plugins/eclim/doc/vim/ruby/search.txt b/vim-plugins/bundle/eclim/doc/vim/ruby/search.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/ruby/search.txt
rename to vim-plugins/bundle/eclim/doc/vim/ruby/search.txt
diff --git a/vim-plugins/eclim/doc/vim/ruby/validate.txt b/vim-plugins/bundle/eclim/doc/vim/ruby/validate.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/ruby/validate.txt
rename to vim-plugins/bundle/eclim/doc/vim/ruby/validate.txt
diff --git a/vim-plugins/eclim/doc/vim/scala/complete.txt b/vim-plugins/bundle/eclim/doc/vim/scala/complete.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/scala/complete.txt
rename to vim-plugins/bundle/eclim/doc/vim/scala/complete.txt
diff --git a/vim-plugins/eclim/doc/vim/scala/import.txt b/vim-plugins/bundle/eclim/doc/vim/scala/import.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/scala/import.txt
rename to vim-plugins/bundle/eclim/doc/vim/scala/import.txt
diff --git a/vim-plugins/eclim/doc/vim/scala/index.txt b/vim-plugins/bundle/eclim/doc/vim/scala/index.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/scala/index.txt
rename to vim-plugins/bundle/eclim/doc/vim/scala/index.txt
diff --git a/vim-plugins/eclim/doc/vim/scala/search.txt b/vim-plugins/bundle/eclim/doc/vim/scala/search.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/scala/search.txt
rename to vim-plugins/bundle/eclim/doc/vim/scala/search.txt
diff --git a/vim-plugins/eclim/doc/vim/scala/validate.txt b/vim-plugins/bundle/eclim/doc/vim/scala/validate.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/scala/validate.txt
rename to vim-plugins/bundle/eclim/doc/vim/scala/validate.txt
diff --git a/vim-plugins/eclim/doc/vim/search.txt b/vim-plugins/bundle/eclim/doc/vim/search.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/search.txt
rename to vim-plugins/bundle/eclim/doc/vim/search.txt
diff --git a/vim-plugins/eclim/doc/vim/settings.txt b/vim-plugins/bundle/eclim/doc/vim/settings.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/settings.txt
rename to vim-plugins/bundle/eclim/doc/vim/settings.txt
diff --git a/vim-plugins/eclim/doc/vim/validation.txt b/vim-plugins/bundle/eclim/doc/vim/validation.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/validation.txt
rename to vim-plugins/bundle/eclim/doc/vim/validation.txt
diff --git a/vim-plugins/eclim/doc/vim/xml/index.txt b/vim-plugins/bundle/eclim/doc/vim/xml/index.txt
similarity index 100%
rename from vim-plugins/eclim/doc/vim/xml/index.txt
rename to vim-plugins/bundle/eclim/doc/vim/xml/index.txt
diff --git a/vim-plugins/eclim/ftplugin/ant.vim b/vim-plugins/bundle/eclim/ftplugin/ant.vim
similarity index 100%
rename from vim-plugins/eclim/ftplugin/ant.vim
rename to vim-plugins/bundle/eclim/ftplugin/ant.vim
diff --git a/vim-plugins/eclim/ftplugin/commonsvalidator.vim b/vim-plugins/bundle/eclim/ftplugin/commonsvalidator.vim
similarity index 100%
rename from vim-plugins/eclim/ftplugin/commonsvalidator.vim
rename to vim-plugins/bundle/eclim/ftplugin/commonsvalidator.vim
diff --git a/vim-plugins/eclim/ftplugin/css.vim b/vim-plugins/bundle/eclim/ftplugin/css.vim
similarity index 100%
rename from vim-plugins/eclim/ftplugin/css.vim
rename to vim-plugins/bundle/eclim/ftplugin/css.vim
diff --git a/vim-plugins/eclim/ftplugin/dtd.vim b/vim-plugins/bundle/eclim/ftplugin/dtd.vim
similarity index 100%
rename from vim-plugins/eclim/ftplugin/dtd.vim
rename to vim-plugins/bundle/eclim/ftplugin/dtd.vim
diff --git a/vim-plugins/eclim/ftplugin/eclimhelp.vim b/vim-plugins/bundle/eclim/ftplugin/eclimhelp.vim
similarity index 100%
rename from vim-plugins/eclim/ftplugin/eclimhelp.vim
rename to vim-plugins/bundle/eclim/ftplugin/eclimhelp.vim
diff --git a/vim-plugins/eclim/ftplugin/eclipse_classpath.vim b/vim-plugins/bundle/eclim/ftplugin/eclipse_classpath.vim
similarity index 100%
rename from vim-plugins/eclim/ftplugin/eclipse_classpath.vim
rename to vim-plugins/bundle/eclim/ftplugin/eclipse_classpath.vim
diff --git a/vim-plugins/eclim/ftplugin/forrestdocument.vim b/vim-plugins/bundle/eclim/ftplugin/forrestdocument.vim
similarity index 100%
rename from vim-plugins/eclim/ftplugin/forrestdocument.vim
rename to vim-plugins/bundle/eclim/ftplugin/forrestdocument.vim
diff --git a/vim-plugins/eclim/ftplugin/forreststatus.vim b/vim-plugins/bundle/eclim/ftplugin/forreststatus.vim
similarity index 100%
rename from vim-plugins/eclim/ftplugin/forreststatus.vim
rename to vim-plugins/bundle/eclim/ftplugin/forreststatus.vim
diff --git a/vim-plugins/eclim/ftplugin/gant.vim b/vim-plugins/bundle/eclim/ftplugin/gant.vim
similarity index 100%
rename from vim-plugins/eclim/ftplugin/gant.vim
rename to vim-plugins/bundle/eclim/ftplugin/gant.vim
diff --git a/vim-plugins/eclim/ftplugin/hibernate.vim b/vim-plugins/bundle/eclim/ftplugin/hibernate.vim
similarity index 100%
rename from vim-plugins/eclim/ftplugin/hibernate.vim
rename to vim-plugins/bundle/eclim/ftplugin/hibernate.vim
diff --git a/vim-plugins/eclim/ftplugin/html.vim b/vim-plugins/bundle/eclim/ftplugin/html.vim
similarity index 100%
rename from vim-plugins/eclim/ftplugin/html.vim
rename to vim-plugins/bundle/eclim/ftplugin/html.vim
diff --git a/vim-plugins/eclim/ftplugin/ivy.vim b/vim-plugins/bundle/eclim/ftplugin/ivy.vim
similarity index 100%
rename from vim-plugins/eclim/ftplugin/ivy.vim
rename to vim-plugins/bundle/eclim/ftplugin/ivy.vim
diff --git a/vim-plugins/eclim/ftplugin/java-xml.vim b/vim-plugins/bundle/eclim/ftplugin/java-xml.vim
similarity index 100%
rename from vim-plugins/eclim/ftplugin/java-xml.vim
rename to vim-plugins/bundle/eclim/ftplugin/java-xml.vim
diff --git a/vim-plugins/eclim/ftplugin/java.vim b/vim-plugins/bundle/eclim/ftplugin/java.vim
similarity index 100%
rename from vim-plugins/eclim/ftplugin/java.vim
rename to vim-plugins/bundle/eclim/ftplugin/java.vim
diff --git a/vim-plugins/eclim/ftplugin/javascript.vim b/vim-plugins/bundle/eclim/ftplugin/javascript.vim
similarity index 100%
rename from vim-plugins/eclim/ftplugin/javascript.vim
rename to vim-plugins/bundle/eclim/ftplugin/javascript.vim
diff --git a/vim-plugins/eclim/ftplugin/junitresult.vim b/vim-plugins/bundle/eclim/ftplugin/junitresult.vim
similarity index 100%
rename from vim-plugins/eclim/ftplugin/junitresult.vim
rename to vim-plugins/bundle/eclim/ftplugin/junitresult.vim
diff --git a/vim-plugins/eclim/ftplugin/log4j.vim b/vim-plugins/bundle/eclim/ftplugin/log4j.vim
similarity index 100%
rename from vim-plugins/eclim/ftplugin/log4j.vim
rename to vim-plugins/bundle/eclim/ftplugin/log4j.vim
diff --git a/vim-plugins/eclim/ftplugin/make.vim b/vim-plugins/bundle/eclim/ftplugin/make.vim
similarity index 100%
rename from vim-plugins/eclim/ftplugin/make.vim
rename to vim-plugins/bundle/eclim/ftplugin/make.vim
diff --git a/vim-plugins/eclim/ftplugin/mvn_pom.vim b/vim-plugins/bundle/eclim/ftplugin/mvn_pom.vim
similarity index 100%
rename from vim-plugins/eclim/ftplugin/mvn_pom.vim
rename to vim-plugins/bundle/eclim/ftplugin/mvn_pom.vim
diff --git a/vim-plugins/eclim/ftplugin/spring.vim b/vim-plugins/bundle/eclim/ftplugin/spring.vim
similarity index 100%
rename from vim-plugins/eclim/ftplugin/spring.vim
rename to vim-plugins/bundle/eclim/ftplugin/spring.vim
diff --git a/vim-plugins/eclim/ftplugin/strutsconfig.vim b/vim-plugins/bundle/eclim/ftplugin/strutsconfig.vim
similarity index 100%
rename from vim-plugins/eclim/ftplugin/strutsconfig.vim
rename to vim-plugins/bundle/eclim/ftplugin/strutsconfig.vim
diff --git a/vim-plugins/eclim/ftplugin/tld.vim b/vim-plugins/bundle/eclim/ftplugin/tld.vim
similarity index 100%
rename from vim-plugins/eclim/ftplugin/tld.vim
rename to vim-plugins/bundle/eclim/ftplugin/tld.vim
diff --git a/vim-plugins/eclim/ftplugin/webxml.vim b/vim-plugins/bundle/eclim/ftplugin/webxml.vim
similarity index 100%
rename from vim-plugins/eclim/ftplugin/webxml.vim
rename to vim-plugins/bundle/eclim/ftplugin/webxml.vim
diff --git a/vim-plugins/eclim/ftplugin/wsdl.vim b/vim-plugins/bundle/eclim/ftplugin/wsdl.vim
similarity index 100%
rename from vim-plugins/eclim/ftplugin/wsdl.vim
rename to vim-plugins/bundle/eclim/ftplugin/wsdl.vim
diff --git a/vim-plugins/eclim/ftplugin/xml.vim b/vim-plugins/bundle/eclim/ftplugin/xml.vim
similarity index 100%
rename from vim-plugins/eclim/ftplugin/xml.vim
rename to vim-plugins/bundle/eclim/ftplugin/xml.vim
diff --git a/vim-plugins/eclim/ftplugin/xml_complete.vim b/vim-plugins/bundle/eclim/ftplugin/xml_complete.vim
similarity index 100%
rename from vim-plugins/eclim/ftplugin/xml_complete.vim
rename to vim-plugins/bundle/eclim/ftplugin/xml_complete.vim
diff --git a/vim-plugins/eclim/ftplugin/xsd.vim b/vim-plugins/bundle/eclim/ftplugin/xsd.vim
similarity index 100%
rename from vim-plugins/eclim/ftplugin/xsd.vim
rename to vim-plugins/bundle/eclim/ftplugin/xsd.vim
diff --git a/vim-plugins/eclim/indent/css.vim b/vim-plugins/bundle/eclim/indent/css.vim
similarity index 100%
rename from vim-plugins/eclim/indent/css.vim
rename to vim-plugins/bundle/eclim/indent/css.vim
diff --git a/vim-plugins/eclim/indent/dtd.vim b/vim-plugins/bundle/eclim/indent/dtd.vim
similarity index 100%
rename from vim-plugins/eclim/indent/dtd.vim
rename to vim-plugins/bundle/eclim/indent/dtd.vim
diff --git a/vim-plugins/eclim/indent/html.vim b/vim-plugins/bundle/eclim/indent/html.vim
similarity index 100%
rename from vim-plugins/eclim/indent/html.vim
rename to vim-plugins/bundle/eclim/indent/html.vim
diff --git a/vim-plugins/eclim/indent/indentanything.vim b/vim-plugins/bundle/eclim/indent/indentanything.vim
similarity index 100%
rename from vim-plugins/eclim/indent/indentanything.vim
rename to vim-plugins/bundle/eclim/indent/indentanything.vim
diff --git a/vim-plugins/eclim/indent/javascript.vim b/vim-plugins/bundle/eclim/indent/javascript.vim
similarity index 100%
rename from vim-plugins/eclim/indent/javascript.vim
rename to vim-plugins/bundle/eclim/indent/javascript.vim
diff --git a/vim-plugins/eclim/indent/xml.vim b/vim-plugins/bundle/eclim/indent/xml.vim
similarity index 100%
rename from vim-plugins/eclim/indent/xml.vim
rename to vim-plugins/bundle/eclim/indent/xml.vim
diff --git a/vim-plugins/eclim/plugin/eclim.vim b/vim-plugins/bundle/eclim/plugin/eclim.vim
similarity index 100%
rename from vim-plugins/eclim/plugin/eclim.vim
rename to vim-plugins/bundle/eclim/plugin/eclim.vim
diff --git a/vim-plugins/eclim/plugin/ftdetect.vim b/vim-plugins/bundle/eclim/plugin/ftdetect.vim
similarity index 100%
rename from vim-plugins/eclim/plugin/ftdetect.vim
rename to vim-plugins/bundle/eclim/plugin/ftdetect.vim
diff --git a/vim-plugins/eclim/plugin/ftdetect_jdt.vim b/vim-plugins/bundle/eclim/plugin/ftdetect_jdt.vim
similarity index 100%
rename from vim-plugins/eclim/plugin/ftdetect_jdt.vim
rename to vim-plugins/bundle/eclim/plugin/ftdetect_jdt.vim
diff --git a/vim-plugins/eclim/plugin/java_tools.vim b/vim-plugins/bundle/eclim/plugin/java_tools.vim
similarity index 100%
rename from vim-plugins/eclim/plugin/java_tools.vim
rename to vim-plugins/bundle/eclim/plugin/java_tools.vim
diff --git a/vim-plugins/eclim/plugin/project.vim b/vim-plugins/bundle/eclim/plugin/project.vim
similarity index 100%
rename from vim-plugins/eclim/plugin/project.vim
rename to vim-plugins/bundle/eclim/plugin/project.vim
diff --git a/vim-plugins/eclim/plugin/settings_java.vim b/vim-plugins/bundle/eclim/plugin/settings_java.vim
similarity index 100%
rename from vim-plugins/eclim/plugin/settings_java.vim
rename to vim-plugins/bundle/eclim/plugin/settings_java.vim
diff --git a/vim-plugins/eclim/plugin/settings_web.vim b/vim-plugins/bundle/eclim/plugin/settings_web.vim
similarity index 100%
rename from vim-plugins/eclim/plugin/settings_web.vim
rename to vim-plugins/bundle/eclim/plugin/settings_web.vim
diff --git a/vim-plugins/eclim/plugin/vimplugin.vim b/vim-plugins/bundle/eclim/plugin/vimplugin.vim
similarity index 100%
rename from vim-plugins/eclim/plugin/vimplugin.vim
rename to vim-plugins/bundle/eclim/plugin/vimplugin.vim
diff --git a/vim-plugins/eclim/syntax/ant.vim b/vim-plugins/bundle/eclim/syntax/ant.vim
similarity index 100%
rename from vim-plugins/eclim/syntax/ant.vim
rename to vim-plugins/bundle/eclim/syntax/ant.vim
diff --git a/vim-plugins/eclim/syntax/commonsvalidator.vim b/vim-plugins/bundle/eclim/syntax/commonsvalidator.vim
similarity index 100%
rename from vim-plugins/eclim/syntax/commonsvalidator.vim
rename to vim-plugins/bundle/eclim/syntax/commonsvalidator.vim
diff --git a/vim-plugins/eclim/syntax/css.vim b/vim-plugins/bundle/eclim/syntax/css.vim
similarity index 100%
rename from vim-plugins/eclim/syntax/css.vim
rename to vim-plugins/bundle/eclim/syntax/css.vim
diff --git a/vim-plugins/eclim/syntax/eclim_filelist.vim b/vim-plugins/bundle/eclim/syntax/eclim_filelist.vim
similarity index 100%
rename from vim-plugins/eclim/syntax/eclim_filelist.vim
rename to vim-plugins/bundle/eclim/syntax/eclim_filelist.vim
diff --git a/vim-plugins/eclim/syntax/eclimhelp.vim b/vim-plugins/bundle/eclim/syntax/eclimhelp.vim
similarity index 100%
rename from vim-plugins/eclim/syntax/eclimhelp.vim
rename to vim-plugins/bundle/eclim/syntax/eclimhelp.vim
diff --git a/vim-plugins/eclim/syntax/eclipse_classpath.vim b/vim-plugins/bundle/eclim/syntax/eclipse_classpath.vim
similarity index 100%
rename from vim-plugins/eclim/syntax/eclipse_classpath.vim
rename to vim-plugins/bundle/eclim/syntax/eclipse_classpath.vim
diff --git a/vim-plugins/eclim/syntax/forrestdocument.vim b/vim-plugins/bundle/eclim/syntax/forrestdocument.vim
similarity index 100%
rename from vim-plugins/eclim/syntax/forrestdocument.vim
rename to vim-plugins/bundle/eclim/syntax/forrestdocument.vim
diff --git a/vim-plugins/eclim/syntax/forreststatus.vim b/vim-plugins/bundle/eclim/syntax/forreststatus.vim
similarity index 100%
rename from vim-plugins/eclim/syntax/forreststatus.vim
rename to vim-plugins/bundle/eclim/syntax/forreststatus.vim
diff --git a/vim-plugins/eclim/syntax/gant.vim b/vim-plugins/bundle/eclim/syntax/gant.vim
similarity index 100%
rename from vim-plugins/eclim/syntax/gant.vim
rename to vim-plugins/bundle/eclim/syntax/gant.vim
diff --git a/vim-plugins/eclim/syntax/groovy_simple_template.vim b/vim-plugins/bundle/eclim/syntax/groovy_simple_template.vim
similarity index 100%
rename from vim-plugins/eclim/syntax/groovy_simple_template.vim
rename to vim-plugins/bundle/eclim/syntax/groovy_simple_template.vim
diff --git a/vim-plugins/eclim/syntax/hg.vim b/vim-plugins/bundle/eclim/syntax/hg.vim
similarity index 100%
rename from vim-plugins/eclim/syntax/hg.vim
rename to vim-plugins/bundle/eclim/syntax/hg.vim
diff --git a/vim-plugins/eclim/syntax/hibernate.vim b/vim-plugins/bundle/eclim/syntax/hibernate.vim
similarity index 100%
rename from vim-plugins/eclim/syntax/hibernate.vim
rename to vim-plugins/bundle/eclim/syntax/hibernate.vim
diff --git a/vim-plugins/eclim/syntax/html.vim b/vim-plugins/bundle/eclim/syntax/html.vim
similarity index 100%
rename from vim-plugins/eclim/syntax/html.vim
rename to vim-plugins/bundle/eclim/syntax/html.vim
diff --git a/vim-plugins/eclim/syntax/ivy.vim b/vim-plugins/bundle/eclim/syntax/ivy.vim
similarity index 100%
rename from vim-plugins/eclim/syntax/ivy.vim
rename to vim-plugins/bundle/eclim/syntax/ivy.vim
diff --git a/vim-plugins/eclim/syntax/java.vim b/vim-plugins/bundle/eclim/syntax/java.vim
similarity index 100%
rename from vim-plugins/eclim/syntax/java.vim
rename to vim-plugins/bundle/eclim/syntax/java.vim
diff --git a/vim-plugins/eclim/syntax/junitresult.vim b/vim-plugins/bundle/eclim/syntax/junitresult.vim
similarity index 100%
rename from vim-plugins/eclim/syntax/junitresult.vim
rename to vim-plugins/bundle/eclim/syntax/junitresult.vim
diff --git a/vim-plugins/eclim/syntax/log4j.vim b/vim-plugins/bundle/eclim/syntax/log4j.vim
similarity index 100%
rename from vim-plugins/eclim/syntax/log4j.vim
rename to vim-plugins/bundle/eclim/syntax/log4j.vim
diff --git a/vim-plugins/eclim/syntax/mvn_pom.vim b/vim-plugins/bundle/eclim/syntax/mvn_pom.vim
similarity index 100%
rename from vim-plugins/eclim/syntax/mvn_pom.vim
rename to vim-plugins/bundle/eclim/syntax/mvn_pom.vim
diff --git a/vim-plugins/eclim/syntax/mysql.vim b/vim-plugins/bundle/eclim/syntax/mysql.vim
similarity index 100%
rename from vim-plugins/eclim/syntax/mysql.vim
rename to vim-plugins/bundle/eclim/syntax/mysql.vim
diff --git a/vim-plugins/eclim/syntax/perl.vim b/vim-plugins/bundle/eclim/syntax/perl.vim
similarity index 100%
rename from vim-plugins/eclim/syntax/perl.vim
rename to vim-plugins/bundle/eclim/syntax/perl.vim
diff --git a/vim-plugins/eclim/syntax/spring.vim b/vim-plugins/bundle/eclim/syntax/spring.vim
similarity index 100%
rename from vim-plugins/eclim/syntax/spring.vim
rename to vim-plugins/bundle/eclim/syntax/spring.vim
diff --git a/vim-plugins/eclim/syntax/sql.vim b/vim-plugins/bundle/eclim/syntax/sql.vim
similarity index 100%
rename from vim-plugins/eclim/syntax/sql.vim
rename to vim-plugins/bundle/eclim/syntax/sql.vim
diff --git a/vim-plugins/eclim/syntax/strutsconfig.vim b/vim-plugins/bundle/eclim/syntax/strutsconfig.vim
similarity index 100%
rename from vim-plugins/eclim/syntax/strutsconfig.vim
rename to vim-plugins/bundle/eclim/syntax/strutsconfig.vim
diff --git a/vim-plugins/eclim/syntax/tld.vim b/vim-plugins/bundle/eclim/syntax/tld.vim
similarity index 100%
rename from vim-plugins/eclim/syntax/tld.vim
rename to vim-plugins/bundle/eclim/syntax/tld.vim
diff --git a/vim-plugins/eclim/syntax/webxml.vim b/vim-plugins/bundle/eclim/syntax/webxml.vim
similarity index 100%
rename from vim-plugins/eclim/syntax/webxml.vim
rename to vim-plugins/bundle/eclim/syntax/webxml.vim
diff --git a/vim-plugins/eclim/syntax/wsdl.vim b/vim-plugins/bundle/eclim/syntax/wsdl.vim
similarity index 100%
rename from vim-plugins/eclim/syntax/wsdl.vim
rename to vim-plugins/bundle/eclim/syntax/wsdl.vim
diff --git a/vim-plugins/eclim/syntax/xml.vim b/vim-plugins/bundle/eclim/syntax/xml.vim
similarity index 100%
rename from vim-plugins/eclim/syntax/xml.vim
rename to vim-plugins/bundle/eclim/syntax/xml.vim
diff --git a/vim-plugins/python-mode/.bumpversion.cfg b/vim-plugins/bundle/python-mode/.bumpversion.cfg
similarity index 100%
rename from vim-plugins/python-mode/.bumpversion.cfg
rename to vim-plugins/bundle/python-mode/.bumpversion.cfg
diff --git a/vim-plugins/python-mode/.ruby-gemset b/vim-plugins/bundle/python-mode/.ruby-gemset
similarity index 100%
rename from vim-plugins/python-mode/.ruby-gemset
rename to vim-plugins/bundle/python-mode/.ruby-gemset
diff --git a/vim-plugins/python-mode/.ruby-version b/vim-plugins/bundle/python-mode/.ruby-version
similarity index 100%
rename from vim-plugins/python-mode/.ruby-version
rename to vim-plugins/bundle/python-mode/.ruby-version
diff --git a/vim-plugins/python-mode/.travis.yml b/vim-plugins/bundle/python-mode/.travis.yml
similarity index 100%
rename from vim-plugins/python-mode/.travis.yml
rename to vim-plugins/bundle/python-mode/.travis.yml
diff --git a/vim-plugins/python-mode/AUTHORS b/vim-plugins/bundle/python-mode/AUTHORS
similarity index 100%
rename from vim-plugins/python-mode/AUTHORS
rename to vim-plugins/bundle/python-mode/AUTHORS
diff --git a/vim-plugins/python-mode/COPYING b/vim-plugins/bundle/python-mode/COPYING
similarity index 100%
rename from vim-plugins/python-mode/COPYING
rename to vim-plugins/bundle/python-mode/COPYING
diff --git a/vim-plugins/python-mode/Changelog.rst b/vim-plugins/bundle/python-mode/Changelog.rst
similarity index 100%
rename from vim-plugins/python-mode/Changelog.rst
rename to vim-plugins/bundle/python-mode/Changelog.rst
diff --git a/vim-plugins/python-mode/Gemfile b/vim-plugins/bundle/python-mode/Gemfile
similarity index 100%
rename from vim-plugins/python-mode/Gemfile
rename to vim-plugins/bundle/python-mode/Gemfile
diff --git a/vim-plugins/python-mode/Makefile b/vim-plugins/bundle/python-mode/Makefile
similarity index 100%
rename from vim-plugins/python-mode/Makefile
rename to vim-plugins/bundle/python-mode/Makefile
diff --git a/vim-plugins/python-mode/README.rst b/vim-plugins/bundle/python-mode/README.rst
similarity index 100%
rename from vim-plugins/python-mode/README.rst
rename to vim-plugins/bundle/python-mode/README.rst
diff --git a/vim-plugins/python-mode/Rakefile b/vim-plugins/bundle/python-mode/Rakefile
similarity index 100%
rename from vim-plugins/python-mode/Rakefile
rename to vim-plugins/bundle/python-mode/Rakefile
diff --git a/vim-plugins/python-mode/after/ftplugin/pyrex.vim b/vim-plugins/bundle/python-mode/after/ftplugin/pyrex.vim
similarity index 100%
rename from vim-plugins/python-mode/after/ftplugin/pyrex.vim
rename to vim-plugins/bundle/python-mode/after/ftplugin/pyrex.vim
diff --git a/vim-plugins/python-mode/after/ftplugin/python.vim b/vim-plugins/bundle/python-mode/after/ftplugin/python.vim
similarity index 100%
rename from vim-plugins/python-mode/after/ftplugin/python.vim
rename to vim-plugins/bundle/python-mode/after/ftplugin/python.vim
diff --git a/vim-plugins/python-mode/after/indent/pyrex.vim b/vim-plugins/bundle/python-mode/after/indent/pyrex.vim
similarity index 100%
rename from vim-plugins/python-mode/after/indent/pyrex.vim
rename to vim-plugins/bundle/python-mode/after/indent/pyrex.vim
diff --git a/vim-plugins/python-mode/after/indent/python.vim b/vim-plugins/bundle/python-mode/after/indent/python.vim
similarity index 100%
rename from vim-plugins/python-mode/after/indent/python.vim
rename to vim-plugins/bundle/python-mode/after/indent/python.vim
diff --git a/vim-plugins/python-mode/autoload/pymode.vim b/vim-plugins/bundle/python-mode/autoload/pymode.vim
similarity index 100%
rename from vim-plugins/python-mode/autoload/pymode.vim
rename to vim-plugins/bundle/python-mode/autoload/pymode.vim
diff --git a/vim-plugins/python-mode/autoload/pymode/breakpoint.vim b/vim-plugins/bundle/python-mode/autoload/pymode/breakpoint.vim
similarity index 100%
rename from vim-plugins/python-mode/autoload/pymode/breakpoint.vim
rename to vim-plugins/bundle/python-mode/autoload/pymode/breakpoint.vim
diff --git a/vim-plugins/python-mode/autoload/pymode/doc.vim b/vim-plugins/bundle/python-mode/autoload/pymode/doc.vim
similarity index 100%
rename from vim-plugins/python-mode/autoload/pymode/doc.vim
rename to vim-plugins/bundle/python-mode/autoload/pymode/doc.vim
diff --git a/vim-plugins/python-mode/autoload/pymode/folding.vim b/vim-plugins/bundle/python-mode/autoload/pymode/folding.vim
similarity index 100%
rename from vim-plugins/python-mode/autoload/pymode/folding.vim
rename to vim-plugins/bundle/python-mode/autoload/pymode/folding.vim
diff --git a/vim-plugins/python-mode/autoload/pymode/indent.vim b/vim-plugins/bundle/python-mode/autoload/pymode/indent.vim
similarity index 100%
rename from vim-plugins/python-mode/autoload/pymode/indent.vim
rename to vim-plugins/bundle/python-mode/autoload/pymode/indent.vim
diff --git a/vim-plugins/python-mode/autoload/pymode/lint.vim b/vim-plugins/bundle/python-mode/autoload/pymode/lint.vim
similarity index 100%
rename from vim-plugins/python-mode/autoload/pymode/lint.vim
rename to vim-plugins/bundle/python-mode/autoload/pymode/lint.vim
diff --git a/vim-plugins/python-mode/autoload/pymode/motion.vim b/vim-plugins/bundle/python-mode/autoload/pymode/motion.vim
similarity index 100%
rename from vim-plugins/python-mode/autoload/pymode/motion.vim
rename to vim-plugins/bundle/python-mode/autoload/pymode/motion.vim
diff --git a/vim-plugins/python-mode/autoload/pymode/rope.vim b/vim-plugins/bundle/python-mode/autoload/pymode/rope.vim
similarity index 100%
rename from vim-plugins/python-mode/autoload/pymode/rope.vim
rename to vim-plugins/bundle/python-mode/autoload/pymode/rope.vim
diff --git a/vim-plugins/python-mode/autoload/pymode/run.vim b/vim-plugins/bundle/python-mode/autoload/pymode/run.vim
similarity index 100%
rename from vim-plugins/python-mode/autoload/pymode/run.vim
rename to vim-plugins/bundle/python-mode/autoload/pymode/run.vim
diff --git a/vim-plugins/python-mode/autoload/pymode/tools/loclist.vim b/vim-plugins/bundle/python-mode/autoload/pymode/tools/loclist.vim
similarity index 100%
rename from vim-plugins/python-mode/autoload/pymode/tools/loclist.vim
rename to vim-plugins/bundle/python-mode/autoload/pymode/tools/loclist.vim
diff --git a/vim-plugins/python-mode/autoload/pymode/tools/signs.vim b/vim-plugins/bundle/python-mode/autoload/pymode/tools/signs.vim
similarity index 100%
rename from vim-plugins/python-mode/autoload/pymode/tools/signs.vim
rename to vim-plugins/bundle/python-mode/autoload/pymode/tools/signs.vim
diff --git a/vim-plugins/python-mode/autoload/pymode/troubleshooting.vim b/vim-plugins/bundle/python-mode/autoload/pymode/troubleshooting.vim
similarity index 100%
rename from vim-plugins/python-mode/autoload/pymode/troubleshooting.vim
rename to vim-plugins/bundle/python-mode/autoload/pymode/troubleshooting.vim
diff --git a/vim-plugins/python-mode/autoload/pymode/virtualenv.vim b/vim-plugins/bundle/python-mode/autoload/pymode/virtualenv.vim
similarity index 100%
rename from vim-plugins/python-mode/autoload/pymode/virtualenv.vim
rename to vim-plugins/bundle/python-mode/autoload/pymode/virtualenv.vim
diff --git a/vim-plugins/python-mode/debug.vim b/vim-plugins/bundle/python-mode/debug.vim
similarity index 100%
rename from vim-plugins/python-mode/debug.vim
rename to vim-plugins/bundle/python-mode/debug.vim
diff --git a/vim-plugins/python-mode/doc/pymode.txt b/vim-plugins/bundle/python-mode/doc/pymode.txt
similarity index 100%
rename from vim-plugins/python-mode/doc/pymode.txt
rename to vim-plugins/bundle/python-mode/doc/pymode.txt
diff --git a/vim-plugins/python-mode/ftplugin/pyrex.vim b/vim-plugins/bundle/python-mode/ftplugin/pyrex.vim
similarity index 100%
rename from vim-plugins/python-mode/ftplugin/pyrex.vim
rename to vim-plugins/bundle/python-mode/ftplugin/pyrex.vim
diff --git a/vim-plugins/python-mode/ftplugin/python/pymode.vim b/vim-plugins/bundle/python-mode/ftplugin/python/pymode.vim
similarity index 100%
rename from vim-plugins/python-mode/ftplugin/python/pymode.vim
rename to vim-plugins/bundle/python-mode/ftplugin/python/pymode.vim
diff --git a/vim-plugins/python-mode/logo.png b/vim-plugins/bundle/python-mode/logo.png
similarity index 100%
rename from vim-plugins/python-mode/logo.png
rename to vim-plugins/bundle/python-mode/logo.png
diff --git a/vim-plugins/python-mode/plugin/pymode.vim b/vim-plugins/bundle/python-mode/plugin/pymode.vim
similarity index 100%
rename from vim-plugins/python-mode/plugin/pymode.vim
rename to vim-plugins/bundle/python-mode/plugin/pymode.vim
diff --git a/vim-plugins/python-mode/pylama.ini b/vim-plugins/bundle/python-mode/pylama.ini
similarity index 100%
rename from vim-plugins/python-mode/pylama.ini
rename to vim-plugins/bundle/python-mode/pylama.ini
diff --git a/vim-plugins/python-mode/pymode/__init__.py b/vim-plugins/bundle/python-mode/pymode/__init__.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/__init__.py
rename to vim-plugins/bundle/python-mode/pymode/__init__.py
diff --git a/vim-plugins/python-mode/pymode/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/__pycache__/__init__.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/__pycache__/__init__.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/__pycache__/__init__.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/__pycache__/_compat.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/__pycache__/_compat.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/__pycache__/_compat.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/__pycache__/_compat.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/__pycache__/autopep8.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/__pycache__/autopep8.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/__pycache__/autopep8.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/__pycache__/autopep8.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/__pycache__/environment.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/__pycache__/environment.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/__pycache__/environment.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/__pycache__/environment.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/__pycache__/lint.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/__pycache__/lint.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/__pycache__/lint.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/__pycache__/lint.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/__pycache__/rope.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/__pycache__/rope.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/__pycache__/rope.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/__pycache__/rope.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/__pycache__/run.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/__pycache__/run.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/__pycache__/run.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/__pycache__/run.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/__pycache__/utils.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/__pycache__/utils.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/__pycache__/utils.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/__pycache__/utils.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/__pycache__/virtualenv.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/__pycache__/virtualenv.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/__pycache__/virtualenv.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/__pycache__/virtualenv.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/_compat.py b/vim-plugins/bundle/python-mode/pymode/_compat.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/_compat.py
rename to vim-plugins/bundle/python-mode/pymode/_compat.py
diff --git a/vim-plugins/python-mode/pymode/async.py b/vim-plugins/bundle/python-mode/pymode/async.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/async.py
rename to vim-plugins/bundle/python-mode/pymode/async.py
diff --git a/vim-plugins/python-mode/pymode/autopep8.py b/vim-plugins/bundle/python-mode/pymode/autopep8.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/autopep8.py
rename to vim-plugins/bundle/python-mode/pymode/autopep8.py
diff --git a/vim-plugins/python-mode/pymode/environment.py b/vim-plugins/bundle/python-mode/pymode/environment.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/environment.py
rename to vim-plugins/bundle/python-mode/pymode/environment.py
diff --git a/vim-plugins/python-mode/pymode/libs/__pycache__/mccabe.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/__pycache__/mccabe.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/__pycache__/mccabe.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/__pycache__/mccabe.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/__pycache__/pep257.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/__pycache__/pep257.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/__pycache__/pep257.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/__pycache__/pep257.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/__pycache__/pep8.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/__pycache__/pep8.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/__pycache__/pep8.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/__pycache__/pep8.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/__pycache__/six.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/__pycache__/six.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/__pycache__/six.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/__pycache__/six.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/_markerlib/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/_markerlib/__init__.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/_markerlib/__init__.py
rename to vim-plugins/bundle/python-mode/pymode/libs/_markerlib/__init__.py
diff --git a/vim-plugins/python-mode/pymode/libs/_markerlib/markers.py b/vim-plugins/bundle/python-mode/pymode/libs/_markerlib/markers.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/_markerlib/markers.py
rename to vim-plugins/bundle/python-mode/pymode/libs/_markerlib/markers.py
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__init__.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/__init__.py
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/__init__.py
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/__pkginfo__.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pkginfo__.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/__pkginfo__.py
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/__pkginfo__.py
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/__init__.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/__pycache__/__init__.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/__init__.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/__pycache__/__pkginfo__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/__pkginfo__.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/__pycache__/__pkginfo__.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/__pkginfo__.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/__pycache__/as_string.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/as_string.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/__pycache__/as_string.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/as_string.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/__pycache__/astpeephole.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/astpeephole.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/__pycache__/astpeephole.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/astpeephole.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/__pycache__/bases.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/bases.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/__pycache__/bases.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/bases.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/__pycache__/builder.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/builder.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/__pycache__/builder.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/builder.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/__pycache__/exceptions.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/exceptions.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/__pycache__/exceptions.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/exceptions.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/__pycache__/inference.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/inference.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/__pycache__/inference.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/inference.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/__pycache__/manager.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/manager.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/__pycache__/manager.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/manager.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/__pycache__/mixins.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/mixins.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/__pycache__/mixins.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/mixins.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/__pycache__/modutils.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/modutils.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/__pycache__/modutils.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/modutils.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/__pycache__/node_classes.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/node_classes.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/__pycache__/node_classes.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/node_classes.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/__pycache__/nodes.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/nodes.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/__pycache__/nodes.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/nodes.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/__pycache__/protocols.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/protocols.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/__pycache__/protocols.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/protocols.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/__pycache__/raw_building.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/raw_building.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/__pycache__/raw_building.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/raw_building.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/__pycache__/rebuilder.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/rebuilder.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/__pycache__/rebuilder.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/rebuilder.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/__pycache__/scoped_nodes.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/scoped_nodes.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/__pycache__/scoped_nodes.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/scoped_nodes.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/as_string.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/as_string.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/as_string.py
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/as_string.py
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/astpeephole.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/astpeephole.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/astpeephole.py
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/astpeephole.py
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/bases.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/bases.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/bases.py
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/bases.py
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/brain/__pycache__/builtin_inference.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/builtin_inference.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/brain/__pycache__/builtin_inference.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/builtin_inference.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/brain/__pycache__/py2gi.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/py2gi.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/brain/__pycache__/py2gi.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/py2gi.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/brain/__pycache__/py2mechanize.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/py2mechanize.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/brain/__pycache__/py2mechanize.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/py2mechanize.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/brain/__pycache__/py2pytest.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/py2pytest.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/brain/__pycache__/py2pytest.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/py2pytest.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/brain/__pycache__/py2qt4.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/py2qt4.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/brain/__pycache__/py2qt4.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/py2qt4.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/brain/__pycache__/py2stdlib.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/py2stdlib.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/brain/__pycache__/py2stdlib.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/py2stdlib.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/brain/__pycache__/pynose.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/pynose.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/brain/__pycache__/pynose.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/pynose.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/brain/__pycache__/pysix_moves.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/pysix_moves.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/brain/__pycache__/pysix_moves.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/pysix_moves.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/brain/builtin_inference.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/builtin_inference.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/brain/builtin_inference.py
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/builtin_inference.py
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/brain/py2gi.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/py2gi.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/brain/py2gi.py
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/py2gi.py
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/brain/py2mechanize.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/py2mechanize.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/brain/py2mechanize.py
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/py2mechanize.py
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/brain/py2pytest.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/py2pytest.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/brain/py2pytest.py
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/py2pytest.py
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/brain/py2qt4.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/py2qt4.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/brain/py2qt4.py
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/py2qt4.py
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/brain/py2stdlib.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/py2stdlib.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/brain/py2stdlib.py
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/py2stdlib.py
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/brain/pynose.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/pynose.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/brain/pynose.py
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/pynose.py
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/brain/pysix_moves.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/pysix_moves.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/brain/pysix_moves.py
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/pysix_moves.py
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/builder.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/builder.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/builder.py
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/builder.py
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/exceptions.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/exceptions.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/exceptions.py
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/exceptions.py
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/inference.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/inference.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/inference.py
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/inference.py
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/inspector.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/inspector.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/inspector.py
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/inspector.py
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/manager.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/manager.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/manager.py
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/manager.py
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/mixins.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/mixins.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/mixins.py
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/mixins.py
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/modutils.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/modutils.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/modutils.py
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/modutils.py
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/node_classes.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/node_classes.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/node_classes.py
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/node_classes.py
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/nodes.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/nodes.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/nodes.py
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/nodes.py
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/protocols.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/protocols.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/protocols.py
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/protocols.py
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/raw_building.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/raw_building.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/raw_building.py
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/raw_building.py
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/rebuilder.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/rebuilder.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/rebuilder.py
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/rebuilder.py
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/scoped_nodes.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/scoped_nodes.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/scoped_nodes.py
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/scoped_nodes.py
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/test_utils.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/test_utils.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/test_utils.py
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/test_utils.py
diff --git a/vim-plugins/python-mode/pymode/libs/astroid/utils.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/utils.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/astroid/utils.py
rename to vim-plugins/bundle/python-mode/pymode/libs/astroid/utils.py
diff --git a/vim-plugins/python-mode/pymode/libs/easy_install.py b/vim-plugins/bundle/python-mode/pymode/libs/easy_install.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/easy_install.py
rename to vim-plugins/bundle/python-mode/pymode/libs/easy_install.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/__init__.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/__init__.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/__init__.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/logilab/__pycache__/__init__.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/__pycache__/__init__.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/__pycache__/__init__.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__init__.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/__init__.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__init__.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/__init__.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/__pycache__/__init__.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/__init__.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/__pycache__/changelog.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/changelog.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/__pycache__/changelog.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/changelog.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/__pycache__/compat.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/compat.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/__pycache__/compat.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/compat.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/__pycache__/configuration.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/configuration.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/__pycache__/configuration.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/configuration.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/__pycache__/decorators.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/decorators.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/__pycache__/decorators.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/decorators.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/__pycache__/deprecation.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/deprecation.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/__pycache__/deprecation.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/deprecation.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/__pycache__/interface.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/interface.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/__pycache__/interface.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/interface.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/__pycache__/optik_ext.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/optik_ext.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/__pycache__/optik_ext.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/optik_ext.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/__pycache__/textutils.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/textutils.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/__pycache__/textutils.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/textutils.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/__pycache__/tree.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/tree.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/__pycache__/tree.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/tree.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/__pycache__/visitor.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/visitor.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/__pycache__/visitor.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/visitor.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/cache.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/cache.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/cache.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/cache.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/changelog.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/changelog.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/changelog.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/changelog.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/clcommands.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/clcommands.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/clcommands.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/clcommands.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/compat.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/compat.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/compat.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/compat.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/configuration.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/configuration.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/configuration.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/configuration.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/daemon.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/daemon.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/daemon.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/daemon.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/date.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/date.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/date.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/date.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/debugger.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/debugger.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/debugger.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/debugger.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/decorators.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/decorators.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/decorators.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/decorators.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/deprecation.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/deprecation.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/deprecation.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/deprecation.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/fileutils.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/fileutils.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/fileutils.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/fileutils.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/graph.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/graph.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/graph.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/graph.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/interface.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/interface.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/interface.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/interface.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/logging_ext.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/logging_ext.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/logging_ext.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/logging_ext.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/modutils.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/modutils.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/modutils.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/modutils.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/optik_ext.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/optik_ext.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/optik_ext.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/optik_ext.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/optparser.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/optparser.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/optparser.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/optparser.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/proc.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/proc.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/proc.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/proc.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/pytest.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/pytest.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/pytest.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/pytest.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/registry.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/registry.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/registry.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/registry.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/shellutils.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/shellutils.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/shellutils.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/shellutils.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/sphinx_ext.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/sphinx_ext.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/sphinx_ext.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/sphinx_ext.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/sphinxutils.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/sphinxutils.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/sphinxutils.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/sphinxutils.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/table.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/table.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/table.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/table.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/tasksqueue.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/tasksqueue.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/tasksqueue.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/tasksqueue.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/testlib.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/testlib.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/testlib.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/testlib.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/textutils.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/textutils.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/textutils.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/textutils.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/tree.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/tree.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/tree.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/tree.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/umessage.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/umessage.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/umessage.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/umessage.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/ureports/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/__init__.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/ureports/__init__.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/__init__.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/ureports/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/__pycache__/__init__.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/ureports/__pycache__/__init__.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/__pycache__/__init__.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/ureports/__pycache__/html_writer.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/__pycache__/html_writer.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/ureports/__pycache__/html_writer.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/__pycache__/html_writer.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/ureports/__pycache__/nodes.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/__pycache__/nodes.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/ureports/__pycache__/nodes.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/__pycache__/nodes.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/ureports/__pycache__/text_writer.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/__pycache__/text_writer.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/ureports/__pycache__/text_writer.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/__pycache__/text_writer.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/ureports/docbook_writer.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/docbook_writer.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/ureports/docbook_writer.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/docbook_writer.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/ureports/html_writer.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/html_writer.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/ureports/html_writer.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/html_writer.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/ureports/nodes.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/nodes.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/ureports/nodes.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/nodes.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/ureports/text_writer.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/text_writer.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/ureports/text_writer.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/text_writer.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/urllib2ext.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/urllib2ext.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/urllib2ext.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/urllib2ext.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/vcgutils.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/vcgutils.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/vcgutils.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/vcgutils.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/visitor.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/visitor.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/visitor.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/visitor.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab/common/xmlutils.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/xmlutils.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab/common/xmlutils.py
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab/common/xmlutils.py
diff --git a/vim-plugins/python-mode/pymode/libs/logilab_common-1.0.2-py2.7-nspkg.pth b/vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2-py2.7-nspkg.pth
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab_common-1.0.2-py2.7-nspkg.pth
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2-py2.7-nspkg.pth
diff --git a/vim-plugins/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/DESCRIPTION.rst b/vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/DESCRIPTION.rst
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/DESCRIPTION.rst
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/DESCRIPTION.rst
diff --git a/vim-plugins/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/METADATA b/vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/METADATA
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/METADATA
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/METADATA
diff --git a/vim-plugins/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/RECORD b/vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/RECORD
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/RECORD
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/RECORD
diff --git a/vim-plugins/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/WHEEL b/vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/WHEEL
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/WHEEL
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/WHEEL
diff --git a/vim-plugins/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/metadata.json b/vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/metadata.json
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/metadata.json
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/metadata.json
diff --git a/vim-plugins/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/namespace_packages.txt b/vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/namespace_packages.txt
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/namespace_packages.txt
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/namespace_packages.txt
diff --git a/vim-plugins/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/top_level.txt b/vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/top_level.txt
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/top_level.txt
rename to vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/top_level.txt
diff --git a/vim-plugins/python-mode/pymode/libs/mccabe.py b/vim-plugins/bundle/python-mode/pymode/libs/mccabe.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/mccabe.py
rename to vim-plugins/bundle/python-mode/pymode/libs/mccabe.py
diff --git a/vim-plugins/python-mode/pymode/libs/pep257.py b/vim-plugins/bundle/python-mode/pymode/libs/pep257.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pep257.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pep257.py
diff --git a/vim-plugins/python-mode/pymode/libs/pep8.py b/vim-plugins/bundle/python-mode/pymode/libs/pep8.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pep8.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pep8.py
diff --git a/vim-plugins/python-mode/pymode/libs/pkg_resources/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/__init__.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pkg_resources/__init__.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/__init__.py
diff --git a/vim-plugins/python-mode/pymode/libs/pkg_resources/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/__pycache__/__init__.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pkg_resources/__pycache__/__init__.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/__pycache__/__init__.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pkg_resources/_vendor/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/__init__.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pkg_resources/_vendor/__init__.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/__init__.py
diff --git a/vim-plugins/python-mode/pymode/libs/pkg_resources/_vendor/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/__pycache__/__init__.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pkg_resources/_vendor/__pycache__/__init__.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/__pycache__/__init__.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__about__.py b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__about__.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__about__.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__about__.py
diff --git a/vim-plugins/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__init__.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__init__.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__init__.py
diff --git a/vim-plugins/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/__about__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/__about__.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/__about__.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/__about__.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/__init__.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/__init__.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/__init__.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/_compat.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/_compat.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/_compat.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/_compat.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/_structures.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/_structures.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/_structures.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/_structures.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/specifiers.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/specifiers.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/specifiers.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/specifiers.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/version.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/version.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/version.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/version.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pkg_resources/_vendor/packaging/_compat.py b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/_compat.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pkg_resources/_vendor/packaging/_compat.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/_compat.py
diff --git a/vim-plugins/python-mode/pymode/libs/pkg_resources/_vendor/packaging/_structures.py b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/_structures.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pkg_resources/_vendor/packaging/_structures.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/_structures.py
diff --git a/vim-plugins/python-mode/pymode/libs/pkg_resources/_vendor/packaging/specifiers.py b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/specifiers.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pkg_resources/_vendor/packaging/specifiers.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/specifiers.py
diff --git a/vim-plugins/python-mode/pymode/libs/pkg_resources/_vendor/packaging/version.py b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/version.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pkg_resources/_vendor/packaging/version.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/version.py
diff --git a/vim-plugins/python-mode/pymode/libs/pyflakes/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/__init__.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pyflakes/__init__.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pyflakes/__init__.py
diff --git a/vim-plugins/python-mode/pymode/libs/pyflakes/__main__.py b/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/__main__.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pyflakes/__main__.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pyflakes/__main__.py
diff --git a/vim-plugins/python-mode/pymode/libs/pyflakes/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/__pycache__/__init__.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pyflakes/__pycache__/__init__.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pyflakes/__pycache__/__init__.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pyflakes/__pycache__/checker.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/__pycache__/checker.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pyflakes/__pycache__/checker.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pyflakes/__pycache__/checker.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pyflakes/__pycache__/messages.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/__pycache__/messages.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pyflakes/__pycache__/messages.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pyflakes/__pycache__/messages.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pyflakes/api.py b/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/api.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pyflakes/api.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pyflakes/api.py
diff --git a/vim-plugins/python-mode/pymode/libs/pyflakes/checker.py b/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/checker.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pyflakes/checker.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pyflakes/checker.py
diff --git a/vim-plugins/python-mode/pymode/libs/pyflakes/messages.py b/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/messages.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pyflakes/messages.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pyflakes/messages.py
diff --git a/vim-plugins/python-mode/pymode/libs/pyflakes/reporter.py b/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/reporter.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pyflakes/reporter.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pyflakes/reporter.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/__init__.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/__init__.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/__init__.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/__main__.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/__main__.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/__main__.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/__main__.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/__pycache__/__init__.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/__pycache__/__init__.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/__pycache__/__init__.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/__pycache__/async.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/__pycache__/async.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/__pycache__/async.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/__pycache__/async.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/__pycache__/config.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/__pycache__/config.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/__pycache__/config.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/__pycache__/config.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/__pycache__/core.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/__pycache__/core.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/__pycache__/core.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/__pycache__/core.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/__pycache__/errors.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/__pycache__/errors.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/__pycache__/errors.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/__pycache__/errors.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/__pycache__/main.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/__pycache__/main.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/__pycache__/main.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/__pycache__/main.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/async.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/async.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/async.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/async.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/config.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/config.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/config.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/config.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/core.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/core.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/core.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/core.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/errors.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/errors.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/errors.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/errors.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/hook.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/hook.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/hook.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/hook.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/libs/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/libs/__init__.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/libs/__init__.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/libs/__init__.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/libs/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/libs/__pycache__/__init__.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/libs/__pycache__/__init__.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/libs/__pycache__/__init__.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/libs/__pycache__/inirama.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/libs/__pycache__/inirama.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/libs/__pycache__/inirama.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/libs/__pycache__/inirama.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/libs/importlib.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/libs/importlib.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/libs/importlib.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/libs/importlib.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/libs/inirama.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/libs/inirama.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/libs/inirama.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/libs/inirama.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/lint/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__init__.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/lint/__init__.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__init__.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/lint/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__pycache__/__init__.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/lint/__pycache__/__init__.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__pycache__/__init__.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/lint/__pycache__/extensions.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__pycache__/extensions.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/lint/__pycache__/extensions.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__pycache__/extensions.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/lint/__pycache__/pylama_mccabe.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__pycache__/pylama_mccabe.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/lint/__pycache__/pylama_mccabe.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__pycache__/pylama_mccabe.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/lint/__pycache__/pylama_pep257.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__pycache__/pylama_pep257.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/lint/__pycache__/pylama_pep257.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__pycache__/pylama_pep257.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/lint/__pycache__/pylama_pep8.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__pycache__/pylama_pep8.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/lint/__pycache__/pylama_pep8.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__pycache__/pylama_pep8.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/lint/__pycache__/pylama_pyflakes.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__pycache__/pylama_pyflakes.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/lint/__pycache__/pylama_pyflakes.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__pycache__/pylama_pyflakes.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/lint/extensions.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/extensions.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/lint/extensions.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/extensions.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/lint/pylama_mccabe.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_mccabe.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/lint/pylama_mccabe.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_mccabe.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/lint/pylama_pep257.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pep257.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/lint/pylama_pep257.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pep257.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/lint/pylama_pep8.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pep8.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/lint/pylama_pep8.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pep8.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/lint/pylama_pyflakes.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pyflakes.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/lint/pylama_pyflakes.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pyflakes.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/lint/pylama_pylint/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pylint/__init__.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/lint/pylama_pylint/__init__.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pylint/__init__.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/lint/pylama_pylint/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pylint/__pycache__/__init__.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/lint/pylama_pylint/__pycache__/__init__.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pylint/__pycache__/__init__.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/lint/pylama_pylint/__pycache__/main.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pylint/__pycache__/main.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/lint/pylama_pylint/__pycache__/main.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pylint/__pycache__/main.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/lint/pylama_pylint/main.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pylint/main.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/lint/pylama_pylint/main.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pylint/main.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/lint/pylama_pylint/pylint.rc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pylint/pylint.rc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/lint/pylama_pylint/pylint.rc
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pylint/pylint.rc
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/main.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/main.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/main.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/main.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylama/pytest.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/pytest.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylama/pytest.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylama/pytest.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/__init__.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/__init__.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/__init__.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/__main__.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/__main__.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/__main__.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/__main__.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/__pkginfo__.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/__pkginfo__.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/__pkginfo__.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/__pkginfo__.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylint/__pycache__/__init__.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/__pycache__/__init__.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/__pycache__/__init__.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/__pycache__/__pkginfo__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylint/__pycache__/__pkginfo__.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/__pycache__/__pkginfo__.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/__pycache__/__pkginfo__.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/__pycache__/config.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylint/__pycache__/config.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/__pycache__/config.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/__pycache__/config.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/__pycache__/interfaces.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylint/__pycache__/interfaces.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/__pycache__/interfaces.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/__pycache__/interfaces.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/__pycache__/lint.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylint/__pycache__/lint.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/__pycache__/lint.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/__pycache__/lint.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/__pycache__/utils.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylint/__pycache__/utils.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/__pycache__/utils.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/__pycache__/utils.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/checkers/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/__init__.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/checkers/__init__.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/__init__.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/checkers/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/__pycache__/__init__.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/checkers/__pycache__/__init__.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/__pycache__/__init__.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/checkers/base.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/base.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/checkers/base.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/base.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/checkers/classes.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/classes.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/checkers/classes.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/classes.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/checkers/design_analysis.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/design_analysis.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/checkers/design_analysis.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/design_analysis.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/checkers/exceptions.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/exceptions.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/checkers/exceptions.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/exceptions.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/checkers/format.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/format.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/checkers/format.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/format.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/checkers/imports.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/imports.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/checkers/imports.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/imports.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/checkers/logging.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/logging.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/checkers/logging.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/logging.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/checkers/misc.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/misc.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/checkers/misc.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/misc.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/checkers/newstyle.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/newstyle.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/checkers/newstyle.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/newstyle.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/checkers/python3.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/python3.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/checkers/python3.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/python3.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/checkers/raw_metrics.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/raw_metrics.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/checkers/raw_metrics.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/raw_metrics.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/checkers/similar.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/similar.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/checkers/similar.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/similar.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/checkers/spelling.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/spelling.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/checkers/spelling.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/spelling.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/checkers/stdlib.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/stdlib.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/checkers/stdlib.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/stdlib.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/checkers/strings.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/strings.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/checkers/strings.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/strings.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/checkers/typecheck.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/typecheck.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/checkers/typecheck.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/typecheck.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/checkers/utils.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/utils.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/checkers/utils.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/utils.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/checkers/variables.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/variables.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/checkers/variables.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/variables.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/config.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/config.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/config.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/config.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/epylint.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/epylint.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/epylint.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/epylint.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/gui.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/gui.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/gui.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/gui.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/interfaces.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/interfaces.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/interfaces.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/interfaces.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/lint.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/lint.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/lint.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/lint.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/pyreverse/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/pyreverse/__init__.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/pyreverse/__init__.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/pyreverse/__init__.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/pyreverse/diadefslib.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/pyreverse/diadefslib.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/pyreverse/diadefslib.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/pyreverse/diadefslib.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/pyreverse/diagrams.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/pyreverse/diagrams.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/pyreverse/diagrams.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/pyreverse/diagrams.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/pyreverse/main.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/pyreverse/main.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/pyreverse/main.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/pyreverse/main.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/pyreverse/utils.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/pyreverse/utils.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/pyreverse/utils.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/pyreverse/utils.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/pyreverse/writer.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/pyreverse/writer.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/pyreverse/writer.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/pyreverse/writer.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/reporters/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/reporters/__init__.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/reporters/__init__.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/reporters/__init__.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/reporters/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylint/reporters/__pycache__/__init__.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/reporters/__pycache__/__init__.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/reporters/__pycache__/__init__.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/reporters/guireporter.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/reporters/guireporter.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/reporters/guireporter.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/reporters/guireporter.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/reporters/html.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/reporters/html.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/reporters/html.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/reporters/html.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/reporters/json.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/reporters/json.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/reporters/json.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/reporters/json.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/reporters/text.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/reporters/text.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/reporters/text.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/reporters/text.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/testutils.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/testutils.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/testutils.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/testutils.py
diff --git a/vim-plugins/python-mode/pymode/libs/pylint/utils.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/utils.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/pylint/utils.py
rename to vim-plugins/bundle/python-mode/pymode/libs/pylint/utils.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/__init__.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/__init__.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/__init__.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/__pycache__/__init__.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/__pycache__/__init__.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/__pycache__/__init__.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__init__.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/__init__.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/__init__.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/__init__.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/__init__.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/__init__.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/arguments.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/arguments.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/arguments.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/arguments.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/ast.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/ast.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/ast.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/ast.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/astutils.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/astutils.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/astutils.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/astutils.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/builtins.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/builtins.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/builtins.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/builtins.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/change.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/change.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/change.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/change.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/codeanalyze.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/codeanalyze.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/codeanalyze.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/codeanalyze.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/default_config.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/default_config.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/default_config.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/default_config.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/evaluate.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/evaluate.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/evaluate.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/evaluate.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/exceptions.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/exceptions.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/exceptions.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/exceptions.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/fscommands.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/fscommands.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/fscommands.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/fscommands.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/history.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/history.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/history.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/history.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/libutils.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/libutils.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/libutils.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/libutils.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/prefs.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/prefs.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/prefs.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/prefs.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/project.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/project.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/project.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/project.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/pycore.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/pycore.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/pycore.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/pycore.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/pynames.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/pynames.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/pynames.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/pynames.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/pynamesdef.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/pynamesdef.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/pynamesdef.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/pynamesdef.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/pyobjects.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/pyobjects.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/pyobjects.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/pyobjects.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/pyobjectsdef.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/pyobjectsdef.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/pyobjectsdef.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/pyobjectsdef.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/pyscopes.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/pyscopes.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/pyscopes.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/pyscopes.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/resourceobserver.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/resourceobserver.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/resourceobserver.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/resourceobserver.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/resources.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/resources.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/resources.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/resources.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/simplify.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/simplify.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/simplify.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/simplify.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/stdmods.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/stdmods.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/stdmods.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/stdmods.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/taskhandle.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/taskhandle.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/taskhandle.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/taskhandle.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/worder.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/worder.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/__pycache__/worder.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/worder.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/arguments.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/arguments.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/arguments.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/arguments.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/ast.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/ast.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/ast.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/ast.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/astutils.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/astutils.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/astutils.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/astutils.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/builtins.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/builtins.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/builtins.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/builtins.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/change.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/change.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/change.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/change.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/codeanalyze.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/codeanalyze.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/codeanalyze.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/codeanalyze.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/default_config.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/default_config.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/default_config.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/default_config.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/evaluate.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/evaluate.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/evaluate.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/evaluate.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/exceptions.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/exceptions.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/exceptions.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/exceptions.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/fscommands.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/fscommands.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/fscommands.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/fscommands.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/history.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/history.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/history.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/history.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/libutils.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/libutils.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/libutils.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/libutils.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/oi/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__init__.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/oi/__init__.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__init__.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/oi/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/__init__.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/oi/__pycache__/__init__.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/__init__.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/oi/__pycache__/doa.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/doa.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/oi/__pycache__/doa.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/doa.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/oi/__pycache__/docstrings.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/docstrings.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/oi/__pycache__/docstrings.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/docstrings.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/oi/__pycache__/memorydb.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/memorydb.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/oi/__pycache__/memorydb.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/memorydb.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/oi/__pycache__/objectdb.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/objectdb.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/oi/__pycache__/objectdb.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/objectdb.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/oi/__pycache__/objectinfo.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/objectinfo.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/oi/__pycache__/objectinfo.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/objectinfo.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/oi/__pycache__/soa.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/soa.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/oi/__pycache__/soa.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/soa.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/oi/__pycache__/soi.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/soi.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/oi/__pycache__/soi.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/soi.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/oi/__pycache__/transform.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/transform.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/oi/__pycache__/transform.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/transform.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/oi/doa.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/doa.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/oi/doa.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/doa.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/oi/docstrings.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/docstrings.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/oi/docstrings.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/docstrings.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/oi/memorydb.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/memorydb.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/oi/memorydb.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/memorydb.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/oi/objectdb.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/objectdb.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/oi/objectdb.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/objectdb.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/oi/objectinfo.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/objectinfo.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/oi/objectinfo.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/objectinfo.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/oi/runmod.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/runmod.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/oi/runmod.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/runmod.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/oi/soa.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/soa.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/oi/soa.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/soa.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/oi/soi.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/soi.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/oi/soi.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/soi.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/oi/transform.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/transform.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/oi/transform.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/transform.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/prefs.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/prefs.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/prefs.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/prefs.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/project.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/project.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/project.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/project.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/pycore.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/pycore.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/pycore.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/pycore.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/pynames.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/pynames.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/pynames.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/pynames.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/pynamesdef.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/pynamesdef.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/pynamesdef.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/pynamesdef.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/pyobjects.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/pyobjects.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/pyobjects.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/pyobjects.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/pyobjectsdef.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/pyobjectsdef.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/pyobjectsdef.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/pyobjectsdef.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/pyscopes.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/pyscopes.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/pyscopes.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/pyscopes.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/resourceobserver.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/resourceobserver.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/resourceobserver.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/resourceobserver.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/resources.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/resources.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/resources.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/resources.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/simplify.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/simplify.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/simplify.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/simplify.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/stdmods.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/stdmods.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/stdmods.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/stdmods.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/taskhandle.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/taskhandle.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/taskhandle.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/taskhandle.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/utils/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/utils/__init__.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/utils/__init__.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/utils/__init__.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/utils/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/utils/__pycache__/__init__.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/utils/__pycache__/__init__.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/utils/__pycache__/__init__.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/utils/__pycache__/datastructures.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/utils/__pycache__/datastructures.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/utils/__pycache__/datastructures.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/utils/__pycache__/datastructures.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/utils/__pycache__/pycompat.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/utils/__pycache__/pycompat.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/utils/__pycache__/pycompat.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/utils/__pycache__/pycompat.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/utils/datastructures.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/utils/datastructures.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/utils/datastructures.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/utils/datastructures.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/utils/pycompat.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/utils/pycompat.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/utils/pycompat.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/utils/pycompat.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/base/worder.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/worder.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/base/worder.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/base/worder.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/contrib/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__init__.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/contrib/__init__.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__init__.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/contrib/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__pycache__/__init__.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/contrib/__pycache__/__init__.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__pycache__/__init__.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/contrib/__pycache__/autoimport.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__pycache__/autoimport.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/contrib/__pycache__/autoimport.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__pycache__/autoimport.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/contrib/__pycache__/codeassist.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__pycache__/codeassist.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/contrib/__pycache__/codeassist.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__pycache__/codeassist.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/contrib/__pycache__/findit.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__pycache__/findit.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/contrib/__pycache__/findit.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__pycache__/findit.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/contrib/__pycache__/fixsyntax.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__pycache__/fixsyntax.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/contrib/__pycache__/fixsyntax.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__pycache__/fixsyntax.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/contrib/__pycache__/generate.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__pycache__/generate.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/contrib/__pycache__/generate.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__pycache__/generate.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/contrib/autoimport.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/autoimport.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/contrib/autoimport.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/autoimport.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/contrib/changestack.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/changestack.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/contrib/changestack.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/changestack.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/contrib/codeassist.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/codeassist.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/contrib/codeassist.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/codeassist.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/contrib/finderrors.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/finderrors.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/contrib/finderrors.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/finderrors.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/contrib/findit.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/findit.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/contrib/findit.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/findit.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/contrib/fixmodnames.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/fixmodnames.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/contrib/fixmodnames.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/fixmodnames.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/contrib/fixsyntax.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/fixsyntax.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/contrib/fixsyntax.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/fixsyntax.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/contrib/generate.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/generate.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/contrib/generate.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/generate.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__init__.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/__init__.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__init__.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/__init__.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/__pycache__/__init__.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/__init__.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/__pycache__/change_signature.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/change_signature.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/__pycache__/change_signature.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/change_signature.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/__pycache__/extract.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/extract.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/__pycache__/extract.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/extract.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/__pycache__/functionutils.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/functionutils.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/__pycache__/functionutils.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/functionutils.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/__pycache__/inline.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/inline.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/__pycache__/inline.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/inline.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/__pycache__/move.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/move.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/__pycache__/move.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/move.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/__pycache__/occurrences.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/occurrences.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/__pycache__/occurrences.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/occurrences.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/__pycache__/patchedast.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/patchedast.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/__pycache__/patchedast.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/patchedast.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/__pycache__/rename.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/rename.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/__pycache__/rename.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/rename.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/__pycache__/restructure.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/restructure.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/__pycache__/restructure.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/restructure.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/__pycache__/similarfinder.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/similarfinder.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/__pycache__/similarfinder.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/similarfinder.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/__pycache__/sourceutils.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/sourceutils.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/__pycache__/sourceutils.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/sourceutils.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/__pycache__/suites.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/suites.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/__pycache__/suites.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/suites.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/__pycache__/topackage.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/topackage.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/__pycache__/topackage.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/topackage.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/__pycache__/usefunction.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/usefunction.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/__pycache__/usefunction.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/usefunction.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/__pycache__/wildcards.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/wildcards.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/__pycache__/wildcards.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/wildcards.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/change_signature.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/change_signature.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/change_signature.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/change_signature.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/encapsulate_field.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/encapsulate_field.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/encapsulate_field.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/encapsulate_field.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/extract.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/extract.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/extract.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/extract.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/functionutils.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/functionutils.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/functionutils.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/functionutils.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/importutils/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/__init__.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/importutils/__init__.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/__init__.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/importutils/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/__pycache__/__init__.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/importutils/__pycache__/__init__.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/__pycache__/__init__.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/importutils/__pycache__/actions.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/__pycache__/actions.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/importutils/__pycache__/actions.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/__pycache__/actions.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/importutils/__pycache__/importinfo.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/__pycache__/importinfo.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/importutils/__pycache__/importinfo.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/__pycache__/importinfo.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/importutils/__pycache__/module_imports.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/__pycache__/module_imports.cpython-35.pyc
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/importutils/__pycache__/module_imports.cpython-35.pyc
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/__pycache__/module_imports.cpython-35.pyc
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/importutils/actions.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/actions.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/importutils/actions.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/actions.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/importutils/importinfo.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/importinfo.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/importutils/importinfo.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/importinfo.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/importutils/module_imports.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/module_imports.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/importutils/module_imports.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/module_imports.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/inline.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/inline.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/inline.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/inline.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/introduce_factory.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/introduce_factory.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/introduce_factory.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/introduce_factory.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/introduce_parameter.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/introduce_parameter.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/introduce_parameter.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/introduce_parameter.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/localtofield.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/localtofield.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/localtofield.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/localtofield.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/method_object.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/method_object.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/method_object.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/method_object.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/move.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/move.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/move.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/move.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/multiproject.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/multiproject.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/multiproject.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/multiproject.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/occurrences.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/occurrences.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/occurrences.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/occurrences.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/patchedast.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/patchedast.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/patchedast.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/patchedast.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/rename.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/rename.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/rename.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/rename.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/restructure.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/restructure.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/restructure.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/restructure.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/similarfinder.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/similarfinder.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/similarfinder.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/similarfinder.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/sourceutils.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/sourceutils.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/sourceutils.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/sourceutils.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/suites.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/suites.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/suites.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/suites.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/topackage.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/topackage.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/topackage.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/topackage.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/usefunction.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/usefunction.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/usefunction.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/usefunction.py
diff --git a/vim-plugins/python-mode/pymode/libs/rope/refactor/wildcards.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/wildcards.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/rope/refactor/wildcards.py
rename to vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/wildcards.py
diff --git a/vim-plugins/python-mode/pymode/libs/six.py b/vim-plugins/bundle/python-mode/pymode/libs/six.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/libs/six.py
rename to vim-plugins/bundle/python-mode/pymode/libs/six.py
diff --git a/vim-plugins/python-mode/pymode/lint.py b/vim-plugins/bundle/python-mode/pymode/lint.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/lint.py
rename to vim-plugins/bundle/python-mode/pymode/lint.py
diff --git a/vim-plugins/python-mode/pymode/rope.py b/vim-plugins/bundle/python-mode/pymode/rope.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/rope.py
rename to vim-plugins/bundle/python-mode/pymode/rope.py
diff --git a/vim-plugins/python-mode/pymode/run.py b/vim-plugins/bundle/python-mode/pymode/run.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/run.py
rename to vim-plugins/bundle/python-mode/pymode/run.py
diff --git a/vim-plugins/python-mode/pymode/utils.py b/vim-plugins/bundle/python-mode/pymode/utils.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/utils.py
rename to vim-plugins/bundle/python-mode/pymode/utils.py
diff --git a/vim-plugins/python-mode/pymode/virtualenv.py b/vim-plugins/bundle/python-mode/pymode/virtualenv.py
similarity index 100%
rename from vim-plugins/python-mode/pymode/virtualenv.py
rename to vim-plugins/bundle/python-mode/pymode/virtualenv.py
diff --git a/vim-plugins/python-mode/python-mode.yaml b/vim-plugins/bundle/python-mode/python-mode.yaml
similarity index 100%
rename from vim-plugins/python-mode/python-mode.yaml
rename to vim-plugins/bundle/python-mode/python-mode.yaml
diff --git a/vim-plugins/python-mode/syntax/pyrex.vim b/vim-plugins/bundle/python-mode/syntax/pyrex.vim
similarity index 100%
rename from vim-plugins/python-mode/syntax/pyrex.vim
rename to vim-plugins/bundle/python-mode/syntax/pyrex.vim
diff --git a/vim-plugins/python-mode/syntax/python.vim b/vim-plugins/bundle/python-mode/syntax/python.vim
similarity index 100%
rename from vim-plugins/python-mode/syntax/python.vim
rename to vim-plugins/bundle/python-mode/syntax/python.vim
diff --git a/vim-plugins/python-mode/t/docs.vim b/vim-plugins/bundle/python-mode/t/docs.vim
similarity index 100%
rename from vim-plugins/python-mode/t/docs.vim
rename to vim-plugins/bundle/python-mode/t/docs.vim
diff --git a/vim-plugins/python-mode/t/ftplugin.vim b/vim-plugins/bundle/python-mode/t/ftplugin.vim
similarity index 100%
rename from vim-plugins/python-mode/t/ftplugin.vim
rename to vim-plugins/bundle/python-mode/t/ftplugin.vim
diff --git a/vim-plugins/python-mode/t/indent.vim b/vim-plugins/bundle/python-mode/t/indent.vim
similarity index 100%
rename from vim-plugins/python-mode/t/indent.vim
rename to vim-plugins/bundle/python-mode/t/indent.vim
diff --git a/vim-plugins/python-mode/t/lint.vim b/vim-plugins/bundle/python-mode/t/lint.vim
similarity index 100%
rename from vim-plugins/python-mode/t/lint.vim
rename to vim-plugins/bundle/python-mode/t/lint.vim
diff --git a/vim-plugins/python-mode/t/plugin.vim b/vim-plugins/bundle/python-mode/t/plugin.vim
similarity index 100%
rename from vim-plugins/python-mode/t/plugin.vim
rename to vim-plugins/bundle/python-mode/t/plugin.vim
diff --git a/vim-plugins/python-mode/t/rope.vim b/vim-plugins/bundle/python-mode/t/rope.vim
similarity index 100%
rename from vim-plugins/python-mode/t/rope.vim
rename to vim-plugins/bundle/python-mode/t/rope.vim
diff --git a/vim-plugins/python-mode/t/syntax.vim b/vim-plugins/bundle/python-mode/t/syntax.vim
similarity index 100%
rename from vim-plugins/python-mode/t/syntax.vim
rename to vim-plugins/bundle/python-mode/t/syntax.vim
diff --git a/vim-plugins/python-mode/t/test.py b/vim-plugins/bundle/python-mode/t/test.py
similarity index 100%
rename from vim-plugins/python-mode/t/test.py
rename to vim-plugins/bundle/python-mode/t/test.py
diff --git a/vim-plugins/python-mode/t/trouble.vim b/vim-plugins/bundle/python-mode/t/trouble.vim
similarity index 100%
rename from vim-plugins/python-mode/t/trouble.vim
rename to vim-plugins/bundle/python-mode/t/trouble.vim
diff --git a/vim-plugins/python-mode/t/virtualenv.vim b/vim-plugins/bundle/python-mode/t/virtualenv.vim
similarity index 100%
rename from vim-plugins/python-mode/t/virtualenv.vim
rename to vim-plugins/bundle/python-mode/t/virtualenv.vim
diff --git a/vim-plugins/colors/github.vim b/vim-plugins/colors/github.vim
new file mode 100644
index 0000000..9cacb2d
--- /dev/null
+++ b/vim-plugins/colors/github.vim
@@ -0,0 +1,77 @@
+" Vim color file
+"   This file was generated by Palette
+"   http://rubygems.org/gems/palette
+"
+" Author: Compiled from a handful of different themes
+" Notes:  Github color scheme (light)
+
+hi clear
+if version > 580
+    if exists("syntax_on")
+        syntax reset
+    endif
+endif
+
+let colors_name="github"
+
+if has("gui_running")
+    set background=light
+endif
+
+hi Normal       guifg=#000000 ctermfg=16   guibg=#F8F8FF ctermbg=231  gui=NONE cterm=NONE
+hi DiffAdd      guifg=#003300 ctermfg=22   guibg=#DDFFDD ctermbg=194  gui=NONE cterm=NONE
+hi DiffChange   guibg=#ECECEC ctermbg=255  gui=NONE cterm=NONE
+hi DiffText     guifg=#000033 ctermfg=17   guibg=#DDDDFF ctermbg=189  gui=NONE cterm=NONE
+hi DiffDelete   guifg=#DDCCCC ctermfg=252  guibg=#FFDDDD ctermbg=224  gui=NONE cterm=NONE
+hi Folded       guifg=#808080 ctermfg=244  guibg=#ECECEC ctermbg=255  gui=NONE cterm=NONE
+hi LineNr       guifg=#BBBBBB ctermfg=250  guibg=#ECECEC ctermbg=255  gui=NONE cterm=NONE
+hi NonText      guifg=#808080 ctermfg=244  guibg=#ECECEC ctermbg=255  gui=NONE cterm=NONE
+hi VertSplit    guifg=#BBBBBB ctermfg=250  guibg=#BBBBBB ctermbg=250  gui=NONE cterm=NONE
+hi StatusLine   guifg=#404040 ctermfg=238  guibg=#BBBBBB ctermbg=250  gui=BOLD cterm=BOLD
+hi StatusLineNC guifg=#BBBBBB ctermfg=250  guibg=#ECECEC ctermbg=255  gui=ITALIC cterm=NONE
+hi ModeMsg      guifg=#990000 ctermfg=88   gui=NONE cterm=NONE
+hi MoreMsg      guifg=#990000 ctermfg=88   gui=NONE cterm=NONE
+hi Title        guifg=#EF5939 ctermfg=203  gui=NONE cterm=NONE
+hi WarningMsg   guifg=#EF5939 ctermfg=203  gui=NONE cterm=NONE
+hi SpecialKey   guifg=#FFFFFF ctermfg=231  guibg=#FF1100 ctermbg=196  gui=ITALIC cterm=NONE
+hi MatchParen   guifg=#000000 ctermfg=16   guibg=#CDCDFD ctermbg=189  gui=NONE cterm=NONE
+hi Underlined   guifg=#000000 ctermfg=16   gui=UNDERLINE cterm=UNDERLINE
+hi Directory    guifg=#990000 ctermfg=88   gui=NONE cterm=NONE
+hi Visual       guifg=#FFFFFF ctermfg=231  guibg=#3465A4 ctermbg=61   gui=NONE cterm=NONE
+hi VisualNOS    guifg=#FFFFFF ctermfg=231  guibg=#204A87 ctermbg=24   gui=NONE cterm=NONE
+hi IncSearch    guifg=#000000 ctermfg=16   guibg=#CDCDFD ctermbg=189  gui=ITALIC cterm=NONE
+hi Search       guifg=#000000 ctermfg=16   guibg=#CDCDFD ctermbg=189  gui=ITALIC cterm=NONE
+hi Ignore       guifg=#808080 ctermfg=244  gui=NONE cterm=NONE
+hi Identifier   guifg=#0086B3 ctermfg=31   gui=NONE cterm=NONE
+hi PreProc      guifg=#A0A0A0 ctermfg=247  gui=BOLD cterm=BOLD
+hi Comment      guifg=#AAAAAA ctermfg=248  gui=ITALIC cterm=NONE
+hi Constant     guifg=#177F80 ctermfg=30   gui=NONE cterm=NONE
+hi String       guifg=#D81745 ctermfg=161  gui=NONE cterm=NONE
+hi Function     guifg=#990000 ctermfg=88   gui=BOLD cterm=BOLD
+hi Statement    guifg=#000000 ctermfg=16   gui=BOLD cterm=BOLD
+hi Type         guifg=#445588 ctermfg=60   gui=BOLD cterm=BOLD
+hi Number       guifg=#1C9898 ctermfg=30   gui=NONE cterm=NONE
+hi Todo         guifg=#FFFFFF ctermfg=231  guibg=#990000 ctermbg=88   gui=BOLD cterm=BOLD
+hi Special      guifg=#159828 ctermfg=28   gui=BOLD cterm=BOLD
+hi rubySymbol   guifg=#960B73 ctermfg=89   gui=NONE cterm=NONE
+hi Error        guifg=#F8F8FF ctermfg=231  guibg=#FF1100 ctermbg=196  gui=NONE cterm=NONE
+hi Todo         guifg=#F8F8FF ctermfg=231  guibg=#FF1100 ctermbg=196  gui=UNDERLINE cterm=UNDERLINE
+hi Label        guifg=#000000 ctermfg=16   gui=BOLD cterm=BOLD
+hi StorageClass guifg=#000000 ctermfg=16   gui=BOLD cterm=BOLD
+hi Structure    guifg=#000000 ctermfg=16   gui=BOLD cterm=BOLD
+hi TypeDef      guifg=#000000 ctermfg=16   gui=BOLD cterm=BOLD
+hi WildMenu     guifg=#7FBDFF ctermfg=111  guibg=#425C78 ctermbg=60   gui=NONE cterm=NONE
+hi Pmenu        guifg=#FFFFFF ctermfg=231  guibg=#808080 ctermbg=244  gui=BOLD cterm=BOLD
+hi PmenuSel     guifg=#000000 ctermfg=16   guibg=#CDCDFD ctermbg=189  gui=ITALIC cterm=NONE
+hi PmenuSbar    guifg=#444444 ctermfg=238  guibg=#000000 ctermbg=16   gui=NONE cterm=NONE
+hi PmenuThumb   guifg=#AAAAAA ctermfg=248  guibg=#AAAAAA ctermbg=248  gui=NONE cterm=NONE
+hi TabLine      guifg=#404040 ctermfg=238  guibg=#DDDDDD ctermbg=253  gui=NONE cterm=NONE
+hi TabLineFill  guifg=#404040 ctermfg=238  guibg=#DDDDDD ctermbg=253  gui=NONE cterm=NONE
+hi TabLineSel   guifg=#404040 ctermfg=238  gui=BOLD cterm=BOLD
+hi cucumberTags guifg=#333333 ctermfg=236  guibg=#FFFF66 ctermbg=227  gui=BOLD cterm=BOLD
+hi htmlTagN     gui=BOLD cterm=BOLD
+hi Cursor       guifg=#F8F8FF ctermfg=231  guibg=#444454 ctermbg=238  gui=NONE cterm=NONE
+hi CursorLine   guibg=#D8D8DD ctermbg=253  gui=NONE cterm=NONE
+hi CursorColumn guibg=#D8D8DD ctermbg=253  gui=NONE cterm=NONE
+
+hi link rubyStringDelimiter String
diff --git a/vim-plugins/bundle/vim-powerline/Powerline_default_default_compatible.cache b/vim-plugins/vim-powerline/Powerline_default_default_compatible.cache
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/Powerline_default_default_compatible.cache
rename to vim-plugins/vim-powerline/Powerline_default_default_compatible.cache
diff --git a/vim-plugins/bundle/vim-powerline/README.rst b/vim-plugins/vim-powerline/README.rst
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/README.rst
rename to vim-plugins/vim-powerline/README.rst
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Pl.vim b/vim-plugins/vim-powerline/autoload/Pl.vim
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/autoload/Pl.vim
rename to vim-plugins/vim-powerline/autoload/Pl.vim
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Pl/Colorscheme.vim b/vim-plugins/vim-powerline/autoload/Pl/Colorscheme.vim
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/autoload/Pl/Colorscheme.vim
rename to vim-plugins/vim-powerline/autoload/Pl/Colorscheme.vim
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Pl/Hi.vim b/vim-plugins/vim-powerline/autoload/Pl/Hi.vim
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/autoload/Pl/Hi.vim
rename to vim-plugins/vim-powerline/autoload/Pl/Hi.vim
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Pl/Match.vim b/vim-plugins/vim-powerline/autoload/Pl/Match.vim
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/autoload/Pl/Match.vim
rename to vim-plugins/vim-powerline/autoload/Pl/Match.vim
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Pl/Mod.vim b/vim-plugins/vim-powerline/autoload/Pl/Mod.vim
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/autoload/Pl/Mod.vim
rename to vim-plugins/vim-powerline/autoload/Pl/Mod.vim
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Pl/Parser.vim b/vim-plugins/vim-powerline/autoload/Pl/Parser.vim
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/autoload/Pl/Parser.vim
rename to vim-plugins/vim-powerline/autoload/Pl/Parser.vim
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Pl/Segment.vim b/vim-plugins/vim-powerline/autoload/Pl/Segment.vim
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/autoload/Pl/Segment.vim
rename to vim-plugins/vim-powerline/autoload/Pl/Segment.vim
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Pl/Theme.vim b/vim-plugins/vim-powerline/autoload/Pl/Theme.vim
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/autoload/Pl/Theme.vim
rename to vim-plugins/vim-powerline/autoload/Pl/Theme.vim
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Colorschemes/default.vim b/vim-plugins/vim-powerline/autoload/Powerline/Colorschemes/default.vim
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/autoload/Powerline/Colorschemes/default.vim
rename to vim-plugins/vim-powerline/autoload/Powerline/Colorschemes/default.vim
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Colorschemes/solarized.vim b/vim-plugins/vim-powerline/autoload/Powerline/Colorschemes/solarized.vim
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/autoload/Powerline/Colorschemes/solarized.vim
rename to vim-plugins/vim-powerline/autoload/Powerline/Colorschemes/solarized.vim
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Colorschemes/solarized16.vim b/vim-plugins/vim-powerline/autoload/Powerline/Colorschemes/solarized16.vim
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/autoload/Powerline/Colorschemes/solarized16.vim
rename to vim-plugins/vim-powerline/autoload/Powerline/Colorschemes/solarized16.vim
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Colorschemes/solarized256.vim b/vim-plugins/vim-powerline/autoload/Powerline/Colorschemes/solarized256.vim
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/autoload/Powerline/Colorschemes/solarized256.vim
rename to vim-plugins/vim-powerline/autoload/Powerline/Colorschemes/solarized256.vim
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Functions.vim b/vim-plugins/vim-powerline/autoload/Powerline/Functions.vim
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/autoload/Powerline/Functions.vim
rename to vim-plugins/vim-powerline/autoload/Powerline/Functions.vim
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Functions/ft_man.vim b/vim-plugins/vim-powerline/autoload/Powerline/Functions/ft_man.vim
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/autoload/Powerline/Functions/ft_man.vim
rename to vim-plugins/vim-powerline/autoload/Powerline/Functions/ft_man.vim
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Functions/fugitive.vim b/vim-plugins/vim-powerline/autoload/Powerline/Functions/fugitive.vim
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/autoload/Powerline/Functions/fugitive.vim
rename to vim-plugins/vim-powerline/autoload/Powerline/Functions/fugitive.vim
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Functions/hgrev.vim b/vim-plugins/vim-powerline/autoload/Powerline/Functions/hgrev.vim
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/autoload/Powerline/Functions/hgrev.vim
rename to vim-plugins/vim-powerline/autoload/Powerline/Functions/hgrev.vim
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Functions/syntastic.vim b/vim-plugins/vim-powerline/autoload/Powerline/Functions/syntastic.vim
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/autoload/Powerline/Functions/syntastic.vim
rename to vim-plugins/vim-powerline/autoload/Powerline/Functions/syntastic.vim
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Matches.vim b/vim-plugins/vim-powerline/autoload/Powerline/Matches.vim
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/autoload/Powerline/Matches.vim
rename to vim-plugins/vim-powerline/autoload/Powerline/Matches.vim
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments.vim b/vim-plugins/vim-powerline/autoload/Powerline/Segments.vim
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments.vim
rename to vim-plugins/vim-powerline/autoload/Powerline/Segments.vim
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/ctrlp.vim b/vim-plugins/vim-powerline/autoload/Powerline/Segments/ctrlp.vim
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/ctrlp.vim
rename to vim-plugins/vim-powerline/autoload/Powerline/Segments/ctrlp.vim
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/ft_man.vim b/vim-plugins/vim-powerline/autoload/Powerline/Segments/ft_man.vim
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/ft_man.vim
rename to vim-plugins/vim-powerline/autoload/Powerline/Segments/ft_man.vim
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/fugitive.vim b/vim-plugins/vim-powerline/autoload/Powerline/Segments/fugitive.vim
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/fugitive.vim
rename to vim-plugins/vim-powerline/autoload/Powerline/Segments/fugitive.vim
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/hgrev.vim b/vim-plugins/vim-powerline/autoload/Powerline/Segments/hgrev.vim
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/hgrev.vim
rename to vim-plugins/vim-powerline/autoload/Powerline/Segments/hgrev.vim
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/rvm.vim b/vim-plugins/vim-powerline/autoload/Powerline/Segments/rvm.vim
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/rvm.vim
rename to vim-plugins/vim-powerline/autoload/Powerline/Segments/rvm.vim
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/syntastic.vim b/vim-plugins/vim-powerline/autoload/Powerline/Segments/syntastic.vim
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/syntastic.vim
rename to vim-plugins/vim-powerline/autoload/Powerline/Segments/syntastic.vim
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/tagbar.vim b/vim-plugins/vim-powerline/autoload/Powerline/Segments/tagbar.vim
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/tagbar.vim
rename to vim-plugins/vim-powerline/autoload/Powerline/Segments/tagbar.vim
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/virtualenv.vim b/vim-plugins/vim-powerline/autoload/Powerline/Segments/virtualenv.vim
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/virtualenv.vim
rename to vim-plugins/vim-powerline/autoload/Powerline/Segments/virtualenv.vim
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Themes/default.vim b/vim-plugins/vim-powerline/autoload/Powerline/Themes/default.vim
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/autoload/Powerline/Themes/default.vim
rename to vim-plugins/vim-powerline/autoload/Powerline/Themes/default.vim
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Themes/solarized16.vim b/vim-plugins/vim-powerline/autoload/Powerline/Themes/solarized16.vim
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/autoload/Powerline/Themes/solarized16.vim
rename to vim-plugins/vim-powerline/autoload/Powerline/Themes/solarized16.vim
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Themes/solarized256.vim b/vim-plugins/vim-powerline/autoload/Powerline/Themes/solarized256.vim
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/autoload/Powerline/Themes/solarized256.vim
rename to vim-plugins/vim-powerline/autoload/Powerline/Themes/solarized256.vim
diff --git a/vim-plugins/bundle/vim-powerline/doc/Powerline.txt b/vim-plugins/vim-powerline/doc/Powerline.txt
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/doc/Powerline.txt
rename to vim-plugins/vim-powerline/doc/Powerline.txt
diff --git a/vim-plugins/bundle/vim-powerline/doc/tags b/vim-plugins/vim-powerline/doc/tags
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/doc/tags
rename to vim-plugins/vim-powerline/doc/tags
diff --git a/vim-plugins/bundle/vim-powerline/fontpatcher/PowerlineSymbols.sfd b/vim-plugins/vim-powerline/fontpatcher/PowerlineSymbols.sfd
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/fontpatcher/PowerlineSymbols.sfd
rename to vim-plugins/vim-powerline/fontpatcher/PowerlineSymbols.sfd
diff --git a/vim-plugins/bundle/vim-powerline/fontpatcher/README.rst b/vim-plugins/vim-powerline/fontpatcher/README.rst
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/fontpatcher/README.rst
rename to vim-plugins/vim-powerline/fontpatcher/README.rst
diff --git a/vim-plugins/bundle/vim-powerline/fontpatcher/fontpatcher b/vim-plugins/vim-powerline/fontpatcher/fontpatcher
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/fontpatcher/fontpatcher
rename to vim-plugins/vim-powerline/fontpatcher/fontpatcher
diff --git a/vim-plugins/bundle/vim-powerline/plugin/Powerline.vim b/vim-plugins/vim-powerline/plugin/Powerline.vim
similarity index 100%
rename from vim-plugins/bundle/vim-powerline/plugin/Powerline.vim
rename to vim-plugins/vim-powerline/plugin/Powerline.vim