Merge pull request #37 from dirvine/MAID-369-refactor-routing

Maid 369 refactor routing