fixed some imports in the __init__ files
fixed some imports in the test files
making VPD an Enum
try to make some helper for the unmarshall stuff
clean up som commented lines