Move ParserData into /includes

Change-Id: Ic4af60c79b1b05ee281c2f9bd25cdbadb96633ea