Refactor packet class hiearchy.
Add WIP tokens.