moved template files more