Some restructuring of the link layer