Continued work on restructuring project to make it easier to automate
formatting and distribution.