Move classes from lib to DataModel, as they are directly needed in DataModel and not in lib

Change-Id: I120076057786f4fd0d73b95f312b557bbaa34c83
Merge "Move classes from lib to DataModel, as they are directly needed in DataModel and not in lib"