CMS-1069 Move package datatype in under content.data and rename it to type