DocSprint: VSO module restructuration

VSO module re-structuration as asked in #686