Finish up splitting to specified files. Sorting out breakages next.