Reorganize some more