Code reorganization