xcvm: merge router and gateway together, cont.

[mina86]

Forgot to add the file to the previous commit.

• PR title is my best effort to provide summary of changes and has clear text to be part of release notes
• I marked PR by misc label if it should not be in release notes
• I have linked Zenhub/Github or any other reference item if one exists
• I was clear on what type of deployment required to release my changes (node, runtime, contract, indexer, on chain operation, frontend, infrastructure) if any in PR title or description
• I waited and did best effort for pr-workflow-check / draft-release-check to finish with success(green check mark) with my changes
• I have added at least one reviewer in reviewers list
• I tagged(@) or used other form of notification of one person who I think can handle best review of this PR
• I have proved that PR has no general regressions of relevant features and processes required to release into production