Rework most of internal code to work with new split of customer & user data