NEW DELHI: Niti Aayog, the government's premier think-tank, will soon rank states on their water management capabilities, with emphasis on policy and governance measures.