Add error messages to errors
Move classes into dataModel/entity and dataModel/snak