Added loadTemplates
explicit loading of templates
New interface for adding templates
moved template definitions to standalone file