Water Organizing Module layout

The evolution of my take on the water organizing module. I hope it works.

And yes, that is a cat once again impeding progress.