moved templates into namespace