Removed am-model depdendency

Removed the am-model dependency andaccomodated packages to the ones in
api-model-transport.