Okay, I checked that and the super-correct-football way of this is this one, I adjusted it for 16 grups, for this cup :
(winner= W, runner-up= R)
W A
R B
W C
R D
W E
R F
W G
R H
W I
R J
W K
R L
W M
R N
W O
R P
----------
R A
W B
R C
W D
R E
W F
R G
W H
R I
W J
R K
W L
R M
W N
R O
W P@twistah, well I dunno how much messed up is the old pairing, but I know this should be at least used from next cup.

Cheers.