Merge the two templates folders, so all our Jinja is in one place.

We get no benefit from dividing them. None if it's a secret, since you can look up the project source anyway. Schalk assures me we can convince nunjucks to compile just the templates needed on the client side.