Operator token refactor, general organization.