Rename persistence to storage.
Change folder/file structure.