Reorganized firebase data model