Refactor Toro vendor tree for easier management