Refactor - new LocalStorage interface, and FileIO class