Re-organizes eft parser