adjust to updated EMV2 meta model. renamed class.
cleaned up imports
Merge remote-tracking branch 'origin/develop' into develop