Move vp into own package

I'm not sure I understand what you mean about the package doc. I meant just a comment somewhere at the top of the file, explaining why we have such a weirdly named file and that we plan (AIUI) to move its contents somewhere else eventually.