Moving MetadataHelper into internal package