MetadataUtils files moved to metadata subdirectory