Move Template::Provider to the right place.

We've updated it a while back, but didn't put it where it was expected
to be.