Code reorganizzation