Add the files package field
Fix tokenizer and add END token