moved modwater to modfluid/