move to a template-dir approach