minor re-org