Improve structure (backport #450)

[mergify]

This is an automatic backport of pull request #450 done by Mergify.
Cherry-pick of 0f9fc2a has failed:

On branch mergify/bp/ospd-openvas-21.04/pr-450
Your branch is ahead of 'origin/ospd-openvas-21.04' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 0f9fc2a.
  (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)

Changes to be committed:
	modified:   ospd_openvas/openvas.py
	modified:   tests/test_openvas.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tests/test_daemon.py

Cherry-pick of 0c519cb has failed:

On branch mergify/bp/ospd-openvas-21.04/pr-450
Your branch is ahead of 'origin/ospd-openvas-21.04' by 4 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 0c519cb.
  (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")

Cherry-pick of f7880eb has failed:

On branch mergify/bp/ospd-openvas-21.04/pr-450
Your branch is ahead of 'origin/ospd-openvas-21.04' by 5 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit f7880eb.
  (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:   poetry.lock

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

Cherry-pick of cf46955 has failed:

On branch mergify/bp/ospd-openvas-21.04/pr-450
Your branch is ahead of 'origin/ospd-openvas-21.04' by 6 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit cf46955.
  (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)

Changes to be committed:
	modified:   ospd_openvas/daemon.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tests/test_daemon.py

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/

[Kraemii]

Closed in favor of #465