Move around routing so that we may keep wildcard route.
Remove TemplateURL where it wasn't needed.
Conform to name convention.