Refactor of OperatorProducts components [#82287716]