Move methods to other units