Move old Victor to ConfigurableVictorBuilder