Refine routes to not have so many nests
Merge pull request #3 from mpkrueger/shallow-nesting

Refine routes to not have so many nests