a little more re-org, again...