Move vp into own package

I think we no longer need this, right?