Predictor refactoring in progress

Need to refactor prediction. prediction shouldn't be linked to
a particular flow but rather should depend on the head flit