Code reorganising