restructuring data store