Reorganize a couple larger files.