Allow ZipZapZop class

I did some reindentation; which makes the diff hard to read. 


The core issue was that their was a namespace conflict between `module ZipZapZop` and `class ZipZapZop`

By making them both classes; we resolve this issue.