Renamed client to tokenizer and moved to core