Move persistent store to its own struct.