Reorganize some things