Reorganize some.