Move routing helper methods to more appropriate package
Merge pull request #5581 from mmun/move-routing-helpers

Move routing helper methods to more approporiate package