Minor model change
Merged datamodel and mapping
Ignored some files