Refactored tokenizer(s) into separate package