MetadataUtils::Metadata class moved to metadata subdirectory