further organization
Trying to clean up the build a bit more.  It's starting to seem manageable.