Improve structure (backport #432)

[mergify]

This is an automatic backport of pull request #432 done by Mergify.
Cherry-pick of f30eab7 has failed:

On branch mergify/bp/ospd-20.08/pr-432
Your branch is ahead of 'origin/ospd-20.08' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit f30eab7.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

---

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

• @Mergifyio refresh will re-evaluate the rules
• @Mergifyio rebase will rebase this PR on its base branch
• @Mergifyio update will merge the base branch into this PR
• @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

• look at your merge queues
• generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

[jjnicola]

We are not going to backport these changes to 20.08 because they seem to not fix the interrupted scan issue and are introducing a risk to break other things.