Move Torch stuff to vendor