storage: simplify the structure, still having stuck moments (refs #15)
storage: simplify the structure, still having stuck moments (refs #15)

joshterrill/clappr-p2phls-plugin,bemtv/clappr-p2phls-plugin,flavioribeiro/clappr-p2phls-plugin,joshterrill/clappr-p2phls-plugin