Reorder things
remove fallback for templates

The new templates are vastly different, so if someone is still using
the old location they’re going to break things.