updated waterapputils.py to reflect reorganization of viewers