Move event outside lib, parser only need File
Some other revisions