Refactor everything into vundle management