add fireplace and reorganize vundle