Reorg and rename device checks section