Move vp into own package

Nor this.