Reorganised the annotations for the flow analysis.

In order to match the new properties of the verigames project.