Split persistnce.js into two pieces: storage.js and persistence.js