modified file structure for datastore