first try at parsing Papagayo file, rearrange layout a little
fix token handling in Papagayo parser