move functions back to their old home
Merge pull request #96 from optopus/tags/fix-route

move functions back to their old home