B-58092 created components/datastores and relocated datastore api and impls (non-service related) to new module