Changing naming structure.
Now using template cache, should be able to get templates from arbitrary places on the webserver.