INT-2996 Fix Package Cycle

Move interface ...store.MetadataStore to ...store.metadata.