Moved data model classes down into de-common