StorageFile refactoring