Headers-only reorg functioning again.  Progress.