Fix template name for templates in sub directories, fix single quotes and put each template on one line for easier debugging