finished migrating data model to ComonJS