core: Use discovery found list instead of nested struct

Diffstat

1 files changed, 12 insertions(+), 28 deletions(-)