Fork V1 types into V2 (no other change yet)

Related to #203

Signed-off-by: David Scott <dave.scott@citrix.com>
Merge pull request #267 from djs55/fork-v2

Fork V1 types into V2 (no other change yet)