Rearrange the layer 2 implementation to match the newly revised spec.
Rearrange the layer 2 implementation to match the newly revised spec.

danfuzz/samizdat,danfuzz/samizdat,danfuzz/samizdat,danfuzz/samizdat