updated data model based on latest feedback
Merge branch 'phase2' of github.com:DOAJ/doaj into phase2