Simple structural changes simplifying project.

[mralexgray]

Would have just posted as one pull, but these changes are insignificant enough to the more major changes in my other upcoming pull I broke them out sedately.