The Central Water Commission (CWC), which oversees irrigation projects, flood management and drinking water supply, and the Central Ground Water Board (CGWB) may be disbanded, and a National Water Commission (NWC) set up in their place. A few other smaller organisations with specialised mandate like data gathering and analysis may also be created. A team under Mihir Shah, a former member of the then Planning Commission of India, is said to be preparing a blueprint for better management of water resources. The idea of institutional restructuring is said to have the backing of this panel. It is likely to submit its report in the next two months. The restructuring is expected to be completed this year itself Officials said the idea behind the organisational restructuring is to ensure that all water resources in the country are managed in a holistic manner and not separately as surface water, ground water or river water. An effort is also being made to move away from engineering solutions like construction of large irrigation projects and towards more sustainable ways of water use.