Adjustments in the code organization.