Surface and subsurface water management