OmniSwitch: split Utils and BitmapUtils