I'm trying to see if this speeds up builds a bit. May not without a module boundary, but for now it's nice organization to have as the program grows.
This isn't quite perfect, but gets much of the hard work done.
