B-58092 renamed datastore package from service to components