Make VP more BP compatible

Also move two files to a common directory