Reorganize some definitions