Change route template
new route configuration with less nesting
Merge branch 'routes'