major reorg, rename diners to users