Move to external gadget controller module