refactor router
Merge pull request #592 from walmartlabs/user/eran

refactor router