Adopt new code organization.