Updated the path to templates.

Rather than creating subdirectories, underscore the url prefix and the
action.
Merge branch 'master' into authorization