Relocate water related assets.

Also remove duplication, favoring DDS over other formats.