More reorganization of metadata.