fix moving data models code to its own file
Fix doc generation after moving code to datamodels.js