Relocate water related assets.

Also remove duplication, favoring DDS over other formats.
Merge pull request #302 from thecelloman/movewater

Relocate water related assets.