Minor reorg of VBF module and new VBF test module.