Packages reorganisation. Devices class hierarchy cleanup