Move vp into own package

Ok, I'd just add an XXX comment so that we don't forget about it