Reorganize some minor stuff