Code reorganization vol. 3.