Added tokenizer and makefile