Reorganize a little.