Move vp into own package

ok