package rearrangements, device classes constants removed