Extracted MoistureModel
Refactored river model