cleaned up HV drivers a little, updated paths here to match