Code reorganisation.