MmcStorageManager refactoring