Small restructuring to break apart the massive main file on a logical boundary.