mv waterstat to subdir