Re-structure the data stores to be more uniform