Move mainctrl to own diff