Refactor Bundle to Plugin for vundle