Fixes #20 restructure to support future persistable snapshots