Separate Water layer from Base

Signed-off-by: Gaurav Munjal <Gaurav0@aol.com>