interface: reorganize switches