Small re-organization.