Move some stuff around in golf.