We investigate two-dimensional (2-D) axisymmetric flow in toroidal geometry, with a focus on a transition between 2-D three-component flow and 2-D two-component flow. This latter flow state allows a self-organization of the system to a quiescent dynamics, characterized by long-living coherent structures. When these large-scale structures orient in the azimuthal direction, the radial transport is reduced. Such a transition, if it can be triggered in toroidally confined fusion plasmas, is beneficial for the generation of zonal flows and should consequently result in a flow field beneficial for confinement.