Move things around to be usable with Vundle