Small re-org.