reorganizing some servicer data