Code reorganize