A bit of organization to the Devices Section