Refactor PersistentStorageManager and SerializationManager to prepare for Phase 4