moved gateway to service collection

[xh3b4sd]

fixes

This PR fixes #236.

checklist

• [x] Make sure you read and understood the CONTRIBUTING.md.
• [x] Make sure you applied sufficient labels, milestone and assignee.
• [x] Make sure all TODOs are addressed.
• [x] Make sure there is sufficient documentation.
• [x] Make sure there are sufficient tests.
• [x] Make sure all commits are squashed before merging.
• [x] Make sure to delete the feature branch after merging.

[codecov-io]

Current coverage is 91.99% (diff: 87.50%)

Merging #254 into master will decrease coverage by 0.20%

Powered by Codecov. Last update 7178cc8...f3edbe8