Refactor to packet-chain, per Wojiech suggestion.

Change-Id: I0f251c3288ea722fcb1711e0ec984c2fa69f5fd0
Signed-off-by: Alex Fan <railor33@gmail.com>