Reordered PPPoS structure so there is no alignment hole for 32 and 64 bits systems. Reduced types which were too large.