Move the PV label stuff to a top-level module

Signed-off-by: David Scott <dave.scott@eu.citrix.com>