Move methods to the right place.