Added Tokenizer package and some refactoring