[refactor][m]: get rid of DataStore as a separate object and just have single Client.