We should probably have some further discussion about including the templates directly in the files. I don't like the idea at all, but there may be some good reasons for it.