If you were to start again and set a new regulatory regime for water management- what wpu3ld it look like ?

Would it continue the seperation of waters that we currently have ? Or seek to shift it up ?