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