DocSprint: VSO module restructuration.  Fixes #686
fixes to vso