Refactor persistence out into Persistable module