fixed parenthesis warning
put templates in Common namespace