Refactoring data.js into DataView and Data (Model) - Not fully done yet