Code reorganization. More packages.