rearrange Router
Merge branch 'complete' of github.com:backstopmedia/hubbub into complete