And, reorganize some more