Salud template updates

cleanup of function locations, too.