refactor data store layout