update template generator and orgteam template