Reorganize vundle plugins for better compatibility