minor re-orgs