Refactoring usb gadget