Reorganize operators