[discovery] Proposed changes to Discovery workboard structure