Updates from storage package rejig
Updated main to use new goodies
Tweaked collection naming in storage and queue