Merge metadata and repository into storage, they were not independent and are better off consolidated.