New storage model

Merging the new storage model. Note that [advtxt](https://github.com/fardog/advtxt) itself is not yet updates to support the new model.