product refactoring + vendors