Move methods to the correct place.