organized data model, moved into group