Move water to its own file