master/vendor refactoring