More templating related changes

as well as file system changes. hopefully the filesystem is at least
worked out!