re-org as part of getting a more reliable build.