Again restructuring source

forgot to update vos...