Moved Templating to own file