Code reorganization to have less packages