Finished tedious encapsulation of the packet classes