Move vp into own package

Right you are. Good catch.