Some re-organization.