Full pass and re-organization.