Move vp into own package