a little re-org for things that are getting busy