Minor file rearrangement.