Refactor the Application Storage system, without renaming the class names.