Reorganize a bit.